Merge remote-tracking branch 'origin/master'
diff --git a/README.adoc b/README.adoc
index 34ebc21..0ddf7c0 100755
--- a/README.adoc
+++ b/README.adoc
@@ -51,6 +51,7 @@
 == Extensions
 
 Build will generate a PDF for each page containing the attribute `jbake-tomeepdf`.
+**Note**: Currently, the PDF generation is disabled.
 
 == Examples
 
@@ -71,24 +72,5 @@
 
 == Publish (needs an ASF account)
 
-- To publish the website, you have to add and push the related content to the https://github.com/apache/tomee-site-pub[TomEE Site Pub] repository.
-
-== Legacy SVN Publish (not working anymore)
-
-`SvnPub` is a main to push to the staging the site content once built, you need to set the system properties (or properties in ~/.m2/settings.xml)
-`site.password` to your asf password and `site.username` if you user name is not `USER` environment variable for it to work.
-
-It will checkout/update the site from svn then copy the site folder from target directory to synchronize it with the svn version
-and finally it will commit everything.
-
-You can set the system property `site.message` to not use the default commit message.
-
-NOTE: `.content-site-checkout` will be the local copy of the website (if you need to modify manually the files or delete some old ones.
-
-NOTE: if the process fails unexpectedly (wrong update in the logic or anything) you can unlock the `.content-site-checkout` executing inside `svn cleanup`.
-
-To build and deploy on staging at once: `mvn clean compile pre-site`.
-
-Then to deploy to "prod": go on https://cms.apache.org/tomee/publish and hit "Submit" (note: you can review changes before if you want to check what the CMS took as changes).
-
-TIP: the staging is available when https://ci.apache.org/builders/tomee-site-staging build is done (triggered on commit), you can't deploy before.
+- The website is automatically build and published to https://github.com/apache/tomee-site-pub[TomEE Site Pub] by a https://ci-builds.apache.org/job/Tomee/job/site-publish/[Jenkins build job] every 12 hours.
+- The job can also be triggered manually via the Jenkins website.
\ No newline at end of file
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
new file mode 100755
index 0000000..f9e4c87
--- /dev/null
+++ b/javadoc/pom.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>21</version>
+    <relativePath><!--Resolve on repository--></relativePath>
+  </parent>
+
+  <groupId>org.apache.tomee</groupId>
+  <artifactId>site-javadoc</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>Apache TomEE :: javadoc</name>
+
+  <properties>
+    <tomee.version>7.0.3</tomee.version>
+
+    <site.message>notset</site.message>
+
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- Javadoc & Asciidoclet -->
+    <javadoc.version>3.1.1</javadoc.version>
+    <asciidoclet.version>1.5.6</asciidoclet.version>
+  </properties>
+
+  <dependencies>
+<!--    <dependency>-->
+<!--      <groupId>org.apache.geronimo.specs</groupId>-->
+<!--      <artifactId>geronimo-json_1.0_spec</artifactId>-->
+<!--      <version>1.0-alpha-1</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.apache.johnzon</groupId>-->
+<!--      <artifactId>johnzon-jaxrs</artifactId>-->
+<!--      <version>0.9.5</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.apache.cxf</groupId>-->
+<!--      <artifactId>cxf-rt-rs-client</artifactId>-->
+<!--      <version>3.1.8</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.apache.tomee</groupId>-->
+<!--      <artifactId>javaee-api</artifactId>-->
+<!--      <version>7.0-1</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.apache.tomee</groupId>-->
+<!--      <artifactId>tomee-embedded</artifactId>-->
+<!--      <version>${tomee.version}</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.jbake</groupId>-->
+<!--      <artifactId>jbake-core</artifactId>-->
+<!--      <version>2.4.0</version>-->
+<!--      <exclusions>-->
+<!--        <exclusion>-->
+<!--          <groupId>org.slf4j</groupId>-->
+<!--          <artifactId>jul-to-slf4j</artifactId>-->
+<!--        </exclusion>-->
+<!--      </exclusions>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.codehaus.groovy</groupId>-->
+<!--      <artifactId>groovy</artifactId>-->
+<!--      <version>2.3.11</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.codehaus.groovy</groupId>-->
+<!--      <artifactId>groovy-templates</artifactId>-->
+<!--      <version>2.3.11</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.pegdown</groupId>-->
+<!--      <artifactId>pegdown</artifactId>-->
+<!--      <version>1.6.0</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.tmatesoft.svnkit</groupId>-->
+<!--      <artifactId>svnkit</artifactId>-->
+<!--      <version>1.8.15</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.jgit</groupId>-->
+<!--      <artifactId>org.eclipse.jgit</artifactId>-->
+<!--      <version>5.1.3.201810200350-r</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.jgit</groupId>-->
+<!--      <artifactId>org.eclipse.jgit.pgm</artifactId>-->
+<!--      <version>5.1.3.201810200350-r</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>args4j</groupId>-->
+<!--      <artifactId>args4j</artifactId>-->
+<!--      <version>2.33</version>-->
+<!--    </dependency>-->
+    <dependency>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>apache-tomee</artifactId>
+      <version>8.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.microprofile.opentracing</groupId>
+      <artifactId>microprofile-opentracing-api</artifactId>
+      <version>1.3.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0-M1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.0.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.0.2</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${javadoc.version}</version>
+        <configuration>
+          <includeDependencySources>true</includeDependencySources>
+<!--          <doclet>org.asciidoctor.Asciidoclet</doclet>-->
+<!--          <docletArtifact>-->
+<!--            <groupId>org.asciidoctor</groupId>-->
+<!--            <artifactId>asciidoclet</artifactId>-->
+<!--            <version>${asciidoclet.version}</version>-->
+<!--          </docletArtifact>-->
+<!--          <additionalOptions>-->
+<!--            <additionalOption>&#45;&#45;base-dir ${basedir}</additionalOption>-->
+<!--            <additionalOption>&#45;&#45;attribute "name=${project.name}"</additionalOption>-->
+<!--            <additionalOption>&#45;&#45;attribute "version=${project.version}"</additionalOption>-->
+<!--          </additionalOptions>-->
+<!--          <additionalOptions>-->
+<!--            <additionalOption>-exclude javax.faces:javax.mail</additionalOption>-->
+<!--          </additionalOptions>-->
+          <doclint>none</doclint> <!-- Doclint is enabled by default in java 8+, this conf is needed disable it till a rewrite of javadoc is done (https://www.oracle.com/technetwork/java/javase/documentation/index-137868.html#format)-->
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+
+  <repositories>
+    <repository>
+      <id>svnkit</id>
+      <name>SVNKit</name>
+      <url>https://maven.tmatesoft.com/content/repositories/releases/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+</project>
diff --git a/pom.xml b/pom.xml
index 2cfa242..38bf22d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   <name>Apache TomEE :: WebSite NG</name>
 
   <properties>
-    <tomee.version>7.0.3</tomee.version>
+    <tomee.version>8.0.6</tomee.version>
     <jbake.http>false</jbake.http>
     <jbake.pdf>false</jbake.pdf>
 
@@ -20,15 +20,15 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.asciidoctor</groupId>
-      <artifactId>asciidoctorj-pdf</artifactId>
-      <version>1.5.0-alpha.11</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.asciidoctor</groupId>-->
+<!--      <artifactId>asciidoctorj-pdf</artifactId>-->
+<!--      <version>1.5.0-alpha.11</version>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>org.asciidoctor</groupId>
       <artifactId>asciidoctorj</artifactId>
-      <version>1.5.4</version>
+      <version>1.5.8.1</version>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
@@ -38,23 +38,28 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.0_spec</artifactId>
-      <version>1.0-alpha-1</version>
+      <artifactId>geronimo-json_1.1_spec</artifactId>
+      <version>1.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.johnzon</groupId>
       <artifactId>johnzon-jaxrs</artifactId>
-      <version>0.9.5</version>
+      <version>1.2.11</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.johnzon</groupId>
+      <artifactId>johnzon-jsonb</artifactId>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
-      <version>3.1.8</version>
+      <version>3.4.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>7.0-1</version>
+      <version>8.0-5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
diff --git a/src/main/java/org/apache/tomee/website/Configuration.java b/src/main/java/org/apache/tomee/website/Configuration.java
index 1b90fac..d137778 100644
--- a/src/main/java/org/apache/tomee/website/Configuration.java
+++ b/src/main/java/org/apache/tomee/website/Configuration.java
@@ -89,6 +89,7 @@
                 new Source("https://github.com/eclipse-ee4j/websocket-api.git", "master", "websocket-api-ee9")
         };
 
+//        if (1 == 1) return new Source[0];
         return new Source[]{
 //                new Source("https://github.com/apache/tomee.git", "master", "tomee-8.0"),
                 new Source("https://github.com/apache/tomee.git", "master", "tomee-9.0").label("milestone").related(microProfile2).related(jakartaEE9).javadoc("^org.apache.(openejb|tomee).*"),
diff --git a/src/main/java/org/apache/tomee/website/Contributors.java b/src/main/java/org/apache/tomee/website/Contributors.java
deleted file mode 100755
index fb4d0bf..0000000
--- a/src/main/java/org/apache/tomee/website/Contributors.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tomee.website;
-
-import lombok.Builder;
-import lombok.Data;
-import org.apache.johnzon.jaxrs.JohnzonProvider;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
-
-import static java.util.Collections.emptyList;
-import static java.util.Optional.ofNullable;
-import static java.util.stream.Collectors.toList;
-
-public class Contributors {
-    private static final String GRAVATAR_BASE = "http://fr.gravatar.com/";
-
-    private Contributors() {
-        // no-op
-    }
-
-    public static Contributor singleLoad(final WebTarget target, final String input) throws IOException {
-        try {
-            return ofNullable(loadGravatar(target, input)).orElse(loadStatic(input));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return loadStatic(input);
-        }
-    }
-
-    public static Contributor loadStatic(final String input) {
-        final String[] strings = input.split(" *\\| *");
-        final String mail = strings[0].replaceAll("\\*$", "");
-        final boolean committer = strings[0].endsWith("*");
-        final String name = strings.length > 1 ? strings[1] : mail.replaceAll("@.*", "");
-        final String picture = strings.length > 2 ? strings[2] : "../img/noimg.png";
-        return Contributor.builder()
-                .name(name)
-                .id(mail)
-                .committer(committer)
-                .gravatar(picture)
-                .build();
-    }
-
-    public static Contributor loadGravatar(final WebTarget target, final String input) throws IOException {
-        final String[] strings = input.split(" *\\| *");
-        final boolean committer = strings[0].endsWith("*");
-        final String mail = committer ? strings[0].substring(0, strings[0].length() - 1) : strings[0];
-        final String hash = gravatarHash(mail);
-        final Response gravatar = target.path(hash + ".json").request(MediaType.APPLICATION_JSON_TYPE).get();
-        if (gravatar.getStatus() != HttpsURLConnection.HTTP_OK) {
-            System.err.println("[ERROR] No gravatar for " + mail);
-            return null;
-        }
-        final Contributor contributor = ofNullable(gravatar.readEntity(Gravatar.class).getEntry())
-                .map(e -> e[0])
-                .map(e -> Contributor.builder()
-                        .id(e.getId())
-                        .name(
-                                ofNullable(e.getName())
-                                        .map(n -> ofNullable(n.getFormatted()).orElse(ofNullable(n.getGivenName()).orElse("") + ofNullable(n.getFamilyName()).orElse("")))
-                                        .orElseGet(() -> ofNullable(e.getDisplayName()).orElse(ofNullable(e.getPreferredUsername()).orElse(mail))))
-                        .description(e.getAboutMe())
-                        .link(
-                                Stream.concat(
-                                        ofNullable(e.getAccounts())
-                                                .map(a -> Stream.of(a).map(l -> Link.builder().name(l.getShortname()).url(l.getUrl()).build()).collect(toList()))
-                                                .orElse(emptyList()).stream(),
-                                        ofNullable(e.getUrls())
-                                                .map(a -> Stream.of(a).map(l -> Link.builder().name(l.getTitle()).url(l.getValue()).build()).collect(toList()))
-                                                .orElse(emptyList()).stream())
-                                        .collect(toList()))
-                        .gravatar("http://www.gravatar.com/avatar/" + hash + "?s=140")
-                        .build())
-                .orElse(Contributor.builder().name(mail).id(mail).build());
-        contributor.setCommitter(committer);
-        ofNullable(contributor.getLink()).ifPresent(l -> Collections.sort(l, (o1, o2) -> o1.getName().compareTo(o2.getName())));
-        return contributor;
-    }
-
-    public static Collection<Contributor> load(final String contributorsList) throws IOException { // used in page.gsp
-        final WebTarget target = ClientBuilder.newClient().register(new JohnzonProvider()).target(GRAVATAR_BASE);
-        final List<Contributor> contributors = new ArrayList<>();
-        final ExecutorService es = Executors.newFixedThreadPool(16);
-        final String rawList = contributorsList.substring(contributorsList.indexOf("<pre>") + "<pre>".length(), contributorsList.indexOf("</pre>"));
-        try (final BufferedReader reader = new BufferedReader(new StringReader(rawList))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                line = line.trim();
-                if (line.isEmpty() || line.startsWith("#")) {
-                    continue;
-                }
-                final String mail = line;
-                es.submit(() -> {
-                    Contributor contributor = null;
-                    try {
-                        contributor = singleLoad(target, mail);
-                    } catch (final IOException e) {
-                        throw new IllegalStateException(e);
-                    }
-                    if (contributor != null) {
-                        synchronized (contributors) {
-                            contributors.add(contributor);
-                        }
-                    }
-                });
-            }
-        }
-        es.shutdown();
-        try {
-            es.awaitTermination(30, TimeUnit.MINUTES);
-        } catch (final InterruptedException e) {
-            Thread.interrupted();
-            return Collections.emptyList();
-        }
-        Collections.sort(contributors, (o1, o2) -> o1.name.compareTo(o2.id));
-        return contributors;
-    }
-
-    private static String gravatarHash(final String mail) {
-        try {
-            final MessageDigest md = MessageDigest.getInstance("MD5");
-            byte[] cp1252s = md.digest(mail.getBytes("CP1252"));
-            final StringBuilder sb = new StringBuilder();
-            for (final byte anArray : cp1252s) {
-                sb.append(Integer.toHexString((anArray & 0xFF) | 0x100).substring(1, 3));
-            }
-            return sb.toString();
-        } catch (final NoSuchAlgorithmException | UnsupportedEncodingException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    @Data
-    @Builder
-    public static class Link {
-        private String name;
-        private String url;
-    }
-
-    @Data
-    @Builder
-    public static class Contributor {
-        private String id;
-        private boolean committer;
-        private String name;
-        private String description;
-        private String gravatar;
-        private List<Link> link;
-    }
-
-    @Data
-    public static class GravatarName {
-        private String formatted;
-        private String givenName;
-        private String familyName;
-    }
-
-    @Data
-    public static class GravatarUrl {
-        private String value;
-        private String title;
-    }
-
-    @Data
-    public static class GravatarAccount {
-        private String shortname;
-        private String url;
-    }
-
-    @Data
-    public static class Gravatar {
-        private GravatarEntry[] entry;
-    }
-
-    @Data
-    public static class GravatarEntry {
-        private String id;
-        private String hash;
-        private String aboutMe;
-        private String requestHash;
-        private String profileUrl;
-        private String preferredUsername;
-        private String thumbnailUrl;
-        private GravatarName name;
-        private GravatarUrl[] urls;
-        private GravatarAccount[] accounts;
-        private String displayName;
-    }
-}
diff --git a/src/main/java/org/apache/tomee/website/GitHubContributors.java b/src/main/java/org/apache/tomee/website/GitHubContributors.java
new file mode 100644
index 0000000..075a0e1
--- /dev/null
+++ b/src/main/java/org/apache/tomee/website/GitHubContributors.java
@@ -0,0 +1,74 @@
+package org.apache.tomee.website;
+
+import lombok.Data;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.tomitribe.util.IO;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GitHubContributors {
+
+    protected static final String BASE_URL = "https://api.github.com/repos/apache/tomee/contributors";
+
+    /*
+     * Can be used to retrieve an up 2 date list of contributors via the GitHub API
+     * The output of this class can be pasted into /src/main/jbake/content/community/contributors.adoc
+     */
+    public static void main(String[] args) throws IOException {
+
+        final List<Contributor> contributorList = GitHubContributors.fillContributors();
+
+        for (Contributor c : contributorList) {
+            System.out.println(c);
+        }
+    }
+
+
+    public static List<Contributor> fillContributors() throws IOException {
+        final List<Contributor> contributorList = new ArrayList<>();
+
+        boolean hasPagesLeft = true;
+
+        int currentPage = 1;
+        while (hasPagesLeft) {
+            final String content = IO.slurp(new URL(BASE_URL + "?per_page=100&page=" + currentPage));
+            final JSONArray contributors = new JSONArray(content);
+
+            if (contributors.length() == 0) {
+                hasPagesLeft = false;
+            } else {
+                for (int i = 0; i < contributors.length(); i++) {
+
+                    JSONObject c = contributors.getJSONObject(i);
+
+                    contributorList.add(new Contributor(
+                            c.getString("id"),
+                            c.getString("login"),
+                            c.getString("avatar_url"),
+                            c.getString("html_url"),
+                            c.getLong("contributions")));
+                }
+            }
+            currentPage++;
+        }
+        return contributorList;
+    }
+
+    @Data
+    public static class Contributor {
+        private final String id;
+        private final String name;
+        private final String avatar;
+        private final String url;
+        private final long contributions;
+
+        @Override
+        public String toString() {
+            return name + " | " + url + " | " + avatar;
+        }
+    }
+}
diff --git a/src/main/java/org/apache/tomee/website/contributors/Contributor.java b/src/main/java/org/apache/tomee/website/contributors/Contributor.java
new file mode 100644
index 0000000..0ff60aa
--- /dev/null
+++ b/src/main/java/org/apache/tomee/website/contributors/Contributor.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomee.website.contributors;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Data
+@Builder
+public class Contributor {
+    private String id;
+    private boolean committer;
+    private String name;
+    private String github;
+    private String avatar;
+    private Stats stats;
+
+    public Contributor add(final Contributor that) {
+        return new Contributor(id, committer, name, github, avatar, stats.add(that.stats));
+    }
+
+    /**
+     * Take the specified list of Contributors, which may have duplicates, and
+     * combine each duplicate down to one Contributor instance while keeping a
+     * total of all their stats.
+     */
+    public static List<Contributor> unique(final List<Contributor> listWithDuplicates) {
+        final Map<String, List<Contributor>> map = listWithDuplicates.stream()
+                .collect(Collectors.groupingBy(Contributor::getName));
+
+        return map.values().stream()
+                .map(Contributor::reduce)
+                .collect(Collectors.toList());
+    }
+
+    private static Contributor reduce(final List<Contributor> instances) {
+        return instances.stream()
+                .reduce(Contributor::add)
+                .orElseThrow(IllegalStateException::new);
+    }
+
+
+}
diff --git a/src/main/java/org/apache/tomee/website/contributors/ContributorData.java b/src/main/java/org/apache/tomee/website/contributors/ContributorData.java
new file mode 100644
index 0000000..ccea200
--- /dev/null
+++ b/src/main/java/org/apache/tomee/website/contributors/ContributorData.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomee.website.contributors;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.json.bind.annotation.JsonbProperty;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class ContributorData {
+
+    @JsonbProperty("total")
+    private int total;
+
+    @JsonbProperty("author")
+    private Author author;
+
+    @JsonbProperty("weeks")
+    private List<Week> weeks;
+
+    public Stats getStats() {
+        return weeks.stream()
+                .map(week -> new Stats(week.c, week.a, week.d))
+                .reduce(Stats::add)
+                .orElse(new Stats(0, 0, 0));
+    }
+
+    /**
+     * Convert the ContributorData to a Contributor instance
+     */
+    public Contributor asContributor() {
+        final ContributorData.Author author = this.getAuthor();
+
+        return Contributor.builder()
+                .id(author.getId() + "")
+                .name(author.getLogin())
+                .github("https://github.com/" + author.getLogin())
+                .avatar("https://avatars.githubusercontent.com/u/" + author.getId() + "?v=4")
+                .stats(this.getStats())
+                .build();
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    @EqualsAndHashCode(onlyExplicitlyIncluded = true)
+    public static class Author {
+        @JsonbProperty("id")
+        private int id;
+
+        @JsonbProperty("login")
+        private String login;
+
+        @JsonbProperty("avatar")
+        private String avatar;
+
+        @JsonbProperty("path")
+        private String path;
+
+        @JsonbProperty("hovercard_url")
+        private String hovercardUrl;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    @EqualsAndHashCode(onlyExplicitlyIncluded = true)
+    public static class Week {
+        @JsonbProperty("w")
+        private long w;
+
+        @JsonbProperty("a")
+        private int a;
+
+        @JsonbProperty("d")
+        private int d;
+
+        @JsonbProperty("c")
+        private int c;
+    }
+}
diff --git a/src/main/java/org/apache/tomee/website/contributors/Contributors.java b/src/main/java/org/apache/tomee/website/contributors/Contributors.java
new file mode 100755
index 0000000..1c26dee
--- /dev/null
+++ b/src/main/java/org/apache/tomee/website/contributors/Contributors.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.website.contributors;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class Contributors {
+    private static final Logger log = Logger.getLogger(Github.class.getName());
+
+    private Contributors() {
+        // no-op
+    }
+
+    public static Contributor loadStatic(final String input) {
+        final String[] strings = input.split(" *\\| *");
+        final String name = strings.length > 0 ? strings[0] : "";
+        final String github = strings.length > 1 ? strings[1] : "";
+        final String picture = strings.length > 2 ? strings[2] : "../img/noimg.png";
+        return Contributor.builder()
+                .name(name)
+                .id(name)
+                .avatar(picture)
+                .github(github)
+                .build();
+    }
+
+    public static Collection<Contributor> load(final String contributorsList) throws IOException { // used in page.gsp
+        /*
+         * Try getting the full list from Github across all repositories
+         */
+        try {
+            final List<Contributor> contributors = new Github().getContributors();
+            return sort(contributors);
+        } catch (Exception e) {
+            log.log(Level.SEVERE, "Unable to fetch contributors from github.com", e);
+        }
+
+        /*
+         * Fallback to our cached list
+         */
+        final List<Contributor> contributors = new ArrayList<>();
+        final ExecutorService es = Executors.newFixedThreadPool(16);
+        final String rawList = contributorsList.substring(contributorsList.indexOf("<pre>") + "<pre>".length(), contributorsList.indexOf("</pre>"));
+        try (final BufferedReader reader = new BufferedReader(new StringReader(rawList))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                line = line.trim();
+                if (line.isEmpty() || line.startsWith("#")) {
+                    continue;
+                }
+                final String mail = line;
+                es.submit(() -> {
+                    Contributor contributor = null;
+                    contributor = loadStatic(mail);
+                    synchronized (contributors) {
+                        contributors.add(contributor);
+                    }
+                });
+            }
+        }
+        es.shutdown();
+        try {
+            es.awaitTermination(30, TimeUnit.MINUTES);
+        } catch (final InterruptedException e) {
+            Thread.interrupted();
+            return Collections.emptyList();
+        }
+        Collections.sort(contributors, Comparator.comparing(Contributor::getName));
+        return contributors;
+    }
+
+    public static List<Contributor> sort(final List<Contributor> list) {
+        final Stats max = list.stream()
+                .map(Contributor::getStats)
+                .reduce(Stats::max)
+                .orElse(new Stats(0, 0, 0));
+
+        list.sort(Comparator.<Contributor, Integer>comparing(contributor -> max.score(contributor.getStats())).reversed());
+
+        final boolean debug = false;
+        if (debug){
+            for (final Contributor contributor : list) {
+                final Stats stats = contributor.getStats();
+                System.out.printf("Contributor: %-7s %-20s %5s %7s %7s%n",
+                        max.score(contributor.getStats()), contributor.getName(),
+                        stats.getCommits(), stats.getLinesAdded(),
+                        stats.getLinesRemoved());
+            }
+        }
+        return list;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/apache/tomee/website/contributors/Github.java b/src/main/java/org/apache/tomee/website/contributors/Github.java
new file mode 100644
index 0000000..4469444
--- /dev/null
+++ b/src/main/java/org/apache/tomee/website/contributors/Github.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomee.website.contributors;
+
+import org.apache.johnzon.jaxrs.JohnzonProvider;
+import org.apache.openejb.loader.IO;
+import org.tomitribe.swizzle.stream.StreamBuilder;
+
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class Github {
+
+    private static final Logger log = Logger.getLogger(Github.class.getName());
+    private final Client client = ClientBuilder.newClient().register(new JohnzonProvider<>());
+
+    public List<Contributor> getContributors() {
+        final List<URI> repositoryURIs = getRepositoryURIs();
+        final List<Contributor> list = repositoryURIs.stream()
+                .map(this::getContributorsForRepository)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+
+        return Contributor.unique(list);
+    }
+
+    /**
+     * List all the repositories for Apache TomEE
+     */
+    public List<URI> getRepositoryURIs() {
+        try {
+            final WebTarget github = client.target("https://github.com");
+            final String content = github.path("/apache").queryParam("q", "tomee").request().get(String.class);
+            final List<String> links = new ArrayList<String>();
+            StreamBuilder.create(IO.read(content))
+                    .watch("href=\"/apache/tomee", "\"", links::add)
+                    .run();
+
+            return links.stream()
+                    .filter(s -> !s.contains("/"))
+                    .filter(s -> !s.equals("-site-pub"))
+                    .filter(s -> !s.equals("-site"))
+                    .distinct()
+                    .map(s -> "https://github.com/apache/tomee" + s)
+                    .map(URI::create)
+                    .collect(Collectors.toList());
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to list TomEE repositories", e);
+        }
+    }
+
+    /**
+     * Get the contributor-data json for the specified repository
+     */
+    private List<Contributor> getContributorsForRepository(final URI repositoryUri) {
+        final Response response = client.target(repositoryUri.toASCIIString())
+                .path("graphs/contributors-data")
+                .request()
+                .header("referer", repositoryUri.toASCIIString() + "/graphs/contributors")
+                .header("authority", "github.com")
+                .header("pragma", "no-cache")
+                .header("cache-control", "no-cache")
+                .header("sec-ch-ua", "\" Not A;Brand\";v=\"99\", \"Chromium\";v=\"90\", \"Google Chrome\";v=\"90\"")
+                .header("accept", "application/json")
+                .header("sec-ch-ua-mobile", "?0")
+                .header("user-agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36")
+                .header("sec-fetch-site", "same-origin")
+                .header("sec-fetch-mode", "cors")
+                .header("sec-fetch-dest", "empty")
+                .header("accept-language", "en-US,en;q=0.9,es;q=0.8")
+                .get();
+
+        if (response.getStatus() != 200) {
+            log.severe("Unexpected status from " + repositoryUri + ": " + response.getStatus());
+            return Collections.EMPTY_LIST;
+        }
+
+        if (!response.getHeaderString("content-type").startsWith("application/json")) {
+            log.severe("Unexpected content-type from " + repositoryUri + ": " + response.getHeaderString("content-type"));
+            return Collections.EMPTY_LIST;
+        }
+        
+        final String json;
+        try {
+            json = IO.slurp((InputStream) response.getEntity());
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to read response from " + repositoryUri, e);
+        }
+        
+        final ContributorData[] data;
+        try {
+            final Jsonb jsonb = JsonbBuilder.create();
+            data = jsonb.fromJson(json, ContributorData[].class);
+        } catch (final Exception e) {
+            throw new IllegalStateException("Unable to unmarshal response from " + repositoryUri + "\n\n" + json, e);
+        }
+        return Stream.of(data)
+                .map(ContributorData::asContributor)
+                .collect(Collectors.toList());
+    }
+
+}
diff --git a/src/main/java/org/apache/tomee/website/contributors/Stats.java b/src/main/java/org/apache/tomee/website/contributors/Stats.java
new file mode 100644
index 0000000..447c7e0
--- /dev/null
+++ b/src/main/java/org/apache/tomee/website/contributors/Stats.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomee.website.contributors;
+
+import lombok.Data;
+
+/**
+ * We add a contributor's commits, lines added and lines removed together
+ * across all repos to create an overall score that is used to sort contributors.
+ */
+@Data
+@lombok.Builder(builderClassName = "Builder", toBuilder = true)
+public class Stats {
+    private final int commits;
+    private final int linesAdded;
+    private final int linesRemoved;
+
+    /**
+     * Aggregate the stats from one git repo with the same
+     * contributors stats on another repo
+     */
+    public Stats add(final Stats that) {
+        return new Stats(
+                this.commits + that.commits,
+                this.linesAdded + that.linesAdded,
+                this.linesRemoved + that.linesRemoved);
+    }
+
+    public Stats max(final Stats that) {
+        return new Stats(
+                Math.max(this.commits, that.commits),
+                Math.max(this.linesAdded, that.linesAdded),
+                Math.max(this.linesRemoved, that.linesRemoved));
+    }
+
+    /**
+     * Assumes this instance of Stats holds the max (highest)
+     * possible values for commits, lines added, and lines removed.
+     *
+     * The passed in stats will be evaluated against these numbers
+     * a percentage (0-100) will be returned.  The return value is
+     * intentionally an int so it can easily be used for sorting.
+     */
+    public int score(final Stats that) {
+        final double commitsPercentage = that.commits / (double) this.commits;
+        final double linesAddedPercentage = that.linesAdded / (double) this.linesAdded;
+        final double linesRemovedPercentage = that.linesRemoved / (double) this.linesRemoved;
+        final double average = (commitsPercentage + linesAddedPercentage + linesRemovedPercentage) / 3;
+
+        return (int) Math.round(average * 1000000);
+    }
+}
diff --git a/src/main/jbake/assets/.htaccess b/src/main/jbake/assets/.htaccess
new file mode 100644
index 0000000..dcad3d0
--- /dev/null
+++ b/src/main/jbake/assets/.htaccess
@@ -0,0 +1,162 @@
+# Redirect visitors from HTTP to HTTPS
+RewriteEngine On
+RewriteCond %{HTTPS} off
+RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+
+# Index config
+DirectoryIndex index.html README.html
+
+# Legacy redirects
+Redirect permanent /builds.html                 https://tomee.apache.org/download.html
+Redirect permanent /tomcat.html                 https://tomee.apache.org/apache-tomee.html
+Redirect permanent /3.0/tomcat.html             https://tomee.apache.org/apache-tomee.html
+Redirect permanent /3.0/apache-tomee.html       https://tomee.apache.org/apache-tomee.html
+Redirect permanent /3.0/tomee.html              https://tomee.apache.org/apache-tomee.html
+Redirect permanent /download-ng.html            https://tomee.apache.org/download.html
+Redirect permanent /download/index.html         https://tomee.apache.org/download.html
+Redirect permanent /downloads.html              https://tomee.apache.org/download.html
+Redirect permanent /3.0/index.html              https://tomee.apache.org/documentation.html
+Redirect permanent /design.html                 https://tomee.apache.org/dev/design.html
+Redirect permanent /design_appserver.html       https://tomee.apache.org/dev/design-application-server.html
+Redirect permanent /design_assembler.html       https://tomee.apache.org/dev/design-assembler.html
+Redirect permanent /design_bmpcontainer.html    https://tomee.apache.org/dev/design-bmp-entitybean-container.html
+Redirect permanent /design_classicassembler.html        https://tomee.apache.org/dev/design-classic-assembler.html
+Redirect permanent /design_cmpcontainer.html    https://tomee.apache.org/dev/design-cmp-entitybean-container.html
+Redirect permanent /design_configfactory.html   https://tomee.apache.org/dev/design-configuration-factory.html
+Redirect permanent /design_container.html       https://tomee.apache.org/dev/design-container.html
+Redirect permanent /design_intravm.html         https://tomee.apache.org/dev/design-local-server.html
+Redirect permanent /design_novaconfig.html      https://tomee.apache.org/dev/design-nova-configuration-factory.html
+Redirect permanent /design_openejb.html         https://tomee.apache.org/dev/design.html
+Redirect permanent /design_rafpassivator.html   https://tomee.apache.org/dev/design-random-file-passivator.html
+Redirect permanent /design_remoteserver.html    https://tomee.apache.org/dev/design-remote-server.html
+Redirect permanent /design_resmanager.html      https://tomee.apache.org/dev/design-resource-manager.html
+Redirect permanent /design_secservice.html      https://tomee.apache.org/dev/design-security-service.html
+Redirect permanent /design_simplepassivator.html        https://tomee.apache.org/dev/design-simple-passivator.html
+Redirect permanent /design_stfulcontainer.html  https://tomee.apache.org/dev/design-stateful-sessionbean-container.html
+Redirect permanent /design_stfulpassivator.html https://tomee.apache.org/dev/design-passivation-strategy.html
+Redirect permanent /design_stlesscontainer.html https://tomee.apache.org/dev/design-stateless-sessionbean-container.html
+Redirect permanent /design_txservice.html       https://tomee.apache.org/dev/design-transaction-service.html
+Redirect permanent /embedded-and-remotable.html https://tomee.apache.org/3.0/embedded-and-remotable.html
+
+Redirect permanent /3.0/apache-tomee.html https://tomee.apache.org/apache-tomee.html
+Redirect permanent /3.0/jpa-concepts.html https://tomee.apache.org/jpa-concepts.html
+
+
+Redirect permanent /3.0/injection-of-entitymanager-example.html https://tomee.apache.org/examples-trunk/injection-of-entitymanager/README.html
+Redirect permanent /3.0/simple-stateless-example.html           https://tomee.apache.org/examples-trunk/simple-stateless/README.html
+Redirect permanent /3.0/stateless-session-beans.html            https://tomee.apache.org/examples-trunk/simple-stateless/README.html
+Redirect permanent /3.0/injection-of-other-ejbs-example.html    https://tomee.apache.org/examples-trunk/injection-of-ejbs/README.html
+Redirect permanent /3.0/simple-stateful-example.html            https://tomee.apache.org/examples-trunk/simple-stateful/README.html
+Redirect permanent /3.0/testing-transactions-example.html       https://tomee.apache.org/examples-trunk/testing-transactions/README.html
+Redirect permanent /3.0/injection-of-datasource-example.html    https://tomee.apache.org/examples-trunk/injection-of-datasource/README.html
+Redirect permanent /3.0/injection-of-env-entry-example.html     https://tomee.apache.org/examples-trunk/injection-of-env-entry/README.html
+Redirect permanent /3.0/ejb-21-compatibility-example.html       https://tomee.apache.org/examples-trunk/component-interfaces/README.html
+Redirect permanent /3.0/testing-security-example.html           https://tomee.apache.org/examples-trunk/testing-security/README.html
+Redirect permanent /3.0/lookup-of-other-ejbs-example.html       https://tomee.apache.org/examples-trunk/lookup-of-ejbs/README.html
+Redirect permanent /3.0/embedded-and-remotable.html             https://tomee.apache.org/examples-trunk/telephone-stateful/README.html
+Redirect permanent /3.0/unit-testing-transactions.html          https://tomee.apache.org/examples-trunk/testing-transactions/README.html
+Redirect permanent /3.0/singleton-example.html                  https://tomee.apache.org/examples-trunk/simple-singleton/README.html
+Redirect permanent /3.0/interceptor-example.html                https://tomee.apache.org/examples-trunk/interceptors/README.html
+
+
+Redirect permanent /3.0/transaction-annotations.html https://tomee.apache.org/transaction-annotations.html
+Redirect permanent /3.0/index.html https://tomee.apache.org/index.html
+Redirect permanent /3.0/jndi-names.html https://tomee.apache.org/jndi-names.html
+Redirect permanent /3.0/openjpa.html https://tomee.apache.org/openjpa.html
+Redirect permanent /3.0/spring-ejb-and-jpa.html https://tomee.apache.org/spring-ejb-and-jpa.html
+Redirect permanent /3.0/configuring-persistenceunits-in-tests.html https://tomee.apache.org/configuring-persistenceunits-in-tests.html
+Redirect permanent /3.0/persistence-context.html https://tomee.apache.org/persistence-context.html
+Redirect permanent /3.0/hibernate.html https://tomee.apache.org/hibernate.html
+Redirect permanent /3.0/tomcat.html https://tomee.apache.org/tomcat.html
+Redirect permanent /3.0/ejb-local-ref.html https://tomee.apache.org/ejb-local-ref.html
+Redirect permanent /3.0/ejb-refs.html https://tomee.apache.org/ejb-refs.html
+Redirect permanent /3.0/security-annotations.html https://tomee.apache.org/security-annotations.html
+Redirect permanent /3.0/configuring-datasources.html https://tomee.apache.org/configuring-datasources.html
+Redirect permanent /3.0/persistence-unit-ref.html https://tomee.apache.org/persistence-unit-ref.html
+Redirect permanent /3.0/resource-injection.html https://tomee.apache.org/resource-injection.html
+Redirect permanent /3.0/resource-ref-for-datasource.html https://tomee.apache.org/resource-ref-for-datasource.html
+Redirect permanent /3.0/javaagent.html https://tomee.apache.org/javaagent.html
+Redirect permanent /3.0/basics-getting-things.html https://tomee.apache.org/basics-getting-things.html
+Redirect permanent /3.0/ejb-30-specification.html https://tomee.apache.org/ejb-30-specification.html
+Redirect permanent /3.0/local-client-injection.html https://tomee.apache.org/local-client-injection.html
+Redirect permanent /3.0/deploy-tool.html https://tomee.apache.org/deploy-tool.html
+Redirect permanent /3.0/examples.html https://tomee.apache.org/examples.html
+Redirect permanent /3.0/embedded-configuration.html https://tomee.apache.org/embedded-configuration.html
+Redirect permanent /3.0/javaagent-with-maven-surefire.html https://tomee.apache.org/javaagent-with-maven-surefire.html
+Redirect permanent /3.0/tomcat-detailed-instructions.html https://tomee.apache.org/tomcat-detailed-instructions.html
+Redirect permanent /3.0/jms-resources-and-mdb-container.html https://tomee.apache.org/jms-resources-and-mdb-container.html
+Redirect permanent /3.0/spring.html https://tomee.apache.org/spring.html
+Redirect permanent /3.0/startup.html https://tomee.apache.org/startup.html
+Redirect permanent /3.0/service-locator.html https://tomee.apache.org/service-locator.html
+Redirect permanent /3.0/singleton-beans.html https://tomee.apache.org/singleton-beans.html
+Redirect permanent /3.0/containers-and-resources.html https://tomee.apache.org/containers-and-resources.html
+Redirect permanent /3.0/tomcat-ejb-refs.html https://tomee.apache.org/tomcat-ejb-refs.html
+Redirect permanent /3.0/application-discovery-via-the-classpath.html https://tomee.apache.org/application-discovery-via-the-classpath.html
+Redirect permanent /3.0/failover.html https://tomee.apache.org/ejb-failover.html
+Redirect permanent /3.0/clients.html https://tomee.apache.org/clients.html
+Redirect permanent /3.0/ejb-jpa-jsf-jax-rs.html https://tomee.apache.org/ejb-jpa-jsf-jax-rs.html
+Redirect permanent /3.0/common-persistenceprovider-properties.html https://tomee.apache.org/common-persistenceprovider-properties.html
+Redirect permanent /3.0/jpa-usage.html https://tomee.apache.org/jpa-usage.html
+Redirect permanent /3.0/ejb-ref.html https://tomee.apache.org/ejb-ref.html
+Redirect permanent /3.0/alternate-descriptors.html https://tomee.apache.org/alternate-descriptors.html
+Redirect permanent /3.0/deployments.html https://tomee.apache.org/deployments.html
+Redirect permanent /3.0/constructor-injection.html https://tomee.apache.org/constructor-injection.html
+Redirect permanent /3.0/databases.html https://tomee.apache.org/databases.html
+Redirect permanent /3.0/properties-tool.html https://tomee.apache.org/properties-tool.html
+Redirect permanent /3.0/space-index.html https://tomee.apache.org/space-index.html
+Redirect permanent /3.0/callbacks.html https://tomee.apache.org/callbacks.html
+Redirect permanent /3.0/custom-injection.html https://tomee.apache.org/custom-injection.html
+Redirect permanent /3.0/dynamic-datasource.html https://tomee.apache.org/dynamic-datasource.html
+Redirect permanent /3.0/basics-security.html https://tomee.apache.org/basics-security.html
+Redirect permanent /3.0/datasource-password-encryption.html https://tomee.apache.org/datasource-password-encryption.html
+Redirect permanent /3.0/helloworld-weblogic.html https://tomee.apache.org/helloworld-weblogic.html
+Redirect permanent /3.0/mdb-container.html https://tomee.apache.org/mdb-container.html
+Redirect permanent /3.0/system-properties.html https://tomee.apache.org/system-properties.html
+Redirect permanent /3.0/configuring-logging-in-tests.html https://tomee.apache.org/configuring-logging-in-tests.html
+Redirect permanent /3.0/spring-and-openejb-30.html https://tomee.apache.org/spring-and-openejb-30.html
+Redirect permanent /3.0/configuring-datasources-in-tests.html https://tomee.apache.org/configuring-datasources-in-tests.html
+Redirect permanent /3.0/tomcat-installation.html https://tomee.apache.org/tomcat-installation.html
+Redirect permanent /3.0/webapp-based-ejbs.html https://tomee.apache.org/webapp-based-ejbs.html
+Redirect permanent /3.0/openejbxml.html https://tomee.apache.org/openejbxml.html
+Redirect permanent /3.0/security.html https://tomee.apache.org/security.html
+Redirect permanent /3.0/understanding-callbacks.html https://tomee.apache.org/understanding-callbacks.html
+Redirect permanent /3.0/annotations-xml-and-defaults.html https://tomee.apache.org/annotations-xml-and-defaults.html
+Redirect permanent /3.0/manual-installation.html https://tomee.apache.org/manual-installation.html
+Redirect permanent /3.0/common-datasource-configurations.html https://tomee.apache.org/common-datasource-configurations.html
+Redirect permanent /3.0/getting-started.html https://tomee.apache.org/getting-started.html
+Redirect permanent /3.0/configuring-javamail.html https://tomee.apache.org/configuring-javamail.html
+Redirect permanent /3.0/restful-web-service-with-openejb-jersey-junit-maven-mysql-and-tomcat.html https://tomee.apache.org/restful-web-service-with-openejb-jersey-junit-maven-mysql-and-tomcat.html
+Redirect permanent /3.0/testcase-with-testbean-inner-class.html https://tomee.apache.org/testcase-with-testbean-inner-class.html
+Redirect permanent /3.0/basics-transactions.html https://tomee.apache.org/basics-transactions.html
+Redirect permanent /3.0/design-application-server.html https://tomee.apache.org/design-application-server.html
+Redirect permanent /3.0/understanding-the-directory-layout.html https://tomee.apache.org/understanding-the-directory-layout.html
+Redirect permanent /3.0/design-container.html https://tomee.apache.org/design-container.html
+Redirect permanent /3.0/openejb-per-tomcat-installation.html https://tomee.apache.org/openejb-per-tomcat-installation.html
+Redirect permanent /3.0/client-server-transports.html https://tomee.apache.org/client-server-transports.html
+Redirect permanent /3.0/property-overriding.html https://tomee.apache.org/property-overriding.html
+Redirect permanent /3.0/configuring-containers-in-tests.html https://tomee.apache.org/configuring-containers-in-tests.html
+Redirect permanent /3.0/design-assembler.html https://tomee.apache.org/design-assembler.html
+Redirect permanent /3.0/design-configuration-factory.html https://tomee.apache.org/design-configuration-factory.html
+Redirect permanent /3.0/ejb-servlet.html https://tomee.apache.org/ejb-servlet.html
+Redirect permanent /3.0/collapsed-ear-on-linux.html https://tomee.apache.org/collapsed-ear-on-linux.html
+Redirect permanent /3.0/app-clients-and-jndi.html https://tomee.apache.org/app-clients-and-jndi.html
+Redirect permanent /3.0/built-in-type-converters.html https://tomee.apache.org/built-in-type-converters.html
+Redirect permanent /3.0/configuring-durations.html https://tomee.apache.org/configuring-durations.html
+Redirect permanent /3.0/design-classic-assembler.html https://tomee.apache.org/design-classic-assembler.html
+Redirect permanent /3.0/design-random-access-file-passivater.html https://tomee.apache.org/design-random-access-file-passivater.html
+Redirect permanent /3.0/users-guide.html https://tomee.apache.org/users-guide.html
+Redirect permanent /3.0/configuration-properties.html https://tomee.apache.org/configuration-properties.html
+Redirect permanent /3.0/design-cmp-entitybean-container.html https://tomee.apache.org/design-cmp-entitybean-container.html
+Redirect permanent /3.0/design-passivation-strategy.html https://tomee.apache.org/design-passivation-strategy.html
+Redirect permanent /3.0/design-transaction-service.html https://tomee.apache.org/design-transaction-service.html
+Redirect permanent /3.0/hello-world.html https://tomee.apache.org/hello-world.html
+Redirect permanent /3.0/online-javadocs.html https://tomee.apache.org/online-javadocs.html
+Redirect permanent /3.0/design-bmp-entitybean-container.html https://tomee.apache.org/design-bmp-entitybean-container.html
+Redirect permanent /3.0/design-nova-configuration-factory.html https://tomee.apache.org/design-nova-configuration-factory.html
+Redirect permanent /3.0/design-resource-manager.html https://tomee.apache.org/design-resource-manager.html
+Redirect permanent /3.0/design-simple-passivater.html https://tomee.apache.org/design-simple-passivater.html
+Redirect permanent /3.0/design-stateless-sessionbean-container.html https://tomee.apache.org/design-stateless-sessionbean-container.html
+Redirect permanent /3.0/design.html https://tomee.apache.org/design.html
+Redirect permanent /3.0/documentation.html https://tomee.apache.org/documentation.html
+Redirect permanent /3.0/embedding.html https://tomee.apache.org/embedding.html
+Redirect permanent /3.0/introduction-to-the-command-line-tools.html https://tomee.apache.org/introduction-to-the-command-line-tools.html
\ No newline at end of file
diff --git a/src/main/jbake/assets/css/cardio.css b/src/main/jbake/assets/css/cardio.css
index 366b5cf..afaae7f 100755
--- a/src/main/jbake/assets/css/cardio.css
+++ b/src/main/jbake/assets/css/cardio.css
@@ -1,4 +1,32 @@
-@import url(http://fonts.googleapis.com/css?family=Roboto:300,400,500,700);
+@import url(https://fonts.googleapis.com/css2?family=Bebas+Neue&family=Montserrat&family=Poppins:wght@200;300;400;500;600;700&display=swap);
+
+:root {
+  --white: #FFF;
+  --black: #000;
+  --light-black: rgba(0, 0, 0, 0.6);
+  --light-orange: #f59423;
+  --orange: #e2632a;
+  --red: rgba(206,31,49,1);
+  --violet-light: rgb(144, 19, 254);
+  --violet: #832677;
+  --orange: rgba(243,143,35,1);
+  --pre-border: #ccc;
+  --code-color: #8a6d3b;
+  --code-back: #f5f5f5;
+  --light-blue: #31b9ff;
+  --gray: #bbb;
+  --light-gray: #ddd;
+  --green: green;
+  --blue: blue;
+  --light-white: rgba(255, 255, 255, 0.8);
+  --dark-gray: #6f6f6f;
+  --lightest-gray: #f7f7f7;
+  --light-black: #222;
+}
+
+body {
+  font-family: Poppins, Helvetica, Arial, sans-serif;
+}
 
 .parallax {
   position: absolute;
@@ -21,7 +49,7 @@
   z-index: 9999;
   width: 100%;
   height: 100%;
-  background-color: white;
+  background-color: var(--white);
 }
 
 .preloader img {
@@ -42,7 +70,7 @@
 .bigp {
   font-size: 18px;
   line-height: 1.5;
-  color: #80287a;
+  color: var(--violet);
 }
 
 ul.white-list {
@@ -53,7 +81,7 @@
 ul.white-list li {
   font-size: 18px;
   margin: 10px 0;
-  color: #fff;
+  color: var(--white);
 }
 
 ul.white-list li:before {
@@ -64,16 +92,17 @@
   width: 6px;
   height: 6px;
   margin-right: 15px;
-  background: white;
+  background: var(--white);
 }
 
 header {
   position: relative;
   width: 100%;
-  color: #80287a;
+  color: var(--violet);
   background: rgba(28, 36, 65, 0.93);
-  background: url('../img/header.jpg');
-  background-size: cover;
+  background: linear-gradient(150deg, rgba(212, 105, 128, 0.57), rgba(240, 160, 110, 0.95)), url('../img/header.jpg');
+  background-size: cover, cover;
+  padding: 200px 0 0 0;
 }
 
 header .table {
@@ -89,7 +118,8 @@
   display: table-cell;
   text-align: center;
   vertical-align: middle;
-  color: #80287a;
+  color: var(--white);
+  font-weight: normal;
 }
 
 header .typed {
@@ -101,7 +131,7 @@
   font-size: 60px;
   display: inline-block;
   margin: 0 10px;
-  color: #80287a;
+  color: var(--violet);
 }
 
 ul, ol {
@@ -109,13 +139,13 @@
 }
 
 pre {
-  border: 0 solid #ccc;
+  border: 0 solid var(--pre-border);
   margin: 0 0 20px;
 }
 
 code {
-  color: #8a6d3b;
-  background-color: #f5f5f5;
+  color: var(--code-color);
+  background-color: var(--code-back);
 }
 
 p {
@@ -164,7 +194,7 @@
 
 /*a {*/
 /*text-decoration: none;*/
-/*color: #80287a;*/
+/*color: var(--violet);*/
 /*-webkit-transition: all 0.3s ease;*/
 /*transition: all 0.3s ease;*/
 /*}*/
@@ -180,118 +210,100 @@
 /*}*/
 
 nav.navbar .navbar-nav li.active a:not(.btn) {
-  color: #80287a !important;
+  color: var(--light-black) !important;
 }
 
 nav.navbar-fixed-top {
-  background-image: linear-gradient(90deg,#f59423,#e2632a,#ca2136,#832778);
+  background: var(--white);
   z-index: 9499;
   top: 0;
-  padding-top: 10px;
-  padding-bottom: 10px;
+  padding-top: 15px;
+  padding-bottom: 15px;
   opacity: 1;
-}
-
-.navbar .button, .nav > li:last-child {
-    display: inline-flex;
-    align-items: center;
-    background: #fff;
-    border: 1px solid #e1e1e1;
-    border-radius: 0.25rem;
-    height: 31px;
-    padding: 0 6px;
-    margin-top: 6px;
-    margin-left: 15px;
+  border-bottom: 1px solid var(--light-gray);
 }
 
 nav.navbar-fixed-top .navbar-nav > li > a:not(.btn) {
-    color: #ffffff;
-    font-family: Roboto,sans-serif;
+    color: var(--light-black);
+    font-family: Poppins, sans-serif;
     font-size: 16px;
     font-weight: 400;
     -webkit-font-smoothing: auto;
 }
 
-nav.navbar-fixed-top .navbar-nav > li:last-child > a:not(.btn) {
-    display: inline-flex;
-    color: #222;
-    padding: 6px;
-    white-space: nowrap;
-    cursor: pointer;
-}
 .navbar-brand {
     float: left;
     height: 100%;
     padding: 0px 15px;
     font-size: 22px;
     line-height: 20px;
-    color: #fff;
-    font-family: Roboto,sans-serif;
+    color: var(--black);
+    font-family: Poppins, sans-serif;
     -webkit-font-smoothing: auto;
 }
 .icon-bar {
-  background: #bbb;
+  background: var(--gray);
 }
 
 /* Buttons */
 
 .btn {
-  font-size: 18px;
+  /*font-size: 18px;
   display: inline-block;
   padding: 15px 30px;
-  color: #80287a;
+  color: var(--violet);
   border: 2px solid transparent;
   border-radius: 2px;
   background: transparent;
-  /*-webkit-transition: all 0.3s ease;*/
+  -webkit-transition: all 0.3s ease;*/
   /*transition: all 0.3s ease;*/
 }
 
 .btn:hover,
 .btn:focus {
-  color: #CE2D34;
+  color: var(--red);
 }
 
 .btn.btn-blue {
-  background: #80287a;
-  color: #fff;
+  background: var(--violet);
+  color: var(--white);
 }
 
 .btn.btn-blue:hover {
-  background: #31b9ff;
+  background: var(--light-blue);
 }
 
 .btn.btn-blue-fill {
-  color: #80287a;
-  border-color: #80287a;
+  color: var(--violet);
+  border-color: var(--violet);
   background: transparent;
 }
 
 .btn.btn-blue-fill:hover {
-  color: white;
-  background: #80287a;
+  color: var(--white);
+  background: var(--violet);
 }
 
 .btn.btn-white-fill {
-  color: #fff;
-  border-color: #fff;
+  color: var(--white);
+  border-color: var(--white);
   background: transparent;
 }
 
 .btn.btn-white-fill:hover {
-  color: #80287a;
-  background: #fff;
+  color: var(--violet);
+  background: var(--white);
 }
 
 .btn.btn-gray-fill {
-  color: #fff;
-  border-color: #fff;
+  color: var(--white);
+  border-color: var(--white);
   background: transparent;
 }
 
 .btn.btn-gray-fill:hover {
-  border-color: #bbb;
-  background: #bbb;
+  border-color: var(--gray);
+  background: var(--gray);
 }
 
 /* Blink Cursor */
@@ -308,7 +320,6 @@
 
 .navbar {
   top: 50px;
-  height: 63px;
 }
 
 .container {
@@ -319,11 +330,11 @@
 /* Sections */
 section {
   position: relative;
+  overflow: hidden;
 }
 
 .section {
   padding: 40px 0;
-  background: #fff;
 }
 
 .main-block {
@@ -339,7 +350,7 @@
   width: 0;
   height: 0;
   border-top: 80px solid transparent;
-  border-right: 30px solid white;
+  border-right: 30px solid var(--white);
 }
 
 .cut-bottom {
@@ -351,7 +362,7 @@
   width: 0;
   height: 0;
   border-bottom: 80px solid transparent;
-  border-left: 30px solid white;
+  border-left: 30px solid var(--white);
 }
 
 .intro-tables {
@@ -446,8 +457,8 @@
 }
 
 header h2 {
-  font-size: 48px;
-  font-weight: 500;
+  font-size: 40px;
+  font-weight: normal;
 }
 
 section h5 {
@@ -455,26 +466,6 @@
   font-size: 20px;
 }
 
-.intro-tables .intro-table .heading {
-  margin: 0;
-  padding: 30px;
-}
-
-.intro-tables .intro-table .small-heading {
-  margin: 0;
-  padding: 0 30px;
-}
-
-.intro-tables .intro-table .bottom {
-  position: absolute;
-  bottom: 0;
-}
-
-.intro-tables .intro-table .owl-schedule .schedule-row {
-  padding: 10px 30px;
-  color: #80287a;
-  transition: all 0.3s ease;
-}
 
 .owl-schedule .schedule-row:not(:last-child) {
   border-bottom: 1px solid rgba(255, 255, 255, 0.4);
@@ -489,7 +480,7 @@
   width: 50px;
   height: 50px;
   border-radius: 50%;
-  background: #80287a;
+  background: var(--violet);
   /*-webkit-animation: ripple-animation 2s;*/
   /*animation: ripple-animation 2s;*/
 }
@@ -529,7 +520,7 @@
   height: 320px;
   margin: 80px 0;
   text-align: center;
-  border: 1px solid #ddd;
+  border: 1px solid var(--light-gray);
   -webkit-transition: all 0.3s ease;
   transition: all 0.3s ease;
 }
@@ -540,7 +531,7 @@
   display: inline-block;
   margin-bottom: 40px;
   padding: 10px;
-  background: #80287a;
+  background: var(--violet);
   -webkit-transition: all 0.3s ease;
   transition: all 0.3s ease;
 }
@@ -557,7 +548,7 @@
 }
 
 .service:hover {
-  border-color: #80287a;
+  border-color: var(--violet);
 }
 
 .service:hover .icon-holder {
@@ -589,7 +580,7 @@
 .team {
   margin: 80px 0;
   padding-bottom: 60px;
-  background: #80287a;
+  background: var(--violet);
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.07);
 }
 
@@ -620,7 +611,7 @@
 /* Pricing */
 
 #pricing {
-  background: #80287a url('../img/pricing1.jpg') no-repeat center center;
+  background: var(--violet) url('../img/pricing1.jpg') no-repeat center center;
   -webkit-background-size: cover;
   background-size: cover;
   -webkit-transition: background-image 0.6s linear 0.3s;
@@ -650,7 +641,7 @@
   width: 50%;
   height: 300px;
   padding: 50px 40px;
-  background: #bbb;
+  background: var(--gray);
   -webkit-transition: -webkit-transform 0.3s, background-image 0.3s, opacity 0.3s;
   transition: transform 0.3s, background-image 0.3s, opacity 0.3s;
   -webkit-backface-visibility: hidden;
@@ -673,7 +664,7 @@
   right: 20px;
   pointer-events: none;
   opacity: 0;
-  color: #fff;
+  color: var(--white);
   -webkit-transition: opacity 0.3s;
   transition: opacity 0.3s;
 }
@@ -689,7 +680,7 @@
 }
 
 .pricings .pricing .box-main.active {
-  background: #80287a;
+  background: var(--violet);
   -webkit-transform: translateX(-99%);
   -ms-transform: translateX(-99%);
   transform: translateX(-99%);
@@ -706,12 +697,12 @@
 
 .pricings .pricing .box-second.active {
   opacity: 1;
-  background: #80287a;
+  background: var(--violet);
 }
 
 .pricings .pricing.active .box-main,
 .pricings .pricing .box-second {
-  background: #80287a;
+  background: var(--violet);
 }
 
 .pricings .pricing .box-main a.btn {
@@ -721,14 +712,14 @@
 .owl-twitter i.icon {
   font-size: 36px;
   margin-bottom: 60px;
-  color: #80287a;
+  color: var(--violet);
 }
 
 /* Footer */
 
 footer {
   padding: 60px 0 40px;
-  background-image: linear-gradient(to right, #f59423, #e2632a, #ca2136, #832778);
+  background-image: linear-gradient(to right, #F3A865, #E98B69, #DD6A6F, #A8659F);
   -webkit-background-size: cover;
   background-size: cover;
 }
@@ -752,11 +743,11 @@
 
 footer .social-footer li a {
   font-size: 24px;
-  color: #fff;
+  color: var(--white);
 }
 
 footer .social-footer li:hover a {
-  color: #80287a;
+  color: var(--violet);
 }
 
 /* Form Control */
@@ -773,8 +764,8 @@
 }
 
 .form-control.form-white {
-  color: #fff;
-  border: 2px solid white;
+  color: var(--white);
+  border: 2px solid var(--white);
   background: transparent;
   -webkit-transition: background-color 0.3s;
   transition: background-color 0.3s;
@@ -782,24 +773,24 @@
 
 .form-control.form-white::-webkit-input-placeholder {
   /* WebKit browsers */
-  color: #fff;
+  color: var(--white);
 }
 
 .form-control.form-white:-moz-placeholder {
   opacity: 1;
   /* Mozilla Firefox 4 to 18 */
-  color: #fff;
+  color: var(--white);
 }
 
 .form-control.form-white::-moz-placeholder {
   opacity: 1;
   /* Mozilla Firefox 19+ */
-  color: #fff;
+  color: var(--white);
 }
 
 .form-control.form-white:-ms-input-placeholder {
   /* Internet Explorer 10+ */
-  color: #fff;
+  color: var(--white);
 }
 
 .form-control.form-white:focus {
@@ -831,7 +822,7 @@
   position: absolute;
   top: 20px;
   right: 30px;
-  color: #fff;
+  color: var(--white);
 }
 
 .popup-form {
@@ -853,17 +844,17 @@
   font-family: 'FontAwesome';
   display: inline-block;
   float: right;
-  color: white;
+  color: var(--white);
 }
 
 .popup-form .dropdown .dropdown-menu {
   top: 65px;
   width: 100%;
   padding: 0;
-  border: 2px solid white;
+  border: 2px solid var(--white);
   border-top: 0;
   border-radius: 0;
-  background: white;
+  background: var(--white);
   box-shadow: none;
 }
 
@@ -876,12 +867,12 @@
 .popup-form .dropdown .dropdown-menu li a {
   width: 100%;
   padding: 15px 30px;
-  color: #80287a;
+  color: var(--violet);
 }
 
 .popup-form .dropdown .dropdown-menu li:hover a {
-  color: #fff;
-  background: #80287a;
+  color: var(--white);
+  background: var(--violet);
 }
 
 /* Checkbox */
@@ -907,7 +898,7 @@
   width: 20px;
   height: 20px;
   cursor: pointer;
-  border: 2px solid white;
+  border: 2px solid var(--white);
   background: transparent;
   -webkit-transition: background-color 0.3s;
   transition: background-color 0.3s;
@@ -925,7 +916,7 @@
   width: 8px;
   height: 8px;
   opacity: 0;
-  background: white;
+  background: var(--white);
   -webkit-transition: all 0.3s ease;
   transition: all 0.3s ease;
 }
@@ -946,15 +937,15 @@
   display: inline-block;
   margin: 0 0 0 10px;
   white-space: normal;
-  color: #fff;
+  color: var(--white);
 }
 
 .btn.btn-submit {
   width: 100%;
   margin-top: 30px;
-  color: #80287a;
-  border: 2px solid #fff;
-  background: #fff;
+  color: var(--violet);
+  border: 2px solid var(--white);
+  background: var(--white);
 }
 
 .btn.btn-submit:focus {
@@ -962,8 +953,8 @@
 }
 
 .btn.btn-submit:hover {
-  color: #80287a;
-  background: #fff;
+  color: var(--violet);
+  background: var(--white);
 }
 
 /* Mobile Nav */
@@ -1004,7 +995,7 @@
 }
 
 .mobile-nav ul li a:not(.btn) {
-  color: #aaa;
+  color: var(--light-black);
 }
 
 .mobile-nav a.close-link {
@@ -1015,8 +1006,8 @@
   left: 0;
   width: 100%;
   padding: 15px 0;
-  color: #fff;
-  background: #80287a;
+  color: var(--white);
+  background: var(--violet);
 }
 
 .light {
@@ -1034,31 +1025,35 @@
 /* Colors */
 
 .white {
-  color: white;
+  color: var(--white);
 }
 
 .light-white {
-  color: rgba(255, 255, 255, 0.5);
+  color: var(--light-white);
+}
+
+a.light-white:hover, a.light-white:active {
+  color: var(--white);
 }
 
 .white-bg {
-  background: white;
+  background: var(--white);
 }
 
 .gray-bg {
-  background: #f7f7f7;
+  background: var(--lightest-gray);
 }
 
 .blue {
-  color: #80287a;
+  color: var(--violet);
 }
 
 .blue-bg {
-  background: #80287a;
+  background: var(--violet);
 }
 
 .muted {
-  color: #989da0;
+  color: var(--dark-gray);
 }
 
 .margin-top {
@@ -1118,11 +1113,11 @@
     width: 100%;
     padding: 50px 50px 0;
     text-align: left;
-    background: #80287a;
+    background: var(--violet);
   }
 
   .pricings .pricing .box-main.active {
-    background: #80287a;
+    background: var(--violet);
     -webkit-transform: translateX(0%);
     -ms-transform: translateX(0%);
     transform: translateX(0%);
@@ -1161,25 +1156,31 @@
 
 .index-title {
   font-size: 80px;
+  font-weight: 300;
 }
 
 .contributor-name {
-  color: #80287a;
+  color: var(--violet);
   font-size: 1.7em;
   margin-bottom: 0.5em;
 }
 
 .photo {
-  border: 1px solid #ddd;
+  border: 1px solid var(--light-gray);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
   border-radius: 4px;
   padding: 4px;
+  margin-top: 10px;
+}
+
+.photo img {
+  max-width: 100%;
 }
 
 .bs-callout {
   min-height: 160px;
   padding: 20px;
-  border: 1px solid #eee;
+  border: 1px solid var(--light-gray);
   border-left-width: 5px;
   border-radius: 3px;
 }
@@ -1203,11 +1204,11 @@
 
 .bs-callout-primary {
 
-  border-left-color: #80287a;
+  border-left-color: var(--violet);
 }
 
 .bs-callout-primary h4 {
-  color: #80287a;
+  color: var(--violet);
 }
 
 h2 {
@@ -1260,8 +1261,8 @@
 .admonitionblock > table td.content {
   padding-left: 1.125em;
   padding-right: 1.25em;
-  border-left: 1px solid #dddddd;
-  color: #6f6f6f;
+  border-left: 1px solid var(--light-gray);
+  color: var(--dark-gray);
   font-size: 15px;
 }
 
@@ -1279,7 +1280,15 @@
 span.icon > [class^="icon-"], span.icon > [class*=" icon-"] {
   cursor: default;
 }
-
+.green {
+  color: var(--green);
+}
+.red {
+  color: var(--red);
+}
+.blue {
+  color: var(--blue);
+}
 .admonitionblock td.icon [class^="fa icon-"]:before {
   font-size: 2.5em;
   text-shadow: 1px 1px 2px #e6e6e6;
@@ -1315,7 +1324,7 @@
 
 /* Markdown table */
 .mdtable {
-  border: 1px solid #ddd;
+  border: 1px solid var(--light-gray);
   width: 100%;
   max-width: 100%;
   margin-bottom: 20px;
@@ -1326,19 +1335,19 @@
 }
 
 .mdtable > thead > tr > th, .mdtable > tbody > tr > th, .mdtable > tfoot > tr > th, .mdtable > thead > tr > td, .mdtable > tbody > tr > td, .mdtable > tfoot > tr > td {
-  border: 1px solid #ddd;
+  border: 1px solid var(--light-gray);
 }
 
 .mdtable > thead > tr > th {
   vertical-align: bottom;
-  border-bottom: 2px solid #ddd;
+  border-bottom: 2px solid var(--light-gray);
 }
 
 .mdtable > thead > tr > th, .mdtable > tbody > tr > th, .mdtable > tfoot > tr > th, .mdtable > thead > tr > td, .mdtable > tbody > tr > td, .mdtable > tfoot > tr > td {
   padding: 8px;
   line-height: 1.42857143;
   vertical-align: top;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid var(--light-gray);
 }
 
 .group {
@@ -1362,9 +1371,396 @@
 .group-item-i {
   margin-right: 5px;
   margin-left: 3px;
-  color: #8c8c8c;
+  color: var(--gray);
   /* height: 100%; */
   position: relative;
   float: left;
   /* margin-inline-start: 40px; */
 }
+
+table {
+  border: 1px solid var(--light-gray);
+  width: 100%;
+  max-width: 100%;
+  margin-bottom: 20px;
+}
+
+table > thead > tr > th,
+table > tbody > tr > th,
+table > tfoot > tr > th,
+table > thead > tr > td,
+table > tbody > tr > td,
+table > tfoot > tr > td {
+  border: 1px solid var(--light-gray);
+  padding: 8px;
+}
+table > thead > tr > th,
+table > thead > tr > td {
+  border-bottom-width: 2px;
+  padding: 8px;
+}
+
+div.compact > ul > li,
+div.compact > ul > li > p {
+  margin: 0px;
+}
+
+.link-block {
+  background: rgba(133,38,117,0.4);
+  padding: 15px 20px 40px 20px;
+  font-size: 19px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.link-block .bottom h5 {
+  font-size: 15px;
+  font-weight: normal;
+  margin-top: 10px;
+}
+
+.link-block .bottom h4 {
+  font-size: 19px;
+  margin-bottom: 10px;
+}
+
+.link-block i {
+  margin: 10px 20px 0 10px;
+}
+
+.circled-icon {
+  border: 2px solid var(--light-white);
+  border-radius: 100%;
+  padding: 8px;
+}
+
+.header-links {
+  margin-top: 100px;
+}
+
+#main-block .table {
+  margin-bottom: 0;
+}
+
+.d-flex {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.m-auto {
+  margin: 0 auto;
+}
+
+.lead {
+  font-size: 20px;
+}
+
+.accented-block {
+  padding: 10px 30px;
+}
+
+.accented-block::before {
+  content: "";
+  width: 40px;
+  height: 4px;
+  display: block;
+  position: absolute;
+}
+
+.btn.btn-accent {
+  text-transform: uppercase;
+  padding: 10px 30px;
+  line-height: 25px;
+  font-size: 15px;
+  box-shadow: 2px 2px 3px -2px var(--light-black);
+  letter-spacing: 1.2px;
+  border-radius: 0;
+  color: var(--white);
+}
+
+.btn.btn-accent:active {
+  box-shadow: 0 0 15px -5px var(--light-black);
+}
+
+.btn i {
+  padding: 0 15px 0 0;
+  font-size: 27px;
+  margin: 0 -5px 0 -15px;
+  vertical-align: bottom;
+}
+
+.accented-block h5 {
+  font-size: 19px;
+}
+
+.accented-block h4 {
+  font-size: 38px;
+  color: var(--light-black)
+}
+
+.accented-block.accent-violet::before {
+  background: var(--violet);
+}
+
+.accented-block.accent-violet .btn.btn-accent,
+.accent-violet.btn.btn-accent {
+  background: var(--violet);
+  border-color: var(--violet);
+}
+
+.accented-block.accent-violet .btn.btn-accent:hover,
+.accented-block.accent-violet .btn.btn-accent:active,
+.accent-violet.btn.btn-accent:hover,
+.accent-violet.btn.btn-accent:active {
+  background: var(--white);
+  color: var(--violet);
+}
+
+.accented-block.accent-red::before {
+  background: var(--red);
+}
+
+.accented-block.accent-red .btn.btn-accent,
+.accent-red.btn.btn-accent {
+  background: var(--red);
+  border-color: var(--red);
+}
+
+.accented-block.accent-red .btn.btn-accent:hover,
+.accented-block.accent-red .btn.btn-accent:active,
+.accent-red.btn.btn-accent:hover,
+.accent-red.btn.btn-accent:active {
+  background: var(--white);
+  color: var(--red);
+}
+
+.accented-block.accent-orange::before {
+  background: var(--orange);
+}
+
+.accented-block.accent-orange .btn.btn-accent,
+.accent-orange.btn.btn-accent {
+  background: var(--orange);
+  border-color: var(--orange);
+}
+
+.accented-block.accent-orange .btn.btn-accent:hover,
+.accented-block.accent-orange .btn.btn-accent:active,
+.accent-orange.btn.btn-accent:hover,
+.accent-orange.btn.btn-accent:active {
+  background: var(--white);
+  color: var(--orange);
+}
+
+.f-column-start {
+  flex-direction: column;
+  align-items: flex-start;
+  text-align: left;
+}
+
+.f-column-end {
+  flex-direction: column;
+  align-items: flex-end;
+  text-align: right;
+}
+
+.f-column-end .btn, .f-column-end.accented-block::before {
+  align-self: flex-end;
+}
+
+.f-space-between {
+  justify-content: space-between;
+}
+
+.row.section {
+  padding: 80px 0;
+}
+
+.compatible-badge {
+  width: 204px;
+  height: 72px;
+  background-image: url(../img/jakartaee-compatible-badge-color.svg);
+  color: transparent;
+  display: inline-block;
+  background-size: contain;
+  user-select: none;
+}
+
+.compatible-badge.white {
+  background-image: url(../img/jakartaee-compatible-badge-white.svg);
+}
+
+.jakarta-ee-logo {
+  width: 265px;
+  height: 80px;
+  background: url(../img/jakarta_ee_logo.png) center center no-repeat;
+  background-size: contain;
+  display: inline-block;
+  user-select: none;
+}
+
+.microprofile-logo {
+  width: 288px;
+  height: 80px;
+  background: url(../img/microprofile_logo.png) center center no-repeat;
+  background-size: contain;
+  display: inline-block;
+  user-select: none;
+}
+
+.committers-info-section {
+  width: 100%;
+  color: var(--violet);
+  background: rgba(28, 36, 65, 0.93);
+  background: url('../img/commiters-info-back.jpg');
+  background-size: cover;
+  text-align: center;
+  padding: 25px 0;
+}
+
+.committers-info-section .info-count {
+  display: block;
+  font-weight: bold;
+  font-size: 60px;
+  color: rgba(255,255,255,1);
+  letter-spacing: 0.4px;
+  margin-top: 25px;
+}
+
+.committers-info-section .info-title {
+  display: block;
+  font-weight: normal;
+  font-size: 35px;
+  color: rgba(255,255,255,1);
+  text-transform: uppercase;
+  margin-bottom: 25px;
+}
+
+.flavours-title {
+  position: absolute;
+  writing-mode: vertical-rl;
+  text-orientation: mixed;
+  right: -92px;
+  top: calc(50% - 55px);
+  padding: 10px 0;
+}
+
+.flavours-block {
+  width: 375px;
+  max-width: calc(100vw - 130px);
+  position: relative;
+  min-width: 240px;
+}
+
+.flavour {
+  border: 2px solid rgb(229, 229, 229);
+  border-radius: 20px;
+  padding: 5px 20px;
+  margin-bottom: 25px;
+  display: flex;
+  box-shadow: 0 0 80px -10px var(--light-gray);
+}
+
+.flavour-icon {
+  border-radius: 100%;
+  width: 56px;
+  height: 56px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 3px 15px 3px 0;
+}
+
+.flavour-plus .flavour-icon{
+  background: rgb(238, 226, 255);
+  font-family: Montserrat;
+  font-style: normal;
+  font-weight: bold;
+  font-size: 40px;
+  color: rgba(131,38,119,1);
+}
+
+.flavour-plume .flavour-icon{
+  background: rgba(255,87,87, 0.344);
+  font-family: Poppins;
+  font-style: normal;
+  font-weight: bold;
+  font-size: 28px;
+  color: rgba(253,87,87,1);
+}
+
+.flavour-webprofile .flavour-icon{
+  background: rgba(243,143,36,0.476);
+  font-family: Poppins;
+  font-style: normal;
+  font-weight: bold;
+  font-size: 26px;
+  color: rgba(243,143,36,1);
+}
+
+.flavour-microprofile .flavour-icon{
+  background: url(../img/microprofile-icon-orange.png) center center no-repeat rgba(86,109,131,1);
+  color: transparent;
+}
+
+.flavour-content {
+  display: flex;
+  align-items: start;
+  justify-content: center;
+  flex-direction: column;
+  padding: 10px 0 0;
+}
+.flavour-artifact {
+  font-family: Montserrat;
+  font-style: normal;
+  font-weight: bold;
+  font-size: 11px;
+  color: rgba(34,34,34,1);
+  text-transform: uppercase;
+  letter-spacing: 2.5px;
+  opacity: 0.5;
+}
+.flavour-identifier, .flavours-title {
+  font-family: Bebas Neue;
+  font-style: normal;
+  font-weight: bold;
+  font-size: 21px;
+  color: rgba(34,34,34,1);
+  text-transform: uppercase;
+  letter-spacing: 1.25px;
+  background: var(--white);
+}
+
+.flavours-block::after {
+  display: block;
+  content: '';
+  bottom: 60px;
+  border: 3px dashed var(--light-gray);
+  position: absolute;
+  top: 36px;
+  border-left: none;
+  width: 68px;
+  right: -79px;
+  z-index: -1;
+}
+
+.block-content {
+  max-width: 90%;
+}
+
+.no-shadow {
+  box-shadow: none !important;
+}
+
+.navbar-nav > li > a.btn {
+  padding: 7px 16px;
+  text-transform: initial;
+}
+
+.navbar-brand img {
+  margin: -5px 0;
+}
+
+h2 > a, h3 > a, h4 > a {
+  padding-top: 155px;
+}
diff --git a/src/main/jbake/assets/css/jqtree.css b/src/main/jbake/assets/css/jqtree.css
index 6d07f16..4b92bdf 100755
--- a/src/main/jbake/assets/css/jqtree.css
+++ b/src/main/jbake/assets/css/jqtree.css
@@ -31,6 +31,8 @@
       margin-left: 0.5em; }
   ul.jqtree-tree .jqtree-element {
     cursor: pointer;
+    padding: 0 10px;
+    border: 1px solid transparent;
     position: relative; }
   ul.jqtree-tree .jqtree-title {
     color: #1C4257;
@@ -83,12 +85,11 @@
     box-sizing: content-box; }
   ul.jqtree-tree li.jqtree-selected > .jqtree-element,
   ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover {
-    background-color: #97BDD6;
-    background: -webkit-gradient(linear, left top, left bottom, from(#BEE0F5), to(#89AFCA));
-    background: -moz-linear-gradient(top, #BEE0F5, #89AFCA);
-    background: -ms-linear-gradient(top, #BEE0F5, #89AFCA);
-    background: -o-linear-gradient(top, #BEE0F5, #89AFCA);
-    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7); }
+    border: 1px solid #97BDD6;
+  }
+  ul.jqtree-tree li.jqtree-selected > .jqtree-element .fa-folder-o::before {
+      content: "\f115";
+  }
   ul.jqtree-tree .jqtree-moving > .jqtree-element .jqtree-title {
     outline: dashed 1px #0000ff; }
 
diff --git a/src/main/jbake/assets/img/apache_tomee-logo-white.svg b/src/main/jbake/assets/img/apache_tomee-logo-white.svg
new file mode 100644
index 0000000..265da49
--- /dev/null
+++ b/src/main/jbake/assets/img/apache_tomee-logo-white.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 309.12 84.6"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:url(#linear-gradient-2);}.cls-3{fill:url(#linear-gradient-3);}.cls-4{fill:url(#linear-gradient-4);}.cls-5{fill:url(#linear-gradient-5);}.cls-6{fill:url(#linear-gradient-6);}.cls-7{fill:url(#linear-gradient-7);}.cls-8{fill:#fff;}</style><linearGradient id="linear-gradient" x1="-140.8" y1="299.74" x2="-140.54" y2="299.82" gradientTransform="matrix(73.55, 13.53, 12.37, -67.22, 6705.27, 22065.73)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f69a24"/><stop offset="0.31" stop-color="#f79b24"/><stop offset="0.84" stop-color="#e97927"/></linearGradient><linearGradient id="linear-gradient-2" x1="-140.57" y1="301.1" x2="-140.04" y2="301.79" gradientTransform="matrix(73.18, 13.46, 22.17, -120.5, 3610.25, 38263.65)" gradientUnits="userSpaceOnUse"><stop offset="0.32" stop-color="#9f2065"/><stop offset="0.63" stop-color="#c92039"/><stop offset="0.75" stop-color="#ce2335"/><stop offset="1" stop-color="#e97927"/></linearGradient><linearGradient id="linear-gradient-3" x1="-139.85" y1="302.64" x2="-139.44" y2="303.04" gradientTransform="matrix(94.54, 17.39, 39.31, -213.67, 1324.66, 67181.12)" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-4" x1="-138.47" y1="303.49" x2="-138.13" y2="303.7" gradientTransform="matrix(61.33, 11.28, 37.35, -202.99, -2836.49, 63245.35)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#282762"/><stop offset="0.1" stop-color="#66308d"/><stop offset="0.79" stop-color="#9f2065"/><stop offset="0.95" stop-color="#cd2032"/></linearGradient><linearGradient id="linear-gradient-5" x1="-140.85" y1="300.81" x2="-140.49" y2="301.63" gradientTransform="matrix(109.04, 20.06, 18.91, -102.77, 9674.72, 33833.56)" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-6" x1="-140.36" y1="302.64" x2="-140.09" y2="303.08" gradientTransform="matrix(147.15, 27.07, 35.4, -192.43, 9947.36, 62125.85)" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-7" x1="-139.7" y1="303.39" x2="-139.43" y2="304" gradientTransform="matrix(87.39, 16.08, 15.27, -82.98, 7588.49, 27506.27)" xlink:href="#linear-gradient-4"/></defs><path class="cls-1" d="M62.41,3.82c-1.59.58-4.44,2.56-8,5.53l0,.22,1.66,5.11.11.11a64.47,64.47,0,0,1,6.92-6,2.77,2.77,0,0,1,.25-.19c-.08.05-.17.13-.25.19a59.64,59.64,0,0,0-6.6,6.17l.31.13s6.67.56,9.93.61l.21-.13c2-5.45.53-8.41.53-8.41S65.71,2.62,62.41,3.82Z" transform="translate(-6.36 -3.62)"/><path class="cls-2" d="M46.06,26.2c1.08-1.34,2.16-2.67,3.23-3.94s2.24-2.59,3.37-3.81a.87.87,0,0,0,.19-.23c1.12-1.2,2.22-2.33,3.33-3.43L54.45,9.33q-.36.3-.72.63c-.93.81-1.91,1.67-2.91,2.6s-2.32,2.17-3.52,3.36-2.25,2.26-3.38,3.45c-1,1-2,2.07-2.94,3.17l-.11.12,0,.2L42.92,30l.13.08C44.05,28.76,45.05,27.46,46.06,26.2Z" transform="translate(-6.36 -3.62)"/><path class="cls-3" d="M25.88,55.47c.88-1.44,1.8-2.88,2.71-4.35s1.78-2.81,2.71-4.21,1.85-2.82,2.8-4.24S36,39.8,37,38.38s2-2.79,2.95-4.17c.35-.49.73-1,1.09-1.49.62-.85,1.26-1.69,1.88-2.53,0-.05.07-.08.1-.13l-2.18-7.4-.22.24c-1,1.17-2.08,2.35-3.1,3.57s-2.08,2.5-3.09,3.78c-.87,1.08-1.7,2.17-2.54,3.28l-.49.67c-1,1.4-2,2.75-2.85,4.08q-1.47,2.23-2.68,4.29c-.54.91-1,1.76-1.48,2.61s-.75,1.44-1.1,2.15c-.85,1.7-1.61,3.4-2.3,5.13v.22l2.09,7.14.09.08c.68-1.14,1.37-2.28,2.08-3.45C25.49,56.12,25.69,55.8,25.88,55.47Z" transform="translate(-6.36 -3.62)"/><path class="cls-4" d="M20.94,52.68A54,54,0,0,0,18.85,59c0,.07-.05.14-.07.23a14.17,14.17,0,0,0-3.32-4.12C17,58.49,18,61.74,17.69,64.69a9,9,0,0,1-4.23-1.54,9.09,9.09,0,0,0,3.3,2.95c-1.69-.2-3.64.62-5.64,1.61,2.76-.57,4.9-.6,6.33,0-3.58,6.22-7.28,13.15-11.09,20.51A2.16,2.16,0,0,0,8,87.11C8.69,85.77,13.19,77,19.8,65.63c.19-.31.38-.65.57-1l.16-.27c.7-1.18,1.41-2.41,2.16-3.65.16-.28.34-.56.5-.85v0L21,52.46A.93.93,0,0,1,20.94,52.68Z" transform="translate(-6.36 -3.62)"/><path class="cls-5" d="M56.5,15c-1,1-2.08,2.23-3.28,3.59-.07.06-.12.15-.19.21-1,1.18-2.12,2.47-3.29,3.9-1,1.23-2.07,2.55-3.19,4-1,1.25-2,2.57-3,4l.15.1,8.52.64.22-.1a10.83,10.83,0,0,0,5.45-2.88c.36-.36.75-.75,1.12-1.15,1.15-1.24,2.31-2.6,3.37-4s2-2.69,2.72-3.9a22.43,22.43,0,0,0,1.19-2.16c.28-.58.51-1.13.7-1.65A95.38,95.38,0,0,1,56.5,15Z" transform="translate(-6.36 -3.62)"/><path class="cls-6" d="M43.08,31.29,41.84,33c-.45.62-.92,1.27-1.38,1.93-.22.33-.47.68-.7,1-.73,1-1.44,2.08-2.2,3.16-.91,1.34-1.86,2.74-2.81,4.18S32.9,46.09,32,47.58,30.13,50.46,29.2,52s-1.69,2.71-2.54,4.15c-.05.07-.08.14-.13.2-.86,1.42-1.7,2.87-2.59,4.36,0,0-.07.12-.1.15l.12,0,2.55.19.15,0c-.05,0-.07-.11-.12-.13,3.38.19,8.23-1.48,11.65-4a27.4,27.4,0,0,0,4.53-4.35,44,44,0,0,0,3.2-4.4c.93-1.43,1.85-3,2.78-4.71a10.35,10.35,0,0,1-2.75.43H44.87a12.22,12.22,0,0,0,7.6-5.1,11.08,11.08,0,0,1-4,.95c-.22,0-.44,0-.68,0H47.6a12.7,12.7,0,0,0,3-1l.56-.3.8-.53a5.25,5.25,0,0,0,.49-.37,8.61,8.61,0,0,0,1.08-1c.12-.11.22-.24.33-.35s.27-.36.39-.54c.59-.79,1.08-1.49,1.47-2.13.21-.31.37-.6.54-.88a2.58,2.58,0,0,1,.18-.32c.17-.3.31-.57.44-.83s.28-.65.36-.86a3.15,3.15,0,0,1-.41.18,12.8,12.8,0,0,1-4.06.59l2.6.18-2.6-.18h-.46s-2.93-.24-8.81-.68A7.25,7.25,0,0,0,43.08,31.29Z" transform="translate(-6.36 -3.62)"/><path class="cls-7" d="M23.45,61.44c-.68,1.16-1.38,2.35-2.07,3.56,0,0,0,0,0,0a5.08,5.08,0,0,0-.3.52c-.47.82-.88,1.54-1.82,3.23a7.11,7.11,0,0,1,2,3.52,5.49,5.49,0,0,0-1.1-4.11c4.94,1.13,9.46.66,12.33-2.56a9.66,9.66,0,0,0,.73-.93c-1.24,1.09-2.6,1.4-4.91.85h0c3.75-.91,5.75-2.08,7.75-4.26.46-.52.94-1.09,1.43-1.72A11,11,0,0,1,26.66,61l-2.82-.2C23.71,61,23.58,61.22,23.45,61.44Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M96.11,64.39H92.05a1.71,1.71,0,0,1-1.11-.34,2.18,2.18,0,0,1-.65-.85l-2.1-5.76H76.49L74.38,63.2a1.86,1.86,0,0,1-.61.82,1.67,1.67,0,0,1-1.11.37h-4.1L79.67,36.15H85ZM86.84,53.73l-3.44-9.4c-.17-.41-.34-.91-.53-1.48s-.36-1.19-.54-1.85c-.17.66-.35,1.28-.53,1.86s-.36,1.08-.53,1.51l-3.41,9.36Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M103,47.09a10.51,10.51,0,0,1,2.79-2.25,7.51,7.51,0,0,1,3.67-.86,6.55,6.55,0,0,1,3,.69,6.67,6.67,0,0,1,2.34,2,9.24,9.24,0,0,1,1.52,3.2,16.08,16.08,0,0,1,.54,4.37,13.78,13.78,0,0,1-.6,4.15,10.16,10.16,0,0,1-1.73,3.32,8,8,0,0,1-2.72,2.2,7.86,7.86,0,0,1-3.56.79,7.26,7.26,0,0,1-2.87-.51,7.15,7.15,0,0,1-2.13-1.44v8.2H98.44V44.35h3a1.2,1.2,0,0,1,1.23.88Zm.25,12.11a4.72,4.72,0,0,0,1.79,1.4,5.35,5.35,0,0,0,2.1.41,4.69,4.69,0,0,0,2-.41,3.86,3.86,0,0,0,1.49-1.25,6.11,6.11,0,0,0,1-2.12,12.15,12.15,0,0,0,.33-3,13.28,13.28,0,0,0-.28-3,5.68,5.68,0,0,0-.81-2,3.25,3.25,0,0,0-1.28-1.12,4,4,0,0,0-1.71-.35,4.82,4.82,0,0,0-2.56.64,7.76,7.76,0,0,0-2,1.78Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M120.35,47.15A11.86,11.86,0,0,1,128.66,44a8.23,8.23,0,0,1,3.15.58,6.68,6.68,0,0,1,2.34,1.6,6.92,6.92,0,0,1,1.46,2.45,9.47,9.47,0,0,1,.5,3.13V64.39h-2.19a2.19,2.19,0,0,1-1.06-.21,1.4,1.4,0,0,1-.58-.83l-.43-1.44a15.07,15.07,0,0,1-1.49,1.2,8.72,8.72,0,0,1-1.5.87,8.82,8.82,0,0,1-1.67.54,9.91,9.91,0,0,1-2,.18,7.56,7.56,0,0,1-2.34-.34,5.11,5.11,0,0,1-1.86-1,4.63,4.63,0,0,1-1.21-1.69,6,6,0,0,1-.43-2.37,4.64,4.64,0,0,1,.25-1.51,4.59,4.59,0,0,1,.83-1.44A6.93,6.93,0,0,1,122,55,9.43,9.43,0,0,1,124.22,54a19.46,19.46,0,0,1,3.12-.73,31,31,0,0,1,4.06-.34V51.74a4.38,4.38,0,0,0-.86-3,3.12,3.12,0,0,0-2.48-1,5.92,5.92,0,0,0-1.94.27,8.24,8.24,0,0,0-1.36.62l-1.07.61a2,2,0,0,1-1.06.28,1.38,1.38,0,0,1-.86-.27,2.16,2.16,0,0,1-.56-.61Zm11.05,8.69a25.25,25.25,0,0,0-3.52.36,9.2,9.2,0,0,0-2.28.67,3.05,3.05,0,0,0-1.23,1A2,2,0,0,0,124,59a2.11,2.11,0,0,0,.75,1.82,3.27,3.27,0,0,0,2,.54,5.7,5.7,0,0,0,2.57-.54,7.5,7.5,0,0,0,2.12-1.63Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M155.18,48.59a2.15,2.15,0,0,1-.42.43.9.9,0,0,1-.59.16,1.36,1.36,0,0,1-.73-.23c-.23-.15-.51-.32-.84-.5a6,6,0,0,0-1.16-.51,5.3,5.3,0,0,0-1.67-.23,5.15,5.15,0,0,0-2.22.46A4.24,4.24,0,0,0,146,49.49a5.86,5.86,0,0,0-1,2.08,11,11,0,0,0-.31,2.76,10.71,10.71,0,0,0,.34,2.85,6,6,0,0,0,1,2.1,4.15,4.15,0,0,0,1.57,1.29,4.76,4.76,0,0,0,2.07.44,5.09,5.09,0,0,0,1.86-.28,5.57,5.57,0,0,0,1.2-.63c.33-.22.61-.43.85-.62a1.27,1.27,0,0,1,.81-.28,1,1,0,0,1,.88.44l1.39,1.76A8.77,8.77,0,0,1,154.91,63,9.5,9.5,0,0,1,153,64a10.51,10.51,0,0,1-2.07.54,15.22,15.22,0,0,1-2.12.15,9,9,0,0,1-3.5-.69,8.32,8.32,0,0,1-2.87-2,9.63,9.63,0,0,1-1.94-3.25,12.48,12.48,0,0,1-.71-4.39,12.84,12.84,0,0,1,.63-4.09A9.3,9.3,0,0,1,142.26,47a8.5,8.5,0,0,1,3-2.16,10.53,10.53,0,0,1,4.18-.78,9.24,9.24,0,0,1,7,2.79Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M164.67,46.5a10.21,10.21,0,0,1,2.58-1.77,7.43,7.43,0,0,1,3.3-.69,7.23,7.23,0,0,1,2.91.56,5.74,5.74,0,0,1,2.12,1.56,7.09,7.09,0,0,1,1.29,2.4,10.32,10.32,0,0,1,.44,3.08V64.39h-4.83V51.64a4.3,4.3,0,0,0-.84-2.84,3.14,3.14,0,0,0-2.55-1,5,5,0,0,0-2.35.57,8.44,8.44,0,0,0-2.07,1.54V64.39h-4.82v-29h4.82Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M185.78,55a9.39,9.39,0,0,0,.55,2.66,5.36,5.36,0,0,0,1.13,1.86,4.44,4.44,0,0,0,1.67,1.09,6.08,6.08,0,0,0,2.14.36,6.72,6.72,0,0,0,2-.27,8.26,8.26,0,0,0,1.48-.61c.43-.22.8-.42,1.12-.6a1.86,1.86,0,0,1,.92-.27,1,1,0,0,1,.9.44l1.39,1.76A7.85,7.85,0,0,1,197.3,63a9.79,9.79,0,0,1-2.08,1,12.18,12.18,0,0,1-2.2.54,16.53,16.53,0,0,1-2.18.15A10.79,10.79,0,0,1,187,64a8.65,8.65,0,0,1-3.12-2.05,9.68,9.68,0,0,1-2.09-3.36,12.93,12.93,0,0,1-.76-4.64,11.12,11.12,0,0,1,.66-3.85,9.15,9.15,0,0,1,1.91-3.15,8.9,8.9,0,0,1,3-2.12,10,10,0,0,1,4-.78,9.68,9.68,0,0,1,3.5.61,7.51,7.51,0,0,1,2.75,1.76,8.28,8.28,0,0,1,1.81,2.86,10.5,10.5,0,0,1,.65,3.85,3.14,3.14,0,0,1-.23,1.48,1,1,0,0,1-.9.38Zm9.2-2.91a5.66,5.66,0,0,0-.27-1.77,3.93,3.93,0,0,0-.79-1.45,3.6,3.6,0,0,0-1.33-1,4.62,4.62,0,0,0-1.89-.36,4.49,4.49,0,0,0-3.29,1.19,5.82,5.82,0,0,0-1.53,3.38Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M222.79,38.46h-9.71V64.39h-2V38.46h-9.76v-1.7h21.48Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M229.58,44.65a9.27,9.27,0,0,1,3.74.71,7.65,7.65,0,0,1,2.78,2,8.89,8.89,0,0,1,1.73,3.15,14.51,14.51,0,0,1,0,8.26,8.93,8.93,0,0,1-1.73,3.14,7.51,7.51,0,0,1-2.78,2,10.34,10.34,0,0,1-7.48,0,7.63,7.63,0,0,1-2.79-2,9,9,0,0,1-1.74-3.14,14.75,14.75,0,0,1,0-8.26,8.91,8.91,0,0,1,1.74-3.15,7.77,7.77,0,0,1,2.79-2A9.27,9.27,0,0,1,229.58,44.65Zm0,18.53a7.2,7.2,0,0,0,3-.6,5.56,5.56,0,0,0,2.16-1.71,7.36,7.36,0,0,0,1.3-2.68,14.62,14.62,0,0,0,0-7,7.46,7.46,0,0,0-1.3-2.7,5.7,5.7,0,0,0-2.16-1.73,7.05,7.05,0,0,0-3-.61,7,7,0,0,0-3,.61,5.73,5.73,0,0,0-2.17,1.73,7.64,7.64,0,0,0-1.31,2.7,14.3,14.3,0,0,0,0,7,7.54,7.54,0,0,0,1.31,2.68,5.59,5.59,0,0,0,2.17,1.71A7.12,7.12,0,0,0,229.58,63.18Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M243.87,64.39V45h1a.52.52,0,0,1,.57.49l.17,2.81a10.28,10.28,0,0,1,2.6-2.62,5.77,5.77,0,0,1,3.3-1A4.73,4.73,0,0,1,255,45.88a6.33,6.33,0,0,1,1.72,3.41,7.1,7.1,0,0,1,1-2.07,6.09,6.09,0,0,1,1.46-1.45,5.84,5.84,0,0,1,1.78-.85,7.39,7.39,0,0,1,2-.27,6.69,6.69,0,0,1,2.6.48,5,5,0,0,1,1.95,1.41,6.3,6.3,0,0,1,1.23,2.31A10.28,10.28,0,0,1,269.1,52V64.39h-1.85V52A6.66,6.66,0,0,0,266,47.63a4.29,4.29,0,0,0-3.52-1.5,5.15,5.15,0,0,0-1.94.37,4.77,4.77,0,0,0-1.64,1.11,5.26,5.26,0,0,0-1.13,1.82,7.08,7.08,0,0,0-.42,2.54V64.39h-1.88V52a7.17,7.17,0,0,0-1.12-4.34,3.86,3.86,0,0,0-3.29-1.5,5,5,0,0,0-2.93.94,8.78,8.78,0,0,0-2.4,2.6V64.39Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M292.63,62.73l0,1.66H276V36.76H292.6v1.66H278.05V49.59h12.1v1.62h-12.1V62.73Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M315.48,62.73l0,1.66H298.88V36.76h16.56v1.66H300.89V49.59H313v1.62H300.89V62.73Z" transform="translate(-6.36 -3.62)"/></svg>
\ No newline at end of file
diff --git a/src/main/jbake/assets/img/apache_tomee-logo.svg b/src/main/jbake/assets/img/apache_tomee-logo.svg
new file mode 100644
index 0000000..e1c990c
--- /dev/null
+++ b/src/main/jbake/assets/img/apache_tomee-logo.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 309.12 84.6"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:url(#linear-gradient-2);}.cls-3{fill:url(#linear-gradient-3);}.cls-4{fill:url(#linear-gradient-4);}.cls-5{fill:url(#linear-gradient-5);}.cls-6{fill:url(#linear-gradient-6);}.cls-7{fill:url(#linear-gradient-7);}.cls-8{fill:#231f20;}</style><linearGradient id="linear-gradient" x1="-140.8" y1="299.74" x2="-140.54" y2="299.82" gradientTransform="matrix(73.55, 13.53, 12.37, -67.22, 6705.27, 22065.73)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f69a24"/><stop offset="0.31" stop-color="#f79b24"/><stop offset="0.84" stop-color="#e97927"/></linearGradient><linearGradient id="linear-gradient-2" x1="-140.57" y1="301.1" x2="-140.04" y2="301.79" gradientTransform="matrix(73.18, 13.46, 22.17, -120.5, 3610.25, 38263.65)" gradientUnits="userSpaceOnUse"><stop offset="0.32" stop-color="#9f2065"/><stop offset="0.63" stop-color="#c92039"/><stop offset="0.75" stop-color="#ce2335"/><stop offset="1" stop-color="#e97927"/></linearGradient><linearGradient id="linear-gradient-3" x1="-139.85" y1="302.64" x2="-139.44" y2="303.04" gradientTransform="matrix(94.54, 17.39, 39.31, -213.67, 1324.66, 67181.12)" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-4" x1="-138.47" y1="303.49" x2="-138.13" y2="303.7" gradientTransform="matrix(61.33, 11.28, 37.35, -202.99, -2836.49, 63245.35)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#282762"/><stop offset="0.1" stop-color="#66308d"/><stop offset="0.79" stop-color="#9f2065"/><stop offset="0.95" stop-color="#cd2032"/></linearGradient><linearGradient id="linear-gradient-5" x1="-140.85" y1="300.81" x2="-140.49" y2="301.63" gradientTransform="matrix(109.04, 20.06, 18.91, -102.77, 9674.72, 33833.56)" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-6" x1="-140.36" y1="302.64" x2="-140.09" y2="303.08" gradientTransform="matrix(147.15, 27.07, 35.4, -192.43, 9947.36, 62125.85)" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-7" x1="-139.7" y1="303.39" x2="-139.43" y2="304" gradientTransform="matrix(87.39, 16.08, 15.27, -82.98, 7588.49, 27506.27)" xlink:href="#linear-gradient-4"/></defs><path class="cls-1" d="M62.41,3.82c-1.59.58-4.44,2.56-8,5.53l0,.22,1.66,5.11.11.11a64.47,64.47,0,0,1,6.92-6,2.77,2.77,0,0,1,.25-.19c-.08.05-.17.13-.25.19a59.64,59.64,0,0,0-6.6,6.17l.31.13s6.67.56,9.93.61l.21-.13c2-5.45.53-8.41.53-8.41S65.71,2.62,62.41,3.82Z" transform="translate(-6.36 -3.62)"/><path class="cls-2" d="M46.06,26.2c1.08-1.34,2.16-2.67,3.23-3.94s2.24-2.59,3.37-3.81a.87.87,0,0,0,.19-.23c1.12-1.2,2.22-2.33,3.33-3.43L54.45,9.33q-.36.3-.72.63c-.93.81-1.91,1.67-2.91,2.6s-2.32,2.17-3.52,3.36-2.25,2.26-3.38,3.45c-1,1-2,2.07-2.94,3.17l-.11.12,0,.2L42.92,30l.13.08C44.05,28.76,45.05,27.46,46.06,26.2Z" transform="translate(-6.36 -3.62)"/><path class="cls-3" d="M25.88,55.47c.88-1.44,1.8-2.88,2.71-4.35s1.78-2.81,2.71-4.21,1.85-2.82,2.8-4.24S36,39.8,37,38.38s2-2.79,2.95-4.17c.35-.49.73-1,1.09-1.49.62-.85,1.26-1.69,1.88-2.53,0-.05.07-.08.1-.13l-2.18-7.4-.22.24c-1,1.17-2.08,2.35-3.1,3.57s-2.08,2.5-3.09,3.78c-.87,1.08-1.7,2.17-2.54,3.28l-.49.67c-1,1.4-2,2.75-2.85,4.08q-1.47,2.23-2.68,4.29c-.54.91-1,1.76-1.48,2.61s-.75,1.44-1.1,2.15c-.85,1.7-1.61,3.4-2.3,5.13v.22l2.09,7.14.09.08c.68-1.14,1.37-2.28,2.08-3.45C25.49,56.12,25.69,55.8,25.88,55.47Z" transform="translate(-6.36 -3.62)"/><path class="cls-4" d="M20.94,52.68A54,54,0,0,0,18.85,59c0,.07-.05.14-.07.23a14.17,14.17,0,0,0-3.32-4.12C17,58.49,18,61.74,17.69,64.69a9,9,0,0,1-4.23-1.54,9.09,9.09,0,0,0,3.3,2.95c-1.69-.2-3.64.62-5.64,1.61,2.76-.57,4.9-.6,6.33,0-3.58,6.22-7.28,13.15-11.09,20.51A2.16,2.16,0,0,0,8,87.11C8.69,85.77,13.19,77,19.8,65.63c.19-.31.38-.65.57-1l.16-.27c.7-1.18,1.41-2.41,2.16-3.65.16-.28.34-.56.5-.85v0L21,52.46A.93.93,0,0,1,20.94,52.68Z" transform="translate(-6.36 -3.62)"/><path class="cls-5" d="M56.5,15c-1,1-2.08,2.23-3.28,3.59-.07.06-.12.15-.19.21-1,1.18-2.12,2.47-3.29,3.9-1,1.23-2.07,2.55-3.19,4-1,1.25-2,2.57-3,4l.15.1,8.52.64.22-.1a10.83,10.83,0,0,0,5.45-2.88c.36-.36.75-.75,1.12-1.15,1.15-1.24,2.31-2.6,3.37-4s2-2.69,2.72-3.9a22.43,22.43,0,0,0,1.19-2.16c.28-.58.51-1.13.7-1.65A95.38,95.38,0,0,1,56.5,15Z" transform="translate(-6.36 -3.62)"/><path class="cls-6" d="M43.08,31.29,41.84,33c-.45.62-.92,1.27-1.38,1.93-.22.33-.47.68-.7,1-.73,1-1.44,2.08-2.2,3.16-.91,1.34-1.86,2.74-2.81,4.18S32.9,46.09,32,47.58,30.13,50.46,29.2,52s-1.69,2.71-2.54,4.15c-.05.07-.08.14-.13.2-.86,1.42-1.7,2.87-2.59,4.36,0,0-.07.12-.1.15l.12,0,2.55.19.15,0c-.05,0-.07-.11-.12-.13,3.38.19,8.23-1.48,11.65-4a27.4,27.4,0,0,0,4.53-4.35,44,44,0,0,0,3.2-4.4c.93-1.43,1.85-3,2.78-4.71a10.35,10.35,0,0,1-2.75.43H44.87a12.22,12.22,0,0,0,7.6-5.1,11.08,11.08,0,0,1-4,.95c-.22,0-.44,0-.68,0H47.6a12.7,12.7,0,0,0,3-1l.56-.3.8-.53a5.25,5.25,0,0,0,.49-.37,8.61,8.61,0,0,0,1.08-1c.12-.11.22-.24.33-.35s.27-.36.39-.54c.59-.79,1.08-1.49,1.47-2.13.21-.31.37-.6.54-.88a2.58,2.58,0,0,1,.18-.32c.17-.3.31-.57.44-.83s.28-.65.36-.86a3.15,3.15,0,0,1-.41.18,12.8,12.8,0,0,1-4.06.59l2.6.18-2.6-.18h-.46s-2.93-.24-8.81-.68A7.25,7.25,0,0,0,43.08,31.29Z" transform="translate(-6.36 -3.62)"/><path class="cls-7" d="M23.45,61.44c-.68,1.16-1.38,2.35-2.07,3.56,0,0,0,0,0,0a5.08,5.08,0,0,0-.3.52c-.47.82-.88,1.54-1.82,3.23a7.11,7.11,0,0,1,2,3.52,5.49,5.49,0,0,0-1.1-4.11c4.94,1.13,9.46.66,12.33-2.56a9.66,9.66,0,0,0,.73-.93c-1.24,1.09-2.6,1.4-4.91.85h0c3.75-.91,5.75-2.08,7.75-4.26.46-.52.94-1.09,1.43-1.72A11,11,0,0,1,26.66,61l-2.82-.2C23.71,61,23.58,61.22,23.45,61.44Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M96.11,64.39H92.05a1.71,1.71,0,0,1-1.11-.34,2.18,2.18,0,0,1-.65-.85l-2.1-5.76H76.49L74.38,63.2a1.86,1.86,0,0,1-.61.82,1.67,1.67,0,0,1-1.11.37h-4.1L79.67,36.15H85ZM86.84,53.73l-3.44-9.4c-.17-.41-.34-.91-.53-1.48s-.36-1.19-.54-1.85c-.17.66-.35,1.28-.53,1.86s-.36,1.08-.53,1.51l-3.41,9.36Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M103,47.09a10.51,10.51,0,0,1,2.79-2.25,7.51,7.51,0,0,1,3.67-.86,6.55,6.55,0,0,1,3,.69,6.67,6.67,0,0,1,2.34,2,9.24,9.24,0,0,1,1.52,3.2,16.08,16.08,0,0,1,.54,4.37,13.78,13.78,0,0,1-.6,4.15,10.16,10.16,0,0,1-1.73,3.32,8,8,0,0,1-2.72,2.2,7.86,7.86,0,0,1-3.56.79,7.26,7.26,0,0,1-2.87-.51,7.15,7.15,0,0,1-2.13-1.44v8.2H98.44V44.35h3a1.2,1.2,0,0,1,1.23.88Zm.25,12.11a4.72,4.72,0,0,0,1.79,1.4,5.35,5.35,0,0,0,2.1.41,4.69,4.69,0,0,0,2-.41,3.86,3.86,0,0,0,1.49-1.25,6.11,6.11,0,0,0,1-2.12,12.15,12.15,0,0,0,.33-3,13.28,13.28,0,0,0-.28-3,5.68,5.68,0,0,0-.81-2,3.25,3.25,0,0,0-1.28-1.12,4,4,0,0,0-1.71-.35,4.82,4.82,0,0,0-2.56.64,7.76,7.76,0,0,0-2,1.78Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M120.35,47.15A11.86,11.86,0,0,1,128.66,44a8.23,8.23,0,0,1,3.15.58,6.68,6.68,0,0,1,2.34,1.6,6.92,6.92,0,0,1,1.46,2.45,9.47,9.47,0,0,1,.5,3.13V64.39h-2.19a2.19,2.19,0,0,1-1.06-.21,1.4,1.4,0,0,1-.58-.83l-.43-1.44a15.07,15.07,0,0,1-1.49,1.2,8.72,8.72,0,0,1-1.5.87,8.82,8.82,0,0,1-1.67.54,9.91,9.91,0,0,1-2,.18,7.56,7.56,0,0,1-2.34-.34,5.11,5.11,0,0,1-1.86-1,4.63,4.63,0,0,1-1.21-1.69,6,6,0,0,1-.43-2.37,4.64,4.64,0,0,1,.25-1.51,4.59,4.59,0,0,1,.83-1.44A6.93,6.93,0,0,1,122,55,9.43,9.43,0,0,1,124.22,54a19.46,19.46,0,0,1,3.12-.73,31,31,0,0,1,4.06-.34V51.74a4.38,4.38,0,0,0-.86-3,3.12,3.12,0,0,0-2.48-1,5.92,5.92,0,0,0-1.94.27,8.24,8.24,0,0,0-1.36.62l-1.07.61a2,2,0,0,1-1.06.28,1.38,1.38,0,0,1-.86-.27,2.16,2.16,0,0,1-.56-.61Zm11.05,8.69a25.25,25.25,0,0,0-3.52.36,9.2,9.2,0,0,0-2.28.67,3.05,3.05,0,0,0-1.23,1A2,2,0,0,0,124,59a2.11,2.11,0,0,0,.75,1.82,3.27,3.27,0,0,0,2,.54,5.7,5.7,0,0,0,2.57-.54,7.5,7.5,0,0,0,2.12-1.63Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M155.18,48.59a2.15,2.15,0,0,1-.42.43.9.9,0,0,1-.59.16,1.36,1.36,0,0,1-.73-.23c-.23-.15-.51-.32-.84-.5a6,6,0,0,0-1.16-.51,5.3,5.3,0,0,0-1.67-.23,5.15,5.15,0,0,0-2.22.46A4.24,4.24,0,0,0,146,49.49a5.86,5.86,0,0,0-1,2.08,11,11,0,0,0-.31,2.76,10.71,10.71,0,0,0,.34,2.85,6,6,0,0,0,1,2.1,4.15,4.15,0,0,0,1.57,1.29,4.76,4.76,0,0,0,2.07.44,5.09,5.09,0,0,0,1.86-.28,5.57,5.57,0,0,0,1.2-.63c.33-.22.61-.43.85-.62a1.27,1.27,0,0,1,.81-.28,1,1,0,0,1,.88.44l1.39,1.76A8.77,8.77,0,0,1,154.91,63,9.5,9.5,0,0,1,153,64a10.51,10.51,0,0,1-2.07.54,15.22,15.22,0,0,1-2.12.15,9,9,0,0,1-3.5-.69,8.32,8.32,0,0,1-2.87-2,9.63,9.63,0,0,1-1.94-3.25,12.48,12.48,0,0,1-.71-4.39,12.84,12.84,0,0,1,.63-4.09A9.3,9.3,0,0,1,142.26,47a8.5,8.5,0,0,1,3-2.16,10.53,10.53,0,0,1,4.18-.78,9.24,9.24,0,0,1,7,2.79Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M164.67,46.5a10.21,10.21,0,0,1,2.58-1.77,7.43,7.43,0,0,1,3.3-.69,7.23,7.23,0,0,1,2.91.56,5.74,5.74,0,0,1,2.12,1.56,7.09,7.09,0,0,1,1.29,2.4,10.32,10.32,0,0,1,.44,3.08V64.39h-4.83V51.64a4.3,4.3,0,0,0-.84-2.84,3.14,3.14,0,0,0-2.55-1,5,5,0,0,0-2.35.57,8.44,8.44,0,0,0-2.07,1.54V64.39h-4.82v-29h4.82Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M185.78,55a9.39,9.39,0,0,0,.55,2.66,5.36,5.36,0,0,0,1.13,1.86,4.44,4.44,0,0,0,1.67,1.09,6.08,6.08,0,0,0,2.14.36,6.72,6.72,0,0,0,2-.27,8.26,8.26,0,0,0,1.48-.61c.43-.22.8-.42,1.12-.6a1.86,1.86,0,0,1,.92-.27,1,1,0,0,1,.9.44l1.39,1.76A7.85,7.85,0,0,1,197.3,63a9.79,9.79,0,0,1-2.08,1,12.18,12.18,0,0,1-2.2.54,16.53,16.53,0,0,1-2.18.15A10.79,10.79,0,0,1,187,64a8.65,8.65,0,0,1-3.12-2.05,9.68,9.68,0,0,1-2.09-3.36,12.93,12.93,0,0,1-.76-4.64,11.12,11.12,0,0,1,.66-3.85,9.15,9.15,0,0,1,1.91-3.15,8.9,8.9,0,0,1,3-2.12,10,10,0,0,1,4-.78,9.68,9.68,0,0,1,3.5.61,7.51,7.51,0,0,1,2.75,1.76,8.28,8.28,0,0,1,1.81,2.86,10.5,10.5,0,0,1,.65,3.85,3.14,3.14,0,0,1-.23,1.48,1,1,0,0,1-.9.38Zm9.2-2.91a5.66,5.66,0,0,0-.27-1.77,3.93,3.93,0,0,0-.79-1.45,3.6,3.6,0,0,0-1.33-1,4.62,4.62,0,0,0-1.89-.36,4.49,4.49,0,0,0-3.29,1.19,5.82,5.82,0,0,0-1.53,3.38Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M222.79,38.46h-9.71V64.39h-2V38.46h-9.76v-1.7h21.48Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M229.58,44.65a9.27,9.27,0,0,1,3.74.71,7.65,7.65,0,0,1,2.78,2,8.89,8.89,0,0,1,1.73,3.15,14.51,14.51,0,0,1,0,8.26,8.93,8.93,0,0,1-1.73,3.14,7.51,7.51,0,0,1-2.78,2,10.34,10.34,0,0,1-7.48,0,7.63,7.63,0,0,1-2.79-2,9,9,0,0,1-1.74-3.14,14.75,14.75,0,0,1,0-8.26,8.91,8.91,0,0,1,1.74-3.15,7.77,7.77,0,0,1,2.79-2A9.27,9.27,0,0,1,229.58,44.65Zm0,18.53a7.2,7.2,0,0,0,3-.6,5.56,5.56,0,0,0,2.16-1.71,7.36,7.36,0,0,0,1.3-2.68,14.62,14.62,0,0,0,0-7,7.46,7.46,0,0,0-1.3-2.7,5.7,5.7,0,0,0-2.16-1.73,7.05,7.05,0,0,0-3-.61,7,7,0,0,0-3,.61,5.73,5.73,0,0,0-2.17,1.73,7.64,7.64,0,0,0-1.31,2.7,14.3,14.3,0,0,0,0,7,7.54,7.54,0,0,0,1.31,2.68,5.59,5.59,0,0,0,2.17,1.71A7.12,7.12,0,0,0,229.58,63.18Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M243.87,64.39V45h1a.52.52,0,0,1,.57.49l.17,2.81a10.28,10.28,0,0,1,2.6-2.62,5.77,5.77,0,0,1,3.3-1A4.73,4.73,0,0,1,255,45.88a6.33,6.33,0,0,1,1.72,3.41,7.1,7.1,0,0,1,1-2.07,6.09,6.09,0,0,1,1.46-1.45,5.84,5.84,0,0,1,1.78-.85,7.39,7.39,0,0,1,2-.27,6.69,6.69,0,0,1,2.6.48,5,5,0,0,1,1.95,1.41,6.3,6.3,0,0,1,1.23,2.31A10.28,10.28,0,0,1,269.1,52V64.39h-1.85V52A6.66,6.66,0,0,0,266,47.63a4.29,4.29,0,0,0-3.52-1.5,5.15,5.15,0,0,0-1.94.37,4.77,4.77,0,0,0-1.64,1.11,5.26,5.26,0,0,0-1.13,1.82,7.08,7.08,0,0,0-.42,2.54V64.39h-1.88V52a7.17,7.17,0,0,0-1.12-4.34,3.86,3.86,0,0,0-3.29-1.5,5,5,0,0,0-2.93.94,8.78,8.78,0,0,0-2.4,2.6V64.39Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M292.63,62.73l0,1.66H276V36.76H292.6v1.66H278.05V49.59h12.1v1.62h-12.1V62.73Z" transform="translate(-6.36 -3.62)"/><path class="cls-8" d="M315.48,62.73l0,1.66H298.88V36.76h16.56v1.66H300.89V49.59H313v1.62H300.89V62.73Z" transform="translate(-6.36 -3.62)"/></svg>
\ No newline at end of file
diff --git a/src/main/jbake/assets/img/commiters-info-back.jpg b/src/main/jbake/assets/img/commiters-info-back.jpg
new file mode 100644
index 0000000..2a206ac
--- /dev/null
+++ b/src/main/jbake/assets/img/commiters-info-back.jpg
Binary files differ
diff --git a/src/main/jbake/assets/img/jakarta_ee_logo.png b/src/main/jbake/assets/img/jakarta_ee_logo.png
new file mode 100644
index 0000000..a45c0aa
--- /dev/null
+++ b/src/main/jbake/assets/img/jakarta_ee_logo.png
Binary files differ
diff --git a/src/main/jbake/assets/img/jakartaee-compatible-badge-color.svg b/src/main/jbake/assets/img/jakartaee-compatible-badge-color.svg
new file mode 100644
index 0000000..5b411d8
--- /dev/null
+++ b/src/main/jbake/assets/img/jakartaee-compatible-badge-color.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 139.89 49.15"><defs><style>.cls-1{fill:#f58220;}.cls-2{fill:#fdb940;}.cls-3{fill:#fcb322;}.cls-4{fill:#2d3183;}.cls-5{fill:#fff;}</style></defs><path class="cls-1" d="M99.92,40.55l34.79,0s-17.25,5.39-25.83,8.23c-2.5.83-5,1.57-7.54,2.37-1.26.41-2.8,0-2.48-2.13s1.06-8.44,1.06-8.44" transform="translate(-0.92 -2.11)"/><path class="cls-2" d="M139.34,11H45.52c.22,7.67-.79,18.61-9.68,27.18H136.23a1.47,1.47,0,0,0,1.47-1.47l3.11-24.24A1.47,1.47,0,0,0,139.34,11" transform="translate(-0.92 -2.11)"/><path class="cls-2" d="M41.57,2.11l-10.09,11a36.75,36.75,0,0,1-7.42,21.74l8.77,2.2c14.65-13.79,8.74-35,8.74-35" transform="translate(-0.92 -2.11)"/><path class="cls-3" d="M31.48,13.15a32.65,32.65,0,0,0-.42-6.38L8.8,31.14,24,34.94l0,0L13.94,32.37Z" transform="translate(-0.92 -2.11)"/><path class="cls-1" d="M13.94,32.37l10.12,2.52a36.75,36.75,0,0,0,7.42-21.74Z" transform="translate(-0.92 -2.11)"/><path class="cls-4" d="M27,38.41c.88,0,1.74,0,2.59.12L.92,31.44s5.34,1.77,11.8,11.43c3.41-2.73,8.56-4.46,14.32-4.46" transform="translate(-0.92 -2.11)"/><path class="cls-4" d="M56.91,20.78a2.07,2.07,0,0,1-.1.68,1.36,1.36,0,0,1-.29.53,1.23,1.23,0,0,1-.49.34,1.68,1.68,0,0,1-.7.13l-.36,0-.36-.06,0-.61a.19.19,0,0,1,.07-.13.21.21,0,0,1,.16-.05H55a.53.53,0,0,0,.19,0,.77.77,0,0,0,.27,0,.38.38,0,0,0,.19-.14.73.73,0,0,0,.12-.25,2.13,2.13,0,0,0,0-.39V17.91h1.07Z" transform="translate(-0.92 -2.11)"/><path class="cls-4" d="M61.41,20.69,61,19.45c0-.07-.06-.17-.1-.27s-.07-.22-.11-.35a2.92,2.92,0,0,1-.1.35l-.1.28-.43,1.23Zm1.71,1.72h-.83a.33.33,0,0,1-.23-.07.34.34,0,0,1-.13-.16l-.27-.78H59.89l-.27.78a.38.38,0,0,1-.35.23h-.84l1.79-4.5h1.11Z" transform="translate(-0.92 -2.11)"/><path class="cls-4" d="M65.83,19.73H66a.38.38,0,0,0,.34-.15l1-1.47a.51.51,0,0,1,.47-.2h.93l-1.37,1.82a1,1,0,0,1-.32.27.66.66,0,0,1,.22.12.91.91,0,0,1,.19.2l1.4,2.09H68l-.16,0a.35.35,0,0,1-.11,0l-.09-.06a.7.7,0,0,1-.06-.09l-1-1.56a.29.29,0,0,0-.15-.12.5.5,0,0,0-.23,0h-.27v1.92H64.76v-4.5h1.07Z" transform="translate(-0.92 -2.11)"/><path class="cls-4" d="M73,20.69l-.43-1.24a2.64,2.64,0,0,1-.1-.27c0-.11-.07-.22-.11-.35,0,.13-.07.24-.1.35l-.1.28-.43,1.23Zm1.71,1.72h-.83a.33.33,0,0,1-.23-.07.34.34,0,0,1-.13-.16l-.28-.78H71.46l-.27.78a.48.48,0,0,1-.13.16.38.38,0,0,1-.22.07H70l1.79-4.5h1.1Z" transform="translate(-0.92 -2.11)"/><path class="cls-4" d="M77.84,20a1.32,1.32,0,0,0,.37-.05.76.76,0,0,0,.25-.15.57.57,0,0,0,.15-.23.77.77,0,0,0,0-.27.6.6,0,0,0-.2-.47,1,1,0,0,0-.61-.16H77.4V20Zm2.28,2.39h-1a.43.43,0,0,1-.39-.2L78,20.9a.68.68,0,0,0-.12-.12.36.36,0,0,0-.19,0H77.4v1.67H76.33v-4.5h1.51a3,3,0,0,1,.85.1,1.5,1.5,0,0,1,.58.28,1.1,1.1,0,0,1,.33.42,1.32,1.32,0,0,1,.1.53,1.35,1.35,0,0,1-.06.41,1.22,1.22,0,0,1-.18.36,1.37,1.37,0,0,1-.29.3,1.27,1.27,0,0,1-.4.21,1.37,1.37,0,0,1,.2.13,1,1,0,0,1,.16.19Z" transform="translate(-0.92 -2.11)"/><polygon class="cls-4" points="84.1 16.63 82.8 16.63 82.8 20.3 81.72 20.3 81.72 16.63 80.42 16.63 80.42 15.8 84.1 15.8 84.1 16.63"/><path class="cls-4" d="M88.84,20.69l-.43-1.24c0-.07-.06-.17-.1-.27s-.07-.22-.11-.35a2.92,2.92,0,0,1-.1.35l-.1.28-.43,1.23Zm1.71,1.72h-.83a.33.33,0,0,1-.23-.07.34.34,0,0,1-.13-.16l-.27-.78H87.32l-.27.78a.38.38,0,0,1-.35.23h-.84l1.79-4.5h1.11Z" transform="translate(-0.92 -2.11)"/><polygon class="cls-4" points="94.88 16.6 94.88 17.65 96.33 17.65 96.33 18.42 94.88 18.42 94.88 19.5 96.78 19.5 96.78 20.3 93.8 20.3 93.8 15.8 96.78 15.8 96.78 16.6 94.88 16.6"/><polygon class="cls-4" points="99.8 16.6 99.8 17.65 101.25 17.65 101.25 18.42 99.8 18.42 99.8 19.5 101.7 19.5 101.7 20.3 98.72 20.3 98.72 15.8 101.7 15.8 101.7 16.6 99.8 16.6"/><path class="cls-5" d="M58,30a.18.18,0,0,1,.1,0,.27.27,0,0,1,.1.06l.57.58a2.31,2.31,0,0,1-.94.72,3.41,3.41,0,0,1-1.34.24,3.33,3.33,0,0,1-1.26-.23,2.68,2.68,0,0,1-1-.65,2.83,2.83,0,0,1-.6-1,3.53,3.53,0,0,1-.21-1.23,3.25,3.25,0,0,1,.23-1.23,2.74,2.74,0,0,1,1.61-1.61,3.21,3.21,0,0,1,1.26-.23,3.34,3.34,0,0,1,.65.06,3.28,3.28,0,0,1,.58.16,2.54,2.54,0,0,1,.49.26,2.24,2.24,0,0,1,.4.32l-.48.63a.57.57,0,0,1-.11.11.3.3,0,0,1-.18.05.33.33,0,0,1-.14,0L57.65,27l-.17-.1a1,1,0,0,0-.21-.1,1.32,1.32,0,0,0-.3-.08,1.51,1.51,0,0,0-.39,0,1.59,1.59,0,0,0-.66.13,1.67,1.67,0,0,0-.51.37,1.88,1.88,0,0,0-.33.61,2.55,2.55,0,0,0-.12.81,2.63,2.63,0,0,0,.13.83,1.78,1.78,0,0,0,.36.6,1.46,1.46,0,0,0,.52.37,1.53,1.53,0,0,0,.64.13,1.89,1.89,0,0,0,.35,0,1.55,1.55,0,0,0,.31-.06l.26-.11a1.38,1.38,0,0,0,.25-.19l.11-.07L58,30" transform="translate(-0.92 -2.11)"/><path class="cls-5" d="M66.44,28.55a2.53,2.53,0,0,0-.12-.8,1.72,1.72,0,0,0-.34-.61,1.55,1.55,0,0,0-.55-.38,2.07,2.07,0,0,0-.73-.13,2.18,2.18,0,0,0-.75.13,1.51,1.51,0,0,0-.54.38,1.74,1.74,0,0,0-.35.61,2.76,2.76,0,0,0,0,1.61,1.74,1.74,0,0,0,.35.61,1.37,1.37,0,0,0,.54.37,2,2,0,0,0,.75.13,1.86,1.86,0,0,0,.73-.13A1.41,1.41,0,0,0,66,30a1.72,1.72,0,0,0,.34-.61,2.55,2.55,0,0,0,.12-.81m1.48,0a3.27,3.27,0,0,1-.23,1.22,3.13,3.13,0,0,1-.66,1,3.19,3.19,0,0,1-1,.65,3.9,3.9,0,0,1-2.64,0,2.93,2.93,0,0,1-1.68-1.63,3.27,3.27,0,0,1-.23-1.22,3.22,3.22,0,0,1,.23-1.21,3,3,0,0,1,.66-1,3,3,0,0,1,1-.64,3.75,3.75,0,0,1,2.64,0,3,3,0,0,1,1,.65,3,3,0,0,1,.66,1,3.26,3.26,0,0,1,.23,1.21" transform="translate(-0.92 -2.11)"/><path class="cls-5" d="M78.29,25.55v6H77V28.1c0-.08,0-.16,0-.26a2.64,2.64,0,0,1,0-.28l-1.64,3.09a.5.5,0,0,1-.21.22.61.61,0,0,1-.3.08h-.19a.61.61,0,0,1-.3-.08.54.54,0,0,1-.2-.22l-1.65-3.1c0,.1,0,.2,0,.29s0,.18,0,.26v3.47H71.32v-6h1.26l.13,0,.1.07a.36.36,0,0,1,.08.12l1.6,3c.06.11.11.22.16.33a3.73,3.73,0,0,1,.16.35,2.75,2.75,0,0,1,.15-.36c.05-.11.11-.22.17-.33l1.59-3a.62.62,0,0,1,.09-.12.26.26,0,0,1,.1-.07l.12,0h1.26Z" transform="translate(-0.92 -2.11)"/><path class="cls-5" d="M84.24,28.5a1.11,1.11,0,0,0,.81-.26,1,1,0,0,0,.24-.73,1.06,1.06,0,0,0-.06-.37.85.85,0,0,0-.19-.3.88.88,0,0,0-.33-.18,1.33,1.33,0,0,0-.47-.07h-.75V28.5Zm0-2.95a3.7,3.7,0,0,1,1.12.15,2.21,2.21,0,0,1,.78.41,1.74,1.74,0,0,1,.45.63,2.15,2.15,0,0,1,.14.77,2.23,2.23,0,0,1-.15.83,1.69,1.69,0,0,1-.45.64,2.24,2.24,0,0,1-.78.42,3.63,3.63,0,0,1-1.11.15h-.75v2H82.05v-6Z" transform="translate(-0.92 -2.11)"/><path class="cls-5" d="M92.86,29.26l-.57-1.64-.14-.37c-.05-.15-.09-.3-.14-.47a4.41,4.41,0,0,1-.14.47c-.05.15-.09.27-.13.37l-.57,1.64Zm2.29,2.31H94a.5.5,0,0,1-.31-.09.62.62,0,0,1-.17-.22l-.37-1.05H90.83l-.36,1.05a.48.48,0,0,1-.17.21.49.49,0,0,1-.3.1H88.87l2.41-6h1.47Z" transform="translate(-0.92 -2.11)"/><polygon class="cls-5" points="101.13 24.54 99.38 24.54 99.38 29.46 97.94 29.46 97.94 24.54 96.2 24.54 96.2 23.44 101.13 23.44 101.13 24.54"/><rect class="cls-5" x="104.41" y="23.44" width="1.45" height="6.02"/><path class="cls-5" d="M113,30.51a1.2,1.2,0,0,0,.46-.07.9.9,0,0,0,.29-.18.77.77,0,0,0,.14-.25,1.43,1.43,0,0,0,0-.29.85.85,0,0,0,0-.29.51.51,0,0,0-.15-.23,1,1,0,0,0-.29-.14,1.87,1.87,0,0,0-.45,0h-1v1.5Zm-1-3.92v1.49h.75a1.85,1.85,0,0,0,.43,0,1,1,0,0,0,.33-.11.5.5,0,0,0,.2-.23.77.77,0,0,0,.07-.36,1,1,0,0,0,0-.36.66.66,0,0,0-.17-.23.69.69,0,0,0-.29-.12,1.76,1.76,0,0,0-.42,0Zm.85-1a4.31,4.31,0,0,1,1.09.11,2.21,2.21,0,0,1,.74.33,1.18,1.18,0,0,1,.41.51,1.63,1.63,0,0,1,.13.67,1.29,1.29,0,0,1-.24.75,1.9,1.9,0,0,1-.33.29,2.15,2.15,0,0,1-.48.24,1.67,1.67,0,0,1,.9.47,1.16,1.16,0,0,1,.3.83,1.58,1.58,0,0,1-.16.72,1.62,1.62,0,0,1-.44.57,2.13,2.13,0,0,1-.73.39,3.4,3.4,0,0,1-1,.14h-2.48v-6Z" transform="translate(-0.92 -2.11)"/><polygon class="cls-5" points="121.61 28.34 121.61 29.46 117.87 29.46 117.87 23.44 119.31 23.44 119.31 28.34 121.61 28.34"/><polygon class="cls-5" points="126.34 24.51 126.34 25.91 128.29 25.91 128.29 26.95 126.34 26.95 126.34 28.38 128.89 28.38 128.89 29.46 124.89 29.46 124.89 23.44 128.89 23.44 128.89 24.51 126.34 24.51"/></svg>
\ No newline at end of file
diff --git a/src/main/jbake/assets/img/jakartaee-compatible-badge-white.svg b/src/main/jbake/assets/img/jakartaee-compatible-badge-white.svg
new file mode 100644
index 0000000..957743d
--- /dev/null
+++ b/src/main/jbake/assets/img/jakartaee-compatible-badge-white.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 139.13 48.9"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#231f20;}</style></defs><path class="cls-1" d="M30.34,6.43s3,15.09-7,28.08L8.16,30.72Z" transform="translate(-1.55 -1.78)"/><path class="cls-1" d="M27.58,37.93c.87,0,1.74,0,2.58.12L1.55,31s5.33,1.76,11.76,11.38c3.4-2.71,8.53-4.44,14.27-4.44" transform="translate(-1.55 -1.78)"/><path class="cls-1" d="M30.34,6.43s3.05,15.11-7,28.13l-15.2-3.8Z" transform="translate(-1.55 -1.78)"/><path class="cls-1" d="M41.63,1.78l-8.94,9.79c0,1.23,0,2.62-.17,4.15a39.46,39.46,0,0,1-2,9.32,36.22,36.22,0,0,1-5.19,9.77l7.58,1.89C47.53,22.94,41.63,1.78,41.63,1.78" transform="translate(-1.55 -1.78)"/><path class="cls-1" d="M99.74,40l34.83,0s-17.28,5.4-25.86,8.24c-2.51.83-5,1.57-7.55,2.38-1.26.4-2.8,0-2.48-2.13S99.74,40,99.74,40" transform="translate(-1.55 -1.78)"/><path class="cls-1" d="M139.2,10.42H45.29c.21,7.68-.8,18.64-9.7,27.21h100.5a1.47,1.47,0,0,0,1.47-1.47l3.12-24.27a1.48,1.48,0,0,0-1.48-1.47" transform="translate(-1.55 -1.78)"/><path class="cls-2" d="M56.68,20.17a2.38,2.38,0,0,1-.09.68,1.57,1.57,0,0,1-.3.54,1.34,1.34,0,0,1-.49.34,1.86,1.86,0,0,1-.7.12l-.35,0-.37-.06.06-.61A.16.16,0,0,1,54.5,21a.28.28,0,0,1,.16-.05l.14,0L55,21a.76.76,0,0,0,.27-.05.33.33,0,0,0,.19-.14.58.58,0,0,0,.12-.25,1.51,1.51,0,0,0,0-.39V17.3h1.07Z" transform="translate(-1.55 -1.78)"/><path class="cls-2" d="M61.19,20.08l-.43-1.24a2.64,2.64,0,0,1-.1-.27c0-.11-.07-.22-.11-.35,0,.13-.07.25-.1.35l-.1.28-.43,1.23ZM62.9,21.8h-.83a.39.39,0,0,1-.23-.06.37.37,0,0,1-.13-.17l-.28-.78H59.67l-.27.78a.48.48,0,0,1-.13.16.32.32,0,0,1-.22.07H58.2L60,17.3h1.1Z" transform="translate(-1.55 -1.78)"/><path class="cls-2" d="M65.62,19.12h.17a.38.38,0,0,0,.34-.15l1.05-1.47a.49.49,0,0,1,.2-.16.68.68,0,0,1,.26,0h.94L67.2,19.12a1,1,0,0,1-.31.27.94.94,0,0,1,.22.12.88.88,0,0,1,.18.2L68.7,21.8H67.58a.34.34,0,0,1-.12,0l-.08-.06-.07-.08-1-1.57a.27.27,0,0,0-.14-.12.75.75,0,0,0-.24,0h-.26V21.8H64.54V17.3h1.08Z" transform="translate(-1.55 -1.78)"/><path class="cls-2" d="M72.77,20.08l-.43-1.24c0-.07-.06-.17-.1-.27s-.07-.22-.11-.35c0,.13-.07.25-.1.35l-.1.28-.43,1.23Zm1.71,1.72h-.83a.39.39,0,0,1-.23-.06.37.37,0,0,1-.13-.17L73,20.79H71.25l-.27.78a.48.48,0,0,1-.13.16.32.32,0,0,1-.22.07h-.84l1.79-4.5h1.1Z" transform="translate(-1.55 -1.78)"/><path class="cls-2" d="M77.63,19.41a1.09,1.09,0,0,0,.38-.05.87.87,0,0,0,.25-.15A.52.52,0,0,0,78.4,19a.87.87,0,0,0,0-.28.57.57,0,0,0-.2-.46.9.9,0,0,0-.62-.17H77.2v1.33Zm2.29,2.39H79a.42.42,0,0,1-.39-.2l-.77-1.31a.49.49,0,0,0-.13-.12.41.41,0,0,0-.19,0H77.2V21.8H76.12V17.3h1.51a3.08,3.08,0,0,1,.86.1,1.5,1.5,0,0,1,.58.28,1.1,1.1,0,0,1,.33.42,1.32,1.32,0,0,1,.1.53,1.42,1.42,0,0,1-.06.42,1.22,1.22,0,0,1-.18.36,1.33,1.33,0,0,1-.29.29,1.39,1.39,0,0,1-.4.21.9.9,0,0,1,.2.14.93.93,0,0,1,.16.18Z" transform="translate(-1.55 -1.78)"/><polygon class="cls-2" points="83.28 16.34 81.97 16.34 81.97 20.02 80.9 20.02 80.9 16.34 79.59 16.34 79.59 15.51 83.28 15.51 83.28 16.34"/><path class="cls-2" d="M88.65,20.08l-.43-1.24a2.64,2.64,0,0,1-.1-.27c0-.11-.07-.22-.11-.35,0,.13-.07.25-.1.35l-.1.28-.43,1.23Zm1.71,1.72h-.83a.39.39,0,0,1-.23-.06.37.37,0,0,1-.13-.17l-.28-.78H87.13l-.27.78a.48.48,0,0,1-.13.16.32.32,0,0,1-.22.07h-.85l1.8-4.5h1.1Z" transform="translate(-1.55 -1.78)"/><polygon class="cls-2" points="94.06 16.32 94.06 17.37 95.52 17.37 95.52 18.14 94.06 18.14 94.06 19.21 95.97 19.21 95.97 20.02 92.98 20.02 92.98 15.51 95.97 15.51 95.97 16.32 94.06 16.32"/><polygon class="cls-2" points="98.99 16.32 98.99 17.37 100.45 17.37 100.45 18.14 98.99 18.14 98.99 19.21 100.89 19.21 100.89 20.02 97.91 20.02 97.91 15.51 100.89 15.51 100.89 16.32 98.99 16.32"/><path class="cls-2" d="M57.79,29.41l.1,0a.21.21,0,0,1,.1.06l.57.59a2.37,2.37,0,0,1-.94.71,3.57,3.57,0,0,1-2.6,0,2.75,2.75,0,0,1-1-.64,2.88,2.88,0,0,1-.6-1A3.49,3.49,0,0,1,53.26,28a3.25,3.25,0,0,1,.23-1.23,2.85,2.85,0,0,1,.63-1,3,3,0,0,1,1-.64,3.4,3.4,0,0,1,1.26-.22,3.55,3.55,0,0,1,1.24.22,2.87,2.87,0,0,1,.49.26,2.55,2.55,0,0,1,.4.32l-.48.63a.63.63,0,0,1-.12.11.3.3,0,0,1-.18,0,.37.37,0,0,1-.14,0l-.14-.08-.17-.1a2.25,2.25,0,0,0-.22-.11l-.29-.08a2.41,2.41,0,0,0-.4,0,1.51,1.51,0,0,0-.65.13,1.34,1.34,0,0,0-.51.37,1.72,1.72,0,0,0-.34.61,2.56,2.56,0,0,0-.11.81,2.37,2.37,0,0,0,.13.83,1.61,1.61,0,0,0,.35.6,1.49,1.49,0,0,0,.52.38,1.7,1.7,0,0,0,.64.13l.36,0a2.27,2.27,0,0,0,.3-.06,1.31,1.31,0,0,0,.27-.12l.25-.18a.41.41,0,0,1,.11-.07.27.27,0,0,1,.12,0" transform="translate(-1.55 -1.78)"/><path class="cls-2" d="M66.23,28a2.53,2.53,0,0,0-.12-.8,1.89,1.89,0,0,0-.34-.61,1.64,1.64,0,0,0-.55-.38,2.12,2.12,0,0,0-.74-.13,2.08,2.08,0,0,0-.74.13,1.55,1.55,0,0,0-.55.38,1.74,1.74,0,0,0-.35.61,2.76,2.76,0,0,0,0,1.61,1.74,1.74,0,0,0,.35.61,1.55,1.55,0,0,0,.55.38,2.08,2.08,0,0,0,.74.13,2.12,2.12,0,0,0,.74-.13,1.64,1.64,0,0,0,.55-.38,1.89,1.89,0,0,0,.34-.61,2.55,2.55,0,0,0,.12-.81m1.47,0a3,3,0,0,1-.23,1.22,2.85,2.85,0,0,1-.65,1,3.07,3.07,0,0,1-1,.65,3.75,3.75,0,0,1-2.64,0,3,3,0,0,1-1-.65,2.87,2.87,0,0,1-.66-1,3.32,3.32,0,0,1,0-2.43,2.87,2.87,0,0,1,.66-1,3.13,3.13,0,0,1,1-.65,3.9,3.9,0,0,1,2.64,0,3.09,3.09,0,0,1,1,.66,2.81,2.81,0,0,1,.65,1A3.07,3.07,0,0,1,67.7,28" transform="translate(-1.55 -1.78)"/><path class="cls-2" d="M78.09,24.94v6H76.82V27.5a2.44,2.44,0,0,1,0-.26,2.64,2.64,0,0,1,0-.28l-1.65,3.1a.56.56,0,0,1-.21.22.65.65,0,0,1-.29.07h-.2a.73.73,0,0,1-.3-.07.61.61,0,0,1-.2-.22L72.35,27c0,.1,0,.2,0,.29a2.44,2.44,0,0,1,0,.26V31H71.11v-6h1.26l.13,0,.1.07a.41.41,0,0,1,.09.12l1.59,3.06c.06.1.11.21.17.32l.15.35.15-.36c0-.11.11-.22.17-.33l1.59-3A.41.41,0,0,1,76.6,25l.1-.07.13,0h1.26Z" transform="translate(-1.55 -1.78)"/><path class="cls-2" d="M84,27.9a1.08,1.08,0,0,0,.81-.26,1,1,0,0,0,.25-.73.87.87,0,0,0-.07-.37.73.73,0,0,0-.19-.3.88.88,0,0,0-.33-.18A1.33,1.33,0,0,0,84,26h-.75V27.9Zm0-3a3.77,3.77,0,0,1,1.13.15,2.1,2.1,0,0,1,.77.42,1.5,1.5,0,0,1,.45.62,2,2,0,0,1,.15.78,2.23,2.23,0,0,1-.15.83,1.55,1.55,0,0,1-.46.64,2.27,2.27,0,0,1-.77.43A3.75,3.75,0,0,1,84,29h-.75v2H81.85v-6Z" transform="translate(-1.55 -1.78)"/><path class="cls-2" d="M92.68,28.67,92.1,27,92,26.65c0-.15-.09-.3-.14-.47a4.41,4.41,0,0,1-.14.47,3.85,3.85,0,0,1-.13.37L91,28.67ZM95,31H93.85a.51.51,0,0,1-.3-.08.55.55,0,0,1-.18-.22L93,29.62H90.64l-.36,1.05a.55.55,0,0,1-.17.21.49.49,0,0,1-.3.09H88.68l2.41-6h1.47Z" transform="translate(-1.55 -1.78)"/><polygon class="cls-2" points="100.32 24.27 98.57 24.27 98.57 29.19 97.13 29.19 97.13 24.27 95.39 24.27 95.39 23.16 100.32 23.16 100.32 24.27"/><rect class="cls-2" x="103.61" y="23.16" width="1.45" height="6.03"/><path class="cls-2" d="M112.82,29.92a1.24,1.24,0,0,0,.47-.08.62.62,0,0,0,.28-.18.52.52,0,0,0,.14-.25,1.07,1.07,0,0,0,0-.58.46.46,0,0,0-.16-.23.92.92,0,0,0-.28-.14,2,2,0,0,0-.46-.05h-1v1.51Zm-1-3.93v1.49h.75a2.81,2.81,0,0,0,.43,0,1.19,1.19,0,0,0,.32-.12.52.52,0,0,0,.21-.23.77.77,0,0,0,.07-.36.93.93,0,0,0-.06-.36.48.48,0,0,0-.17-.23.59.59,0,0,0-.29-.12,1.76,1.76,0,0,0-.42,0Zm.84-1a4.35,4.35,0,0,1,1.1.12,2.15,2.15,0,0,1,.73.33,1.28,1.28,0,0,1,.42.51,1.6,1.6,0,0,1,.13.67A1.23,1.23,0,0,1,115,27a1,1,0,0,1-.19.36,1.64,1.64,0,0,1-.33.3,1.79,1.79,0,0,1-.48.23,1.75,1.75,0,0,1,.91.47,1.15,1.15,0,0,1,.29.83,1.72,1.72,0,0,1-.15.72,1.66,1.66,0,0,1-.45.58,2.19,2.19,0,0,1-.73.38,3.33,3.33,0,0,1-1,.14h-2.48v-6Z" transform="translate(-1.55 -1.78)"/><polygon class="cls-2" points="120.82 28.07 120.82 29.19 117.08 29.19 117.08 23.16 118.52 23.16 118.52 28.07 120.82 28.07"/><polygon class="cls-2" points="125.56 24.24 125.56 25.64 127.52 25.64 127.52 26.68 125.56 26.68 125.56 28.11 128.11 28.11 128.11 29.19 124.11 29.19 124.11 23.16 128.11 23.16 128.11 24.24 125.56 24.24"/></svg>
\ No newline at end of file
diff --git a/src/main/jbake/assets/img/microprofile-icon-orange.png b/src/main/jbake/assets/img/microprofile-icon-orange.png
new file mode 100644
index 0000000..51a0be9
--- /dev/null
+++ b/src/main/jbake/assets/img/microprofile-icon-orange.png
Binary files differ
diff --git a/src/main/jbake/assets/img/microprofile_logo.png b/src/main/jbake/assets/img/microprofile_logo.png
new file mode 100644
index 0000000..a7f9488
--- /dev/null
+++ b/src/main/jbake/assets/img/microprofile_logo.png
Binary files differ
diff --git a/src/main/jbake/assets/js/main.js b/src/main/jbake/assets/js/main.js
index a89e437..ffc4603 100755
--- a/src/main/jbake/assets/js/main.js
+++ b/src/main/jbake/assets/js/main.js
@@ -8,10 +8,10 @@
 	// Window Load
 	$(window).load(function() {
 		// Preloader
-		$('.intro-tables, .parallax, header').css('opacity', '0');
+		$('.parallax').css('opacity', '0');
 		$('.preloader').addClass('animated fadeOut').one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', function() {
 			$('.preloader').hide();
-			$('.parallax, header').addClass('animated fadeIn').one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', function() {
+			$('.parallax').addClass('animated fadeIn').one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', function() {
 				$('.intro-tables').addClass('animated fadeInUp').one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend');
 			});
 		});
@@ -22,8 +22,7 @@
 			$('.parallax img').css('height', ($(window).height()) + 'px');
 			$('.parallax img').css('width', $('.parallax').height() * ratio + 'px');
 		}
-
-		$('header').height($(window).height() + 80);
+		
 		$('section .cut').each(function() {
 			if ($(this).hasClass('cut-top'))
 				$(this).css('border-right-width', $(this).parent().width() + "px");
diff --git a/src/main/jbake/content/9.0.0-M7/release-notes.adoc b/src/main/jbake/content/9.0.0-M7/release-notes.adoc
new file mode 100644
index 0000000..5c0dca4
--- /dev/null
+++ b/src/main/jbake/content/9.0.0-M7/release-notes.adoc
@@ -0,0 +1,101 @@
+= Apache TomEE 9.0.0-M7 Release Notes
+:index-group: Release Notes
+:jbake-type: page
+:jbake-status: published
+
+== Dependency upgrade
+
+[.compact]
+ - link:https://issues.apache.org/jira/browse/TOMEE-2990[TOMEE-2990] BatchEE 0.6
+ - link:https://issues.apache.org/jira/browse/TOMEE-2987[TOMEE-2987] CXF 3.4.3
+ - link:https://issues.apache.org/jira/browse/TOMEE-3747[TOMEE-3747] EclipseLink 3.0.0
+ - link:https://issues.apache.org/jira/browse/TOMEE-3749[TOMEE-3749] Hibernate Validator 5.1.3.Final
+ - link:https://issues.apache.org/jira/browse/TOMEE-3748[TOMEE-3748] Mojarra 3.0.0
+ - link:https://issues.apache.org/jira/browse/TOMEE-3732[TOMEE-3732] MyFaces 2.3.9
+ - link:https://issues.apache.org/jira/browse/TOMEE-2997[TOMEE-2997] OpenSAML V3.4.6
+ - link:https://issues.apache.org/jira/browse/TOMEE-2809[TOMEE-2809] OpenWebBeans 2.0.22
+ - link:https://issues.apache.org/jira/browse/TOMEE-3746[TOMEE-3746] Tomcat 10.0.4
+ - link:https://issues.apache.org/jira/browse/TOMEE-2939[TOMEE-2939] bcprov-jdk15on 1.67
+ - link:https://issues.apache.org/jira/browse/TOMEE-2988[TOMEE-2988] xbean 4.18+ (Java 16 support)
+
+== New Feature
+
+[.compact]
+ - link:https://issues.apache.org/jira/browse/TOMEE-3730[TOMEE-3730] Add JSONP and JSONB Providers JAX-RS Client
+ - link:https://issues.apache.org/jira/browse/TOMEE-2365[TOMEE-2365] Implement Java EE Security API from EE 8
+ - link:https://issues.apache.org/jira/browse/TOMEE-2966[TOMEE-2966] Provide a pure JUnit5 OpenEJB Extension
+ - link:https://issues.apache.org/jira/browse/TOMEE-2977[TOMEE-2977] Provide a ApplicationComposer JUnit 5 Extension
+ - link:https://issues.apache.org/jira/browse/TOMEE-2993[TOMEE-2993] API pom for each TomEE distribution
+
+== Improvement
+
+[.compact]
+ - link:https://issues.apache.org/jira/browse/TOMEE-2957[TOMEE-2957] Fix OWASP Checks on ASF Jenkins Environment
+ - link:https://issues.apache.org/jira/browse/TOMEE-2974[TOMEE-2974] CI Build Environment ISO-8859-1 versus UTF-8
+ - link:https://issues.apache.org/jira/browse/TOMEE-2973[TOMEE-2973] TomEE :: Examples :: JSF2/CDI/BV/JPA/DeltaSpike uses too old version of commons-lang3
+ - link:https://issues.apache.org/jira/browse/TOMEE-2976[TOMEE-2976] Provide Examples for TomEE Arquillian with JUnit 5
+ - link:https://issues.apache.org/jira/browse/TOMEE-2705[TOMEE-2705] TomEE Plus BOM
+ - link:https://issues.apache.org/jira/browse/TOMEE-2704[TOMEE-2704] TomEE Plume BOM
+ - link:https://issues.apache.org/jira/browse/TOMEE-2703[TOMEE-2703] TomEE WebProfile BOM
+ - link:https://issues.apache.org/jira/browse/TOMEE-2702[TOMEE-2702] TomEE MicroProfile BOM
+ - link:https://issues.apache.org/jira/browse/TOMEE-2995[TOMEE-2995] Support constructor injection of JAX-RS Application 
+ - link:https://issues.apache.org/jira/browse/TOMEE-2994[TOMEE-2994] JAX-RS Provider construction favors constructor with the most args
+ - link:https://issues.apache.org/jira/browse/TOMEE-2992[TOMEE-2992] [Certification/TCK] Tomcat Callback handler not consistent with authenticator
+
+== Task
+
+[.compact]
+ - link:https://issues.apache.org/jira/browse/TOMEE-3140[TOMEE-3140] Jakarta EE 9.1 TCK Failures
+ - link:https://issues.apache.org/jira/browse/TOMEE-3721[TOMEE-3721] Remove dependencies between tomee-webapp modules
+
+== Sub-task
+
+[.compact]
+ - link:https://issues.apache.org/jira/browse/TOMEE-3210[TOMEE-3210] securityapi.idstore.idstorepermission testIdentityStore_customHandlerWithoutIDStorePermission
+ - link:https://issues.apache.org/jira/browse/TOMEE-3211[TOMEE-3211] securityapi.securitycontext.callerdata testSecurityContextHasAccessToWebResource
+ - link:https://issues.apache.org/jira/browse/TOMEE-3212[TOMEE-3212] securityapi.securitycontext.getprincipalsbytype testSecurityContextGetPrincipalsByType
+ - link:https://issues.apache.org/jira/browse/TOMEE-3213[TOMEE-3213] servlet.api.jakarta_servlet.asynccontext forwardTest1
+ - link:https://issues.apache.org/jira/browse/TOMEE-3214[TOMEE-3214] servlet.api.jakarta_servlet.asynccontext originalRequestTest4
+ - link:https://issues.apache.org/jira/browse/TOMEE-3215[TOMEE-3215] servlet.api.jakarta_servlet.srevent getServletRequestTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3216[TOMEE-3216] servlet.ee.spec.security.permissiondd ValidateLocalPermsInvalidName
+ - link:https://issues.apache.org/jira/browse/TOMEE-3206[TOMEE-3206] jsp.spec.configuration.general identicalMappingTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3207[TOMEE-3207] jsp.spec.configuration.general moreSpecificMappingTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3208[TOMEE-3208] jsp.spec.configuration.general mostSpecificMappingTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3209[TOMEE-3209] jstl.spec.core.urlresource.importtag positiveImportEncodingNotSpecifiedTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3181[TOMEE-3181] jaxrs.spec.provider.jaxbcontext readWriteProviderTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3182[TOMEE-3182] jaxrs.spec.provider.standard fileProviderTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3183[TOMEE-3183] jaxrs.spec.provider.standardhaspriority readWriteBooleanProviderTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3184[TOMEE-3184] jaxrs.spec.provider.standardhaspriority readWriteCharacterProviderTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3185[TOMEE-3185] jaxrs.spec.provider.standardhaspriority readWriteJaxbProviderTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3186[TOMEE-3186] jaxrs.spec.provider.standardhaspriority readWriteMapProviderTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3220[TOMEE-3220] servlet.ee.spec.security.runAs web_to_ejb_annotation_runAs
+ - link:https://issues.apache.org/jira/browse/TOMEE-3187[TOMEE-3187] jaxrs.spec.provider.standardnotnull clientDataSourceProviderTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3221[TOMEE-3221] servlet.ee.spec.security.runAs web_to_ejb_dd_runAs
+ - link:https://issues.apache.org/jira/browse/TOMEE-3188[TOMEE-3188] jaxrs.spec.provider.standardnotnull clientJaxbProviderTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3222[TOMEE-3222] servlet.spec.defaultcontextpath getDefaultContextPathTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3189[TOMEE-3189] jaxrs.spec.provider.standardnotnull serverFileProviderTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3223[TOMEE-3223] websocket.ee.jakarta.websocket.session getRequestURITest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3224[TOMEE-3224] websocket.ee.jakarta.websocket.session setTimeout1Test
+ - link:https://issues.apache.org/jira/browse/TOMEE-2967[TOMEE-2967] Translate to Spanish: examples/xa-datasource
+ - link:https://issues.apache.org/jira/browse/TOMEE-3225[TOMEE-3225] websocket.spec.servercontainer.addendpoint getRequestURITest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3226[TOMEE-3226] websocket.spec.servercontainer.addendpoint setTimeout1Test
+ - link:https://issues.apache.org/jira/browse/TOMEE-2964[TOMEE-2964] Translate to Portuguese: examples/serverless-tomee-webprofile
+ - link:https://issues.apache.org/jira/browse/TOMEE-3217[TOMEE-3217] servlet.ee.spec.security.permissiondd ValidateLocalPermsInvalidNameInLib
+ - link:https://issues.apache.org/jira/browse/TOMEE-3218[TOMEE-3218] servlet.ee.spec.security.permissiondd ValidateMissingPermFails
+ - link:https://issues.apache.org/jira/browse/TOMEE-3219[TOMEE-3219] servlet.ee.spec.security.permissiondd ValidateMissingPermFailsInLib
+ - link:https://issues.apache.org/jira/browse/TOMEE-3190[TOMEE-3190] jpa.core.entityManager setPropertyTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3191[TOMEE-3191] jpa.core.entityManagerFactoryCloseExceptions exceptionsTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3192[TOMEE-3192] jpa.core.enums setgetFlushModeEntityManagerTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3193[TOMEE-3193] jpa.ee.packaging.appclient.annotation test1
+ - link:https://issues.apache.org/jira/browse/TOMEE-3194[TOMEE-3194] jpa.ee.packaging.appclient.descriptor test1
+ - link:https://issues.apache.org/jira/browse/TOMEE-3195[TOMEE-3195] jpa.ee.packaging.ejb.standalone test1
+ - link:https://issues.apache.org/jira/browse/TOMEE-3196[TOMEE-3196] jpa.ee.packaging.jar JarFileElementsTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3197[TOMEE-3197] jpa.ee.packaging.jar JarFileElementsTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3198[TOMEE-3198] jpa.ee.packaging.jar JarFileElementsTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3199[TOMEE-3199] jpa.ee.packaging.jar JarFileElementsTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3200[TOMEE-3200] jpa.jpa22.datetime dateTimeTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3201[TOMEE-3201] jpa.jpa22.datetime dateTimeTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3202[TOMEE-3202] jpa.jpa22.datetime dateTimeTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3203[TOMEE-3203] jpa.jpa22.datetime dateTimeTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3204[TOMEE-3204] jpa.jpa22.datetime dateTimeTest
+ - link:https://issues.apache.org/jira/browse/TOMEE-3205[TOMEE-3205] jpa.jpa22.datetime dateTimeTest
diff --git a/src/main/jbake/content/articles.adoc b/src/main/jbake/content/articles.adoc
new file mode 100644
index 0000000..2155d90
--- /dev/null
+++ b/src/main/jbake/content/articles.adoc
@@ -0,0 +1,31 @@
+= Articles
+:jbake-type: page
+:jbake-status: published
+
+== OpenEJB Articles
+
+
+=== 3.0
+
+* http://java.sys-con.com/read/487561_2.htm[Developing EJB 3 Applications in Apache Tomcat Using Apache OpenEJB] , by Dario Laverde, java.sys-con.com
+* http://javanotebook.com/2007/09/28/openejb_3_and_tomcat_6.html[OpenEJB 3 and Tomcat 6] , by Dario Laverde, javanotebook.com
+
+
+=== 1.0
+
+* http://theserverside.com/articles/article.tss?l=ContainerDrivenTestingSeries[Containter Driven Testing with OpenEJB] , by N.
+Alex Rupp, theserverside.com
+* http://www.galatea.com/flashguides/tomcat-openejb1-unix[Using OpenEJB 1.0 with Tomcat on Linux] , by Lajos Moczar, galatea.com
+
+
+=== 0.9.2
+
+* http://ideoplex.com/id/768/getting-started-with-openejb[Getting Started With OpenEJB] , by Dwight Shih, ideoplex.com
+* http://ideoplex.com/id/828/a-simple-entity-bean-with-openejb[A Simple Entity Bean with OpenEJB] , by Dwight Shih, ideoplex.com
+* http://javaboutique.internet.com/reviews/openEJB/[OpenEJB: Modular, Configurable, and Customizable] , by Benoy Jose, javaboutique.internet.com
+* http://www.javaworld.com/javaworld/jw-06-2005/jw-0613-ejb.html[Build, deploy, and test EJB components in just a few seconds] , by Nader Aeinehchi, javaworld.com
+
+
+=== 0.9.0
+
+* http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html[OpenEJB: EJB for Tomcat] , by Jacek Laskowski, onjava.com
diff --git a/src/main/jbake/content/articles.md b/src/main/jbake/content/articles.md
deleted file mode 100644
index 1756271..0000000
--- a/src/main/jbake/content/articles.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Title: Articles
-<a name="Articles-OpenEJBArticles"></a>
-# OpenEJB Articles
-
-
-<a name="Articles-3.0"></a>
-## 3.0
-
-* [Developing EJB 3 Applications in Apache Tomcat Using Apache OpenEJB](http://java.sys-con.com/read/487561_2.htm)
-, by Dario Laverde, java.sys-con.com
-* [OpenEJB 3 and Tomcat 6](http://javanotebook.com/2007/09/28/openejb_3_and_tomcat_6.html)
-, by Dario Laverde, javanotebook.com
-
-<a name="Articles-1.0"></a>
-## 1.0
-
-* [Containter Driven Testing with OpenEJB](http://theserverside.com/articles/article.tss?l=ContainerDrivenTestingSeries)
-, by N. Alex Rupp, theserverside.com
-* [Using OpenEJB 1.0 with Tomcat on Linux](http://www.galatea.com/flashguides/tomcat-openejb1-unix)
-, by Lajos Moczar, galatea.com
-
-<a name="Articles-0.9.2"></a>
-## 0.9.2
-
-* [Getting Started With OpenEJB](http://ideoplex.com/id/768/getting-started-with-openejb)
-, by Dwight Shih, ideoplex.com
-* [A Simple Entity Bean with OpenEJB](http://ideoplex.com/id/828/a-simple-entity-bean-with-openejb)
-, by Dwight Shih, ideoplex.com
-* [OpenEJB: Modular, Configurable, and Customizable](http://javaboutique.internet.com/reviews/openEJB/)
-, by Benoy Jose, javaboutique.internet.com
-* [Build, deploy, and test EJB components in just a few seconds](http://www.javaworld.com/javaworld/jw-06-2005/jw-0613-ejb.html)
-, by Nader Aeinehchi, javaworld.com
-
-<a name="Articles-0.9.0"></a>
-## 0.9.0
-
-* [OpenEJB: EJB for Tomcat](http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html)
-, by Jacek Laskowski, onjava.com
-
diff --git a/src/main/jbake/content/azure.adoc b/src/main/jbake/content/azure.adoc
new file mode 100644
index 0000000..402892e
--- /dev/null
+++ b/src/main/jbake/content/azure.adoc
@@ -0,0 +1,7 @@
+= Setting up Apache TomEE on Microsoft Azure
+:jbake-type: page
+:jbake-status: published
+
+This page will detail instructions to setup TomEE on Microsoft Azure.
+
+Write me!
diff --git a/src/main/jbake/content/azure.md b/src/main/jbake/content/azure.md
deleted file mode 100644
index d65e025..0000000
--- a/src/main/jbake/content/azure.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Title: Azure
-<a name="Installation-Installation"></a>
-# Setting up Apache TomEE on Microsoft Azure
-
-This page will detail instructions to setup TomEE on Microsoft Azure
diff --git a/src/main/jbake/content/blog/2016/03/new-website.adoc b/src/main/jbake/content/blog/2016/03/new-website.adoc
index bbe331e..561f059 100755
--- a/src/main/jbake/content/blog/2016/03/new-website.adoc
+++ b/src/main/jbake/content/blog/2016/03/new-website.adoc
@@ -3,6 +3,5 @@
 :jbake-type: post
 :jbake-tags: website
 :jbake-status: published
-:jbake-tomeepdf:
 
 Apache TomEE got a new website more modern and more user oriented.
diff --git a/src/main/jbake/content/blog/2017/tomee-7.0.3-released.adoc b/src/main/jbake/content/blog/2017/tomee-7.0.3-released.adoc
index 97fe733..72a1c94 100755
--- a/src/main/jbake/content/blog/2017/tomee-7.0.3-released.adoc
+++ b/src/main/jbake/content/blog/2017/tomee-7.0.3-released.adoc
@@ -3,7 +3,6 @@
 :jbake-type: post
 :jbake-tags: website
 :jbake-status: published
-:jbake-tomeepdf:
 
 Aapche TomEE 7.0.3 just got released. It is available as usual on central
 or our download page.
diff --git a/src/main/jbake/content/blog/index.adoc b/src/main/jbake/content/blog/index.adoc
index f6bf015..05240f8 100755
--- a/src/main/jbake/content/blog/index.adoc
+++ b/src/main/jbake/content/blog/index.adoc
@@ -3,4 +3,3 @@
 :jbake-type: blog
 :jbake-tags: website
 :jbake-status: published
-:jbake-tomeepdf:
diff --git a/src/main/jbake/content/certifications/9.0.0-M7/plume/webprofile-9.1.adoc b/src/main/jbake/content/certifications/9.0.0-M7/plume/webprofile-9.1.adoc
index fc5cab4..3e5467e 100644
--- a/src/main/jbake/content/certifications/9.0.0-M7/plume/webprofile-9.1.adoc
+++ b/src/main/jbake/content/certifications/9.0.0-M7/plume/webprofile-9.1.adoc
@@ -2,7 +2,6 @@
 :jbake-date: 2021-04-29
 :jbake-type: page
 :jbake-status: published
-:jbake-tomeepdf:
 :icons: font
 :imagesdir: ../../img
 
diff --git a/src/main/jbake/content/commercial-support.adoc b/src/main/jbake/content/commercial-support.adoc
new file mode 100644
index 0000000..6659d9f
--- /dev/null
+++ b/src/main/jbake/content/commercial-support.adoc
@@ -0,0 +1,24 @@
+= Apache TomEE Commercial Support
+:jbake-type: page
+:jbake-status: published
+
+This page is dedicated to companies offering products and services around or including Apache TomEE.
+
+The Apache TomEE PMC does not endorse or recommend any of the products or services on this page.
+We love all our supporters equally.
+
+Want to be added to this page?
+xref:add-my-offering.adoc[See here.]
+
+== Tomitribe
+
+link:http://www.tomitribe.com[Tomitribe] is a company created by several founding members of the Apache TomEE community with the mission of uniting businesses using TomEE with responsible and sustainable Open Source.
+Our goal is to support both the community and fuel the success of business that rely TomEE with a complete set of consulting, training, and commercial support.
+
+link:http://www.tomitribe.com[Join the tribe!]
+
+== ManageCat
+
+link:http://managecat.com[ManageCat] is a cloud management and service platform for Apache Tomcat  and Apache TomEE servers.
+Involving with a lot of Apache Java EE projects, we want to transfer not  only our knowledge about Apache TomEE and also other Java EE technologies  including JPA, EJB, CDI, JSF, JSTL, JTA, JMS.
+We will help our customers to develop and deploy their  production based Java EE applications smoothly.
diff --git a/src/main/jbake/content/commercial-support.md b/src/main/jbake/content/commercial-support.md
deleted file mode 100755
index 82e4df6..0000000
--- a/src/main/jbake/content/commercial-support.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Title: Apache TomEE Commercial Support
-
-This page is dedicated to companies offering products and services around or including Apache TomEE.
-
-The Apache TomEE PMC does not endorse or recommend any of the products or services on this page.  We love all
-our supporters equally.
-
-Want to be added to this page?  [See here.](add-my-offering.html)
-
-### Tomitribe
-
-[Tomitribe](http://www.tomitribe.com) is a company created by several founding members of the Apache TomEE community
-with the mission of uniting businesses using TomEE with responsible and sustainable Open Source.  Our goal is to
-support both the community and fuel the success of business that rely TomEE with a complete set of consulting, training,
-and commercial support.
-
-[Join the tribe!](http://www.tomitribe.com)
-
-### ManageCat
-[ManageCat](http://managecat.com) is a cloud management and service platform for Apache Tomcat 
-and Apache TomEE servers. Involving with a lot of Apache Java EE projects, we want to transfer not 
-only our knowledge about Apache TomEE and also other Java EE technologies 
-including JPA, EJB, CDI, JSF, JSTL, JTA, JMS. We will help our customers to develop and deploy their 
-production based Java EE applications smoothly.
\ No newline at end of file
diff --git a/src/main/jbake/content/community/commercial.adoc b/src/main/jbake/content/community/commercial.adoc
index 13adda6..24f463d 100755
--- a/src/main/jbake/content/community/commercial.adoc
+++ b/src/main/jbake/content/community/commercial.adoc
@@ -2,7 +2,6 @@
 :jbake-date: 2016-03-16
 :jbake-type: page
 :jbake-status: published
-:jbake-tomeepdf:
 
 This page is dedicated to companies offering products and services around or including Apache TomEE.
 
@@ -10,22 +9,22 @@
 
 Want to be added to this page? See at the bottom.
 
-=== Tomitribe
+== Tomitribe
 
 https://www.tomitribe.com[Tomitribe] is a company created by several founding members of the Apache TomEE community with the mission of uniting businesses using TomEE with responsible and sustainable Open Source. Our goal is to support both the community and fuel the success of business that rely TomEE with a complete set of consulting, training, and commercial support.
 
 
-=== ManageCat
+== ManageCat
 
 ManageCat is a cloud management and service platform for Apache Tomcat and Apache TomEE servers. Involving with a lot of Apache Java EE projects, we want to transfer not only our knowledge about Apache TomEE and also other Java EE technologies including JPA, EJB, CDI, JSF, JSTL, JTA, JMS. We will help our customers to develop and deploy their production based Java EE applications smoothly.
 
-=== I want to be added there
+== I want to be added there
 
-To be listed in the Commercial Support send a link:../security/support.html[mail] to the Apache TomEE PMC with a description of your offerings and the text you would like to have added.
+To be listed in the Commercial Support send a xref:../security/support.adoc[mail] to the Apache TomEE PMC with a description of your offerings and the text you would like to have added.
 
-==== Policy for additions
+== Policy for additions
 The Apache TomEE PMC does not and cannot endorse or recommend any products or services.
 
 All submitted information must be factual and informational in nature and not be a marketing statement. Statements that promote your products and services over other offerings on the page will not be tolerated and will be removed. Such marketing statements can be added to your own pages on your own site.
 
-When in doubt, email the Apache TomEE PMC list (see link:../security/support.html[Mailing Lists]) and ask. We are be happy to help.
+When in doubt, email the Apache TomEE PMC list (see xref:../security/support.adoc[Mailing Lists]) and ask. We are happy to help.
diff --git a/src/main/jbake/content/community/contributing/contribution-tips.adoc b/src/main/jbake/content/community/contributing/contribution-tips.adoc
index 59d6282..3197fc3 100755
--- a/src/main/jbake/content/community/contributing/contribution-tips.adoc
+++ b/src/main/jbake/content/community/contributing/contribution-tips.adoc
@@ -3,7 +3,7 @@
 :jbake-type: page
 :jbake-status: published
 
-=== Subscribe to the developer mailing list
+== Subscribe to the developer mailing list
 
 To get started send an email from the email address you want to use to the
 TomEE developers mailing list (dev-subscribe@tomee.apache.org). After you
@@ -25,9 +25,9 @@
 about you. Welcome to the adventure!
 
 
-=== What is the process?
+== What is the process?
 
-Check and follow the link:workflow.html[workflow for contributing].
+Check and follow the xref:workflow.adoc[workflow for contributing].
 
 After a while when people feel comfortable with you as contributor, they vote you in as a committer and ... big surprise ... there's almost no change in the daily routine. You get access to svn and pretty much everything else stays the same. Instead of submitting patches, now you have to help review them and commit them. Instead of learning how to contribute to an open source project, now you have to learn how to help others get involved. And of course it doesn't happen all at once, you never stop learning these things and you never stop wishing you had more time.
 
@@ -37,7 +37,7 @@
 
 Probably finding something to do when you do have time is the hardest part ... that never changes.
 
-=== Be Brave
+== Be Brave
 Don't assume everything has already been discussed a million times and you're the only one who doesn't know and so you shouldn't bother anyone and should just figure it out on your own. That thinking is your enemy. Don't do that or you will get nowhere ... very slowly. So slowly that now you feel you really can't ask about it because surely everyone assumes you know it or have done it by now. That thinking is a terrible trap. Ask questions. Post your thoughts.
 
 Don't worry about asking "stupid" questions on the list -- even simple questions have great value. They often lead to surprisingly good discussions. They also have a profound impact on the people around you, the ones you don't see.
@@ -47,7 +47,7 @@
 Maybe it's like Karaoke; if the people singing sound like you when you sing, there are better odds you might get up and sign too. Seeing people like yourself do the things you want to do is inspiring.
 
 
-===  Start Small
+==  Start Small
 You may suddenly get a creative surge and see many many things that could be done. One thing you learn about open source is that you never know when life is going to intervene and you have to stop. So it's always really good to get a little tiny thing working, checked in, and just grow it iteratively as time permits. It is a practice that is key for people of any skill level. And it goes wonderfully with Open Source as it adds plenty of space for new ideas. Stone soup starts with the stone, not the soup!
 
 So no matter how big the idea or task, ask yourself "do I really need all of this to get started?". Start with the tiniest possible version. And then cut it down again :)
@@ -57,7 +57,7 @@
 Start small, get it checked in (or patch submitted) and work iteratively.
 
 
-=== Things that always need doing
+== Things that always need doing
 Final variables & fields are preferred where possible, but a lot of the code is old. Feel free to add them and hand the code back.
 If you have any skills with code coverage tools, then you'll probably find way too much to do! Tests are always welcome.
 There are over a 1,000 TODO comments in the code. Maybe some should be deleted. Maybe some could be completed. They probably all should have a JIRA id on them.
@@ -68,13 +68,13 @@
 Obviously, one could get quite bored doing just the above. But sometimes the above tasks can lead to more fun and exciting things. Anything that gets you in and looking at code and actually touching and changing it usually results in questions, discussions and ideas... then little passions and late nights and lack of sleep and caffeine abuse.
 
 
-=== Things to avoid
+== Things to avoid
 
-==== Huge patches
+=== Huge patches
 Huge patches are hard to digest. Try to avoid them whenever possible. Any step forward is a good one. Small steps allow people to see where you're headed and give input. That's true regardless if you are a committer or contributor.
 
 
-==== Be careful with reformatting
+=== Be careful with reformatting
 Try to never mix logic changes with code reformatting. It makes it nearly impossible for others to see what the actual change was.
 
 If you are a committer and want to reformat something, do the reformat as a separate commit before or after the real change. As long as they are separate and clearly marked it should be easy for people to see what is going on.
diff --git a/src/main/jbake/content/community/contributing/jira-ticket.adoc b/src/main/jbake/content/community/contributing/jira-ticket.adoc
index e7e3c43..e9b6987 100644
--- a/src/main/jbake/content/community/contributing/jira-ticket.adoc
+++ b/src/main/jbake/content/community/contributing/jira-ticket.adoc
@@ -7,17 +7,17 @@
 In order to keep track of all the tasks concerning TomEE there should be a ticket in the link:https://issues.apache.org/jira/browse/TOMEE[TomEE JIRA] for each work item. +
 Before you can create tickets, you have to link:https://issues.apache.org/jira/secure/Signup!default.jspa[sign up] for an account.
 
-=== No task without a ticket
+== No task without a ticket
 Before you start working on a task you should ensure that there is a ticket for your task. +
 Browse JIRA and use the search funktion to find out if there is already a ticket for what you want to pick up.
 If not, create a new one.
 
-=== Avoiding conflicts and wasted effort
+== Avoiding conflicts and wasted effort
 If a ticket already exists and is assign to someone you should not start working on this task. +
 If you want to help, contact the assigned person using the mailing list or write a comment in the JIRA ticket.
 
-=== Pick up a task
+== Pick up a task
 To inform others that you are working on a task, the corresponding ticket in JIRA should be assigned to you. +
 If you don't have permission to assign tickets (there is no edit sign behind the Field "Assignee"), just ask on the developers mailing list.
 
-(link:workflow.html[back to Contribution workflow])
+(xref:workflow.adoc[back to Contribution workflow])
diff --git a/src/main/jbake/content/community/contributing/process-task.adoc b/src/main/jbake/content/community/contributing/process-task.adoc
index 3da95ca..52a2e56 100644
--- a/src/main/jbake/content/community/contributing/process-task.adoc
+++ b/src/main/jbake/content/community/contributing/process-task.adoc
@@ -4,24 +4,27 @@
 :jbake-status: published
 
 
-=== Fork project repository
-You can work on the link:../sources.html[source code of TomEE] using github. If you don't have a github account, you can link:https://github.com/[sign up here]. +
-To create your own working area, go to the project link:https://github.com/apache/tomee[TomEE on github] and click on the link "Fork". A forked repository will be created for your account and you will be redirected to it.
+== Fork project repository
+You can work on the xref:community/sources.adoc[source code of TomEE] using github.
+If you don't have a github account, you can link:https://github.com/[sign up here].
+To create your own working area, go to the project link:https://github.com/apache/tomee[TomEE on github] and click on the link "Fork".
+A forked repository will be created for your account and you will be redirected to it.
 
-=== One branch for each ticket
+== One branch for each ticket
 Although you can work on the master branch it is advisable to create a new branch for each ticket you start to work on - even if it's only one.
 Use the JIRA id and title as name of the branch. 
 
-=== Get help
+== Get help
 If you need help or want to have feedback for your ideas write to the developes mailing list.
 
-=== Hands on
-Work on the code. Use local commit as often as you want. Use push (to your own forked repository) as often as you like. +
-Consider the link:contribution-tips.html[contribution tips]. +
-If a task is to hard to get it done: no problem. Just ask for help. +
+== Hands on
+Work on the code. Use local commit as often as you want.
+Use push (to your own forked repository) as often as you like.
+Consider the xref:contribution-tips.adoc[contribution tips].
+If a task is to hard to get it done: no problem. Just ask for help.
 If you want to cancel working on a task, don't forget to unassign the JIRA ticket!
 
-=== Comments in JIRA
+== Comments in JIRA
 Use comments for the JIRA ticket to document your work.
 
-(link:workflow.html[back to Contribution workflow])
+(xref:workflow.adoc[back to Contribution workflow])
diff --git a/src/main/jbake/content/community/contributing/submit-changes.adoc b/src/main/jbake/content/community/contributing/submit-changes.adoc
index 29beada..e944b41 100644
--- a/src/main/jbake/content/community/contributing/submit-changes.adoc
+++ b/src/main/jbake/content/community/contributing/submit-changes.adoc
@@ -3,10 +3,10 @@
 :jbake-type: page
 :jbake-status: published
 
-=== Ensure code compiles
+== Ensure code compiles
 Actually no need to be mentioned ... 
 
-=== Ensure tests passes
+== Ensure tests passes
 On the build system for TomEE additional tests are run. If your changes cause them to fail, the build will not succeed.
 This can be avoided by running the tests before submitting the changes, the commands are:
 [source]
@@ -16,21 +16,21 @@
 ----
 These are relatively quick to run - about a minute or so. 
 
-=== Smoke test
+== Smoke test
 Check at least if the server ist still starting with your changes ...
 
-=== Pull request
+== Pull request
 If you're confident of your work, the next step is to push your changes into your repository on github.
 To get your changes back into the TomEE repository you have to create a PR (pull request): on github go to your repository and select the branch where you have worked on.
 Click on "New pull request" and then on "Create pull request".
 
-=== Request review
+== Request review
 The changes in your PR can only be merged by a committer who will do a review before merging. 
 So ask on the developers mailing list for review of your PR. 
 These emails for PRs should have a description of the work in the subject line.  
 Here are some examples and why:
 
-==== Bad 
+=== Bad
 - This is an email about PR #451
 - See PR #451
 - Review PR #451
@@ -38,18 +38,18 @@
 
 With this style you'll get low participation on the thread as the subject is hidden.  You yourself will curse these emails in six months or a year in the future when you're looking for that valuable thread you remember, but your search reveals 10 threads all with basically only a number as the subject.  You'll either click and read all 10 PRs and email threads, or you'll more likely just give up.  Worse, you may read all 10 and not find what you're looking for.  Do your future self a favor and help him/her find the valuable discussions.
 
-==== Ok ...
+=== Ok ...
 - Options pertaining to the configuration of Javamail - PR# 451
 - Fixing issues on failover of JMS messages - PR# 451
 - Documenting deployment of JCA Connectors - PR# 451 +
 
 These are ok, much better than just a number.  Subjects are often truncated.  The real "meat" is at the end of the sentence which makes it the first to go.  Not a show-stopper, but can make your life hard when searching or scanning.
 
-==== Best!
+=== Best!
 - Javamail configuration options - PR# 451
 - JMS Failover issues - PR# 451
 - JCA connector deployment - PR# 451 +
 
 Here we flip it.  The real subject as at the beginning.  The verbs and generic nouns like "options" come after.  When you can pull it off, huge respect. 
 
-(link:workflow.html[back to Contribution workflow])
+(xref:workflow.adoc[back to Contribution workflow])
diff --git a/src/main/jbake/content/community/contributing/website.adoc b/src/main/jbake/content/community/contributing/website.adoc
index a61e776..34850da 100755
--- a/src/main/jbake/content/community/contributing/website.adoc
+++ b/src/main/jbake/content/community/contributing/website.adoc
@@ -8,19 +8,19 @@
 
  - https://gitbox.apache.org/repos/asf/tomee-site-generator.git. (Apache)
 
- - https://github.com/apache/tomee-site-generator.git (Github mirror)
+ - https://github.com/apache/tomee-site-generator.git (GitHub mirror)
 
 To submit a change do the following:
 
-- Create a ticket on http://issues.apache.org/jira/browse/TOMEE
+- Create a ticket on https://issues.apache.org/jira/browse/TOMEE
 
-- Open a PR in the Gihub mirror with the ticket number e.g `TOMEE-1000 - Ticket Description`
+- Open a PR in the GitHub mirror with the ticket number e.g `TOMEE-1000 - Ticket Description`
 
-A committer will review it and redeploy the website using Apache CMS.
+A committer will review it and redeploy the website using a Jenkins CI build job.
 
 Building the website is mainly about running `mvn compile`, note you can use `JBake` main to develop.
 Publishing the website is about running `mvn pre-site` - needs to be a TomEE committer.
 
 Here you can find the video tutorial on how to contribute to this Website.
 
-link:https://www.youtube.com/watch?v=P6IM0LDevVU[Watch the video here.]
\ No newline at end of file
+link:https://www.youtube.com/watch?v=P6IM0LDevVU[Watch the video here.]
diff --git a/src/main/jbake/content/community/contributing/workflow.adoc b/src/main/jbake/content/community/contributing/workflow.adoc
index 307a5a1..6e73338 100644
--- a/src/main/jbake/content/community/contributing/workflow.adoc
+++ b/src/main/jbake/content/community/contributing/workflow.adoc
@@ -7,34 +7,34 @@
 
 
 
-=== JIRA ticket
+== JIRA ticket
 - create ticket in JIRA, if not already existing
 - if ticket already assigned to someone else => talk
 - assign ticket to contributor, if not already assigned +
-  (link:jira-ticket.html[more details])
+  (xref:jira-ticket.adoc[more details])
 
 
 
-=== Process Task
+== Process Task
 - fork repository
 - create branch in own repository (name = JIRA ticket id)
 - discuss on mailing list
 - work on code
 - document work in JIRA ticket +
-  (link:process-task.html[more details])
+  (xref:process-task.adoc[more details])
 
-=== Submit Changes
+== Submit Changes
 - ensure code compiles 
 - ensure tests passes
 - create PR (pull request)
 - ask for review on mailing list +
-  (link:submit-changes.html[more details])
+  (xref:submit-changes.adoc[more details])
 
-=== Merge Changes (done by a committer)
+== Merge Changes (done by a committer)
 - review changes
 - merge code
 - change JIRA ticket status / close ticket +
 
-=== Cleanup
+== Cleanup
 - wait until PR is merged (ticket status change)
 - remove branch in own repository +
diff --git a/src/main/jbake/content/community/contributors.adoc b/src/main/jbake/content/community/contributors.adoc
index 1a700de..aa75236 100755
--- a/src/main/jbake/content/community/contributors.adoc
+++ b/src/main/jbake/content/community/contributors.adoc
@@ -1,35 +1,113 @@
-= Wall of fame
+= Wall of Fame - Contributors
 :jbake-date: 2016-03-16
 :jbake-type: contributors
 :jbake-status: published
 
 ----
-adc@apache.org* | Alan Cabrera | https://twitter.com/maguro/profile_image?size=bigger
-ammulder@apache.org* | Aaron Mulder | ../img/ammulder.png
-agumbrecht@tomitribe.com*
-dain@iq80.com*
-dblevins@apache.org*
-djencks@apache.org* | David Jencks
-dsh@apache.org* | Daniel Stefan Haischt | https://twitter.com/uebermodean/profile_image?size=bigger
-gawor@apache.org* | Jarek Gawor | https://twitter.com/jgawor/profile_image?size=bigger
-gdamour@apache.org* | Gianny Damour | ../img/gdamour.jpg
-genspring@apache.org* | Lin Quan Jiang | ../img/genspring.jpg
-hogstrom@apache.org* | Matt Richard Hogstrom | https://twitter.com/hogstrom/profile_image?size=bigger
-jgallimore@apache.org* | Jonathan Gallimore | https://twitter.com/jongallimore/profile_image?size=bigger
-jgenender@apache.org* | Jeff Genender | ../img/jgenender.jpg
-jlaskowski@apache.org* | Jacek Laskowski | https://twitter.com/jaceklaskowski/profile_image?size=bigger
-jlmonteiro@apache.org* | Jean-Louis Monteiro | https://twitter.com/JLouisMonteiro/profile_image?size=bigger
-jvanzyl@apache.org*
-jwhitlock@apache.org*
-kevan@apache.org* | Kevan Lee Miller | https://twitter.com/kevanmiller/profile_image?size=bigger
-kmalhi@apache.org* | Karan Singh Malhi | https://twitter.com/KrnMal/profile_image?size=bigger
-lajos@apache.org* | Lajos Moczar
-manugeorge@apache.org* | Manu George | ../img/manugeorge.jpg
-mnour@apache.org* | Mohammad Nour El-Din | ../img/mnour.jpg
-rickmcguire@apache.org* | Rick McGuire | ../img/rickmcguire.jpg
-rmannibucau@gmail.com*
-struberg@yahoo.de*
-tveronezi@apache.org*
-vishwanathk@apache.org* | Vishwanath | https://twitter.com/stratwine/profile_image?size=bigger
-xuhaihong@apache.org* | Haihong Xu | ../img/xuhaihong.jpg
+rmannibucau | https://github.com/rmannibucau | https://avatars.githubusercontent.com/u/1249546?v=4
+dblevins | https://github.com/dblevins | https://avatars.githubusercontent.com/u/94926?v=4
+jgallimore | https://github.com/jgallimore | https://avatars.githubusercontent.com/u/548624?v=4
+AndyGee | https://github.com/AndyGee | https://avatars.githubusercontent.com/u/2536412?v=4
+jeanouii | https://github.com/jeanouii | https://avatars.githubusercontent.com/u/1233474?v=4
+tveronezi | https://github.com/tveronezi | https://avatars.githubusercontent.com/u/1918442?v=4
+dain | https://github.com/dain | https://avatars.githubusercontent.com/u/58298?v=4
+jaceklaskowski | https://github.com/jaceklaskowski | https://avatars.githubusercontent.com/u/62313?v=4
+radcortez | https://github.com/radcortez | https://avatars.githubusercontent.com/u/5796305?v=4
+Daniel-Dos | https://github.com/Daniel-Dos | https://avatars.githubusercontent.com/u/8139890?v=4
+struberg | https://github.com/struberg | https://avatars.githubusercontent.com/u/79310?v=4
+djencks | https://github.com/djencks | https://avatars.githubusercontent.com/u/569822?v=4
+otaviojava | https://github.com/otaviojava | https://avatars.githubusercontent.com/u/863011?v=4
+cesarhernandezgt | https://github.com/cesarhernandezgt | https://avatars.githubusercontent.com/u/1454523?v=4
+kmalhi | https://github.com/kmalhi | https://avatars.githubusercontent.com/u/5103199?v=4
+ivanjunckes | https://github.com/ivanjunckes | https://avatars.githubusercontent.com/u/2260551?v=4
+brunobat | https://github.com/brunobat | https://avatars.githubusercontent.com/u/2318030?v=4
+j4fm | https://github.com/j4fm | https://avatars.githubusercontent.com/u/6817157?v=4
+rzo1 | https://github.com/rzo1 | https://avatars.githubusercontent.com/u/13417392?v=4
+jgawor | https://github.com/jgawor | https://avatars.githubusercontent.com/u/796079?v=4
+stratwine | https://github.com/stratwine | https://avatars.githubusercontent.com/u/696945?v=4
+doychin | https://github.com/doychin | https://avatars.githubusercontent.com/u/7131283?v=4
+danielsoro | https://github.com/danielsoro | https://avatars.githubusercontent.com/u/350841?v=4
+emecas | https://github.com/emecas | https://avatars.githubusercontent.com/u/849502?v=4
+cchacin | https://github.com/cchacin | https://avatars.githubusercontent.com/u/292938?v=4
+cicekhayri | https://github.com/cicekhayri | https://avatars.githubusercontent.com/u/143997?v=4
+exabrial | https://github.com/exabrial | https://avatars.githubusercontent.com/u/1392297?v=4
+tandraschko | https://github.com/tandraschko | https://avatars.githubusercontent.com/u/2485545?v=4
+ShermanMarshall | https://github.com/ShermanMarshall | https://avatars.githubusercontent.com/u/10781839?v=4
+eapjunior | https://github.com/eapjunior | https://avatars.githubusercontent.com/u/20850916?v=4
+gabrielbussolo | https://github.com/gabrielbussolo | https://avatars.githubusercontent.com/u/4117683?v=4
+vrossellotravelc | https://github.com/vrossellotravelc | https://avatars.githubusercontent.com/u/45101500?v=4
+mnour | https://github.com/mnour | https://avatars.githubusercontent.com/u/153299?v=4
+josehenriqueventura | https://github.com/josehenriqueventura | https://avatars.githubusercontent.com/u/2358940?v=4
+CristianDVN | https://github.com/CristianDVN | https://avatars.githubusercontent.com/u/14073354?v=4
+rmcguinness | https://github.com/rmcguinness | https://avatars.githubusercontent.com/u/906421?v=4
+SvetlinZarev-SAP | https://github.com/SvetlinZarev-SAP | https://avatars.githubusercontent.com/u/43135961?v=4
+uncommon-design | https://github.com/uncommon-design | https://avatars.githubusercontent.com/u/53859462?v=4
+jgenender | https://github.com/jgenender | https://avatars.githubusercontent.com/u/643609?v=4
+marcoantoniobferreira | https://github.com/marcoantoniobferreira | https://avatars.githubusercontent.com/u/23589475?v=4
+svenruppert | https://github.com/svenruppert | https://avatars.githubusercontent.com/u/2665330?v=4
+gdiazs | https://github.com/gdiazs | https://avatars.githubusercontent.com/u/2397243?v=4
+BogdanStirbat | https://github.com/BogdanStirbat | https://avatars.githubusercontent.com/u/2213741?v=4
+alexferreiradev | https://github.com/alexferreiradev | https://avatars.githubusercontent.com/u/8191965?v=4
+mpredli01 | https://github.com/mpredli01 | https://avatars.githubusercontent.com/u/4043260?v=4
+sercheo87 | https://github.com/sercheo87 | https://avatars.githubusercontent.com/u/1036090?v=4
+Croway | https://github.com/Croway | https://avatars.githubusercontent.com/u/34543311?v=4
+dineshkumarg | https://github.com/dineshkumarg | https://avatars.githubusercontent.com/u/13047948?v=4
+gerdogdu | https://github.com/gerdogdu | https://avatars.githubusercontent.com/u/1370429?v=4
+robinsonvs | https://github.com/robinsonvs | https://avatars.githubusercontent.com/u/8331918?v=4
+cotnic | https://github.com/cotnic | https://avatars.githubusercontent.com/u/10333974?v=4
+jrxxjr | https://github.com/jrxxjr | https://avatars.githubusercontent.com/u/8740736?v=4
+davidsalter | https://github.com/davidsalter | https://avatars.githubusercontent.com/u/32864282?v=4
+gmcdonald | https://github.com/gmcdonald | https://avatars.githubusercontent.com/u/287517?v=4
+fost14oct-zz | https://github.com/fost14oct-zz | https://avatars.githubusercontent.com/u/36649784?v=4
+cassunde | https://github.com/cassunde | https://avatars.githubusercontent.com/u/3828140?v=4
+weverthon-medeiros | https://github.com/weverthon-medeiros | https://avatars.githubusercontent.com/u/14115193?v=4
+puneethps | https://github.com/puneethps | https://avatars.githubusercontent.com/u/16502032?v=4
+carljmosca | https://github.com/carljmosca | https://avatars.githubusercontent.com/u/215651?v=4
+dheffelfinger | https://github.com/dheffelfinger | https://avatars.githubusercontent.com/u/13482727?v=4
+gacsnic | https://github.com/gacsnic | https://avatars.githubusercontent.com/u/24616597?v=4
+chongma | https://github.com/chongma | https://avatars.githubusercontent.com/u/6253322?v=4
+nishantraut | https://github.com/nishantraut | https://avatars.githubusercontent.com/u/10669557?v=4
+davidromero | https://github.com/davidromero | https://avatars.githubusercontent.com/u/2968138?v=4
+fredster33 | https://github.com/fredster33 | https://avatars.githubusercontent.com/u/64927044?v=4
+pavelsmajda | https://github.com/pavelsmajda | https://avatars.githubusercontent.com/u/24811669?v=4
+rhuan080 | https://github.com/rhuan080 | https://avatars.githubusercontent.com/u/10210672?v=4
+ferdisn | https://github.com/ferdisn | https://avatars.githubusercontent.com/u/28998445?v=4
+bitcod3r | https://github.com/bitcod3r | https://avatars.githubusercontent.com/u/4358449?v=4
+ivannov | https://github.com/ivannov | https://avatars.githubusercontent.com/u/664730?v=4
+whitlockjc | https://github.com/whitlockjc | https://avatars.githubusercontent.com/u/98899?v=4
+jchemile | https://github.com/jchemile | https://avatars.githubusercontent.com/u/7410390?v=4
+juneau001 | https://github.com/juneau001 | https://avatars.githubusercontent.com/u/121002?v=4
+patriciauz | https://github.com/patriciauz | https://avatars.githubusercontent.com/u/20784387?v=4
+sendilkumarn | https://github.com/sendilkumarn | https://avatars.githubusercontent.com/u/12471122?v=4
+breakponchito | https://github.com/breakponchito | https://avatars.githubusercontent.com/u/279375?v=4
+dalexandrov | https://github.com/dalexandrov | https://avatars.githubusercontent.com/u/2016949?v=4
+dependabot[bot] | https://github.com/apps/dependabot | https://avatars.githubusercontent.com/in/29110?v=4
+aboullaite | https://github.com/aboullaite | https://avatars.githubusercontent.com/u/2836850?v=4
+avermeer | https://github.com/avermeer | https://avatars.githubusercontent.com/u/17863217?v=4
+Dexmaster | https://github.com/Dexmaster | https://avatars.githubusercontent.com/u/6061000?v=4
+brettporter | https://github.com/brettporter | https://avatars.githubusercontent.com/u/49108?v=4
+cbos | https://github.com/cbos | https://avatars.githubusercontent.com/u/255404?v=4
+danielshahaf | https://github.com/danielshahaf | https://avatars.githubusercontent.com/u/2141904?v=4
+deki | https://github.com/deki | https://avatars.githubusercontent.com/u/858827?v=4
+kaminfeuer | https://github.com/kaminfeuer | https://avatars.githubusercontent.com/u/7949105?v=4
+gerwinjansen | https://github.com/gerwinjansen | https://avatars.githubusercontent.com/u/13243946?v=4
+HillmerCh | https://github.com/HillmerCh | https://avatars.githubusercontent.com/u/29781653?v=4
+jimmycasey | https://github.com/jimmycasey | https://avatars.githubusercontent.com/u/5089723?v=4
+JuanMorenoDeveloper | https://github.com/JuanMorenoDeveloper | https://avatars.githubusercontent.com/u/7319391?v=4
+kaloyanspiridonov | https://github.com/kaloyanspiridonov | https://avatars.githubusercontent.com/u/42994528?v=4
+katya-stoycheva | https://github.com/katya-stoycheva | https://avatars.githubusercontent.com/u/24268910?v=4
+mawiesne | https://github.com/mawiesne | https://avatars.githubusercontent.com/u/20473513?v=4
+revmischa | https://github.com/revmischa | https://avatars.githubusercontent.com/u/245131?v=4
+scriptmonkey | https://github.com/scriptmonkey | https://avatars.githubusercontent.com/u/1366409?v=4
+sebfz1 | https://github.com/sebfz1 | https://avatars.githubusercontent.com/u/1717144?v=4
+suyogbarve | https://github.com/suyogbarve | https://avatars.githubusercontent.com/u/1817914?v=4
+SvetlinZarev | https://github.com/SvetlinZarev | https://avatars.githubusercontent.com/u/1794797?v=4
+kakawait | https://github.com/kakawait | https://avatars.githubusercontent.com/u/275609?v=4
+cocorossello | https://github.com/cocorossello | https://avatars.githubusercontent.com/u/3096556?v=4
+violetagg | https://github.com/violetagg | https://avatars.githubusercontent.com/u/696661?v=4
+pendor | https://github.com/pendor | https://avatars.githubusercontent.com/u/209193?v=4
+javalenjara | https://github.com/javalenjara | https://avatars.githubusercontent.com/u/51468684?v=4
+mayens | https://github.com/mayens | https://avatars.githubusercontent.com/u/233983?v=4
+t4fm | https://github.com/t4fm | https://avatars.githubusercontent.com/u/47995607?v=4
+yenerm | https://github.com/yenerm | https://avatars.githubusercontent.com/u/715370?v=4
 ----
diff --git a/src/main/jbake/content/community/culture.adoc b/src/main/jbake/content/community/culture.adoc
index dcaa8a5..33facc0 100644
--- a/src/main/jbake/content/community/culture.adoc
+++ b/src/main/jbake/content/community/culture.adoc
@@ -3,4 +3,4 @@
 :jbake-type: page
 :jbake-status: published
 
-==
\ No newline at end of file
+==
diff --git a/src/main/jbake/content/community/index.adoc b/src/main/jbake/content/community/index.adoc
index a222d62..965fdde 100755
--- a/src/main/jbake/content/community/index.adoc
+++ b/src/main/jbake/content/community/index.adoc
@@ -4,20 +4,20 @@
 :jbake-status: published
 
 
-=== Contribute
+== Contribute
 
-- link:contributing/contribution-tips.html[Contribution tips]
-- link:contributing/workflow.html[Contribution workflow]
-- link:sources.html[Apache TomEE]
-- link:contributing/website.html[This website]
-- link:contributors.html[TomEE Wall Of Fame]
+* xref:contributing/contribution-tips.adoc[Contribution tips]
+* xref:contributing/workflow.adoc[Contribution workflow]
+* xref:sources.adoc[Contribute to Apache TomEE]
+* xref:contributing/website.adoc[Contribute to this Website]
+* xref:contributors.adoc[Apache TomEE - Wall Of Fame]
 
-=== Social Media: cause contributing is not only about coding
+== Social Media: cause contributing is not only about coding
 
-Facebook, Twitter, Google+: if that speaks to you just follow this link:social.html[TomEE on Social Media].
+Facebook or Twitter: if that speaks to you just follow this xref:social.adoc[TomEE on Social Media].
 
-=== Support
+== Support
 
-For more information about available support for TomEE please have a look on link:../security/support.html[Support] page.
+For more information about available support for TomEE please have a look on xref:../security/support.adoc[Support] page.
 
 
diff --git a/src/main/jbake/content/community/social.adoc b/src/main/jbake/content/community/social.adoc
index 2658ac9..5d4920a 100755
--- a/src/main/jbake/content/community/social.adoc
+++ b/src/main/jbake/content/community/social.adoc
@@ -4,14 +4,10 @@
 :jbake-status: published
 :icons: font
 
-=== Facebook
+== Facebook
 
 icon:facebook[size=2x] https://facebook.com/ApacheTomEE[TomEE @ Facebook]
 
-=== Twitter
+== Twitter
 
-icon:twitter[size=2x] https://twitter.com/apachetomee[TomEE @ Twitter]
-
-=== Google+
-
-icon:google-plus[size=2x] https://plus.google.com/communities/105208241852045684449[TomEE @ Goole+]
+icon:twitter[size=2x] https://twitter.com/apachetomee[TomEE @ Twitter]
\ No newline at end of file
diff --git a/src/main/jbake/content/community/sources.adoc b/src/main/jbake/content/community/sources.adoc
index 991bafd..11cb2f3 100755
--- a/src/main/jbake/content/community/sources.adoc
+++ b/src/main/jbake/content/community/sources.adoc
@@ -3,13 +3,13 @@
 :jbake-type: page
 :jbake-status: published
 
-=== Github
+== GitHub
 
-TomEE is on Github at https://github.com/apache/tomee . The sources are synchronized by Apache on Github
+TomEE is on GitHub at https://github.com/apache/tomee . The sources are synchronized by Apache on GitHub
 but Pull/Requests are integrated with Apache Infrastructure which means you can just submit us a patch as
-you would do on any Github project and Apache takes care of the rest of the process.
+you would do on any other GitHub project and Apache takes care of the rest of the process.
 
-=== Apache Git
+== Apache Git
 
 TomEE is using https://git-scm.com/[Git] as source content manager.
 
@@ -27,9 +27,9 @@
 git clone -b tomee-1.7.x https://gitbox.apache.org/repos/asf/tomee.git tomee-1.7.x
 ----
 
-Master branch is the more up to date version of the codebase and currently targets TomEE 7.x branch.
+Master branch is the more up to date version of the codebase and currently targets TomEE 8.x branch.
 
-=== Building
+== Building
 
 TomEE is a standard Maven project and to build it you just have to use the following command:
 
@@ -42,7 +42,7 @@
 
 NOTE: if you are interested in testing arquillian tests with all adapters of tomee you will need to activate the dedicated profile: `-Pall-adapters`.
 
-==== Fast build
+=== Fast build
 
 Here are some shortcut builds if you just want to create a specific artifact (note it skips tests but removing `-DskipTests` you will execute them):
 
@@ -53,19 +53,18 @@
 mvn clean install -DskipTests -pl tomee/apache-tomee -am
 ----
 
-Then TomEE archives are at `tomee/apache/tomee/target/apache-tomee-${classifier}-${version}.${extension}`.
+Then TomEE archives are at `tomee/apache/tomee/target/apache-tomee-$\{classifier}-$\{version}.$\{extension}`.
 
-=== Continuous Integration
+== Continuous Integration
 
-TomEE is using Buildbot for its continuous integration. You can access main builds (Ubuntu ones) at these address:
+TomEE is using Jenkins CI for its continuous integration. You can access builds at these address:
 
-- https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8[TomEE Master]
-- https://ci.apache.org/builders/tomee-1.7.x-ubuntu[TomEE 1.7.x]
+- https://ci-builds.apache.org/job/Tomee/[TomEE @ Jenkins CI]
 
-=== Issues
+== Issues
 
-Tomee uses Jira for issues, if you are looking for a problem or reporting one, use the following address:
+TomEE uses Jira for issues, if you are looking for a problem or reporting one, use the following address:
 
-- Create a ticket on http://issues.apache.org/jira/browse/TOMEE
+- Create a ticket on https://issues.apache.org/jira/browse/TOMEE
 
-- Open a PR in the Gihub mirror with the ticket number e.g `TOMEE-1000 - Ticket Description`
\ No newline at end of file
+- Open a PR in the GitHub mirror with the ticket number e.g. `TOMEE-1000 - Ticket Description`
diff --git a/src/main/jbake/content/comparison.adoc b/src/main/jbake/content/comparison.adoc
new file mode 100644
index 0000000..6023aca
--- /dev/null
+++ b/src/main/jbake/content/comparison.adoc
@@ -0,0 +1,49 @@
+= Comparison
+:index-group: General Information
+:jbake-date: 2018-12-05
+:jbake-type: page
+:jbake-status: published
+:icons: font
+:y: icon:check[role="green"]
+:n: icon:times[role="red"]
+:c: icon:file-text-o[role="blue"]
+
+Apache TomEE has four distributions, each supporting a slightly different set of technologies and aimed to give you a choice in what you want included out-of-the-box.  When in doubt, chose Apache TomEE Plume.
+
+[cols="4,5*^1",options="header"]
+|===
+||Tomcat|TomEE WebProfile|TomEE MicroProfile|TomEE Plume|TomEE Plus
+|Jakarta Annotations|{y}|{y}|{y}|{y}|{y}
+|Jakarta Debugging Support for Other Languages|{y}|{y}|{y}|{y}|{y}
+|Jakarta Security (Java EE Enterprise Security)|{y}|{y}|{y}|{y}|{y}
+|Jakarta Server Pages (JSP)|{y}|{y}|{y}|{y}|{y}
+|Jakarta Servlet|{y}|{y}|{y}|{y}|{y}
+|Jakarta Standard Tag Library (JSTL)|{y}|{y}|{y}|{y}|{y}
+|Jakarta WebSocket|{y}|{y}|{y}|{y}|{y}
+|Jakarta Expression Language (EL)|{y}|{y}|{y}|{y}|{y}
+|Jakarta Activation||{y}|{y}|{y}|{y}
+|Jakarta Bean Validation||{y}|{y}|{y}|{y}
+|Jakarta Contexts and Dependency Injection (CDI)||{y}|{y}|{y}|{y}
+|Jakarta Dependency Injection (@Inject)||{y}|{y}|{y}|{y}
+|Jakarta Enterprise Beans (EJB)||{y}|{y}|{y}|{y}
+|Jakarta Interceptors||{y}|{y}|{y}|{y}
+|Jakarta JSON Binding (JSON-B)||{y}|{y}|{y}|{y}
+|Jakarta JSON Processing (JSON-P)||{y}|{y}|{y}|{y}
+|Jakarta Mail (JavaMail)||{y}|{y}|{y}|{y}
+|Jakarta Managed Beans||{y}|{y}|{y}|{y}
+|Jakarta Persistence (JPA)||{y}|{y}|{y}|{y}
+|Jakarta RESTful Web Services (JAX-RS)||{y}|{y}|{y}|{y}
+|Jakarta Server Faces (JSF)||{y}|{y}|{y}|{y}
+|Jakarta Transactions (JTA)||{y}|{y}|{y}|{y}
+|Jakarta XML Binding (JAXB)||{y}|{y}|{y}|{y}
+|Jakarta Authentication (JAAS)||||{y}|{y}
+|Jakarta Authorization (JACC)||||{y}|{y}
+|Jakarta Concurrency||||{y}|{y}
+|Jakarta Connectors||||{y}|{y}
+|Jakarta Enterprise Web Services||||{y}|{y}
+|Jakarta Messaging (JMS)||||{y}|{y}
+|Jakarta SOAP with Attachments||||{y}|{y}
+|Jakarta Web Services Metadata||||{y}|{y}
+|Jakarta XML Web Services (JAX-WS)||||{y}|{y}
+|Jakarta Batch (JBatch)|||||{y}
+|===
diff --git a/src/main/jbake/content/comparison.md b/src/main/jbake/content/comparison.md
deleted file mode 100644
index 4f417b3..0000000
--- a/src/main/jbake/content/comparison.md
+++ /dev/null
@@ -1,219 +0,0 @@
-Title: Comparison
-
-Apache OpenEJB and Apache TomEE are born from the same project and community.  They differ in two major ways, only one of them technical:
-
- - TomEE incorporates two additional projects; Tomcat and MyFaces
- - TomEE, as a name, more easily implies the breadth of technologies included
-
-Effectively, TomEE is a superset of OpenEJB.  They share the same code and TomEE grew out of OpenEJB.
-
-Note: this table is for TomEE 1.x, TomEE 7 comments are under it.
-
-<table>
-<tr>
-<th></th>
-<th>Tomcat</th>
-<th>TomEE</th>
-<th>TomEE JAX-RS (~ Microprofile)</th>
-<th>TomEE+</th>
-<th>TomEE PluME</th>
-<th>OpenEJB</th>
-</tr>
-
-<tr>
-<td>Java Servlets</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td></td>
-</tr>
-
-<tr>
-<td>Java ServerPages (JSP)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td></td>
-</tr>
-
-<tr>
-<td>Java ServerFaces (JSF)</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td></td>
-</tr>
-
-<tr>
-<td>Java Transaction API (JTA)</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Persistence API (JPA)</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Contexts and Dependency Injection (CDI)</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Authentication and Authorization Service (JAAS)</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Authorization Contract for Containers (JACC)</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>JavaMail API</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Bean Validation</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Enterprise JavaBeans</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java API for RESTful Web Services (JAX-RS)</td>
-<td></td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java API for XML Web Services (JAX-WS)</td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java EE Connector Architecture</td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Messaging Service (JMS)</td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>EclipseLink</td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-<td></td>
-</tr>
-
-<tr>
-<td>Mojarra</td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-<td></td>
-</tr>
-
-</table>
-
-
-TomEE 7 targets JavaEE 7 and implements these specifications (in parenthesis the distibution(s) containing it if not part of the basic packages):
-
-* WebSocket JSR 356
-* JSON-P JSR 353
-* Servlet 3.1 JSR 340
-* JSF 2.2 JSR 344
-* EL 3.0 JSR 341
-* JSP 2.3 JSR 245
-* JSTL 1.2 JSR 52
-* JBatch (plus) JSR 352
-* Concurrency utilities for EE JSR 236
-* CDI 1.2, DI, Interceptors 1.2, Common Annotations JSR 346 + JSR 330 + JSR 318 + JSR 250
-* Bean Validation 1.1 JSR 349
-* EJB 3.2 JSR 345
-* JavaEE Connector JSR 322
-* JPA 2.1 JSR 338 (WARNING: openjpa based distributions provide a JPA 2.0 runtime)
-* JMS 2.0 JSR 343 (layer based on ActiveMQ 5 / JMS 1.1 for default distributions)
-* JTA 1.2 JSR 907
-* Javamail 1.4 (NOTE: EE 7 requires 1.5)
-* JAX-RS 2.0 JSR 339
-* JAX-WS 2.2 JSR 224
-* JAXB 2.2 JSR 222
-* and more inherited from TomEE 1/JavaEE 6
-
diff --git a/src/main/jbake/content/concepts.adoc b/src/main/jbake/content/concepts.adoc
new file mode 100644
index 0000000..7948d29
--- /dev/null
+++ b/src/main/jbake/content/concepts.adoc
@@ -0,0 +1,42 @@
+= Concepts
+:index-group: Unrevised
+:jbake-date: 2018-12-05
+:jbake-type: page
+:jbake-status: published
+
+//in site-generator
+
+OpenEJB was founded on the idea that it would be embedded into third-party environments whom would likely already have three things:
+
+* their one "server" platform with existing clients and protocols
+* their own way to configure their platform
+* existing services like TransactionManager, Security, and Connector
+
+Thus the focus of OpenEJB was to create an EJB implementation that would be easily embeddible, configurable, and customizable.
+
+Part of achieving that is a drive to be as simple as possible as to not over-define and therefore restrict the ability to be embeddible, configurable and customizable.
+Smaller third-party environments could easily 'downscale' OpenEJB in their integrations by replacing standard components with lighter implementations or removing them all together and larger environments could 'upscale' OpenEJB by replacing and adding heavier implementations of those standard components likely tailored to their systems and infrastructure.
+
+Container and Server are mentioned in the EJB spec as being separate things but are never defined formally.
+In our world Containers, which implement the basic component contract and lifecycle of a bean are not coupled to any particular Server, which has the job of providing a naming service and providing a way for it's clients to reference and invoke components (beans) hosted in Containers.
+Because Containers have no dependence at all only Server, you can run OpenEJB without any Server at all in an embedded environment for example without any work or any extra overhead.
+Similarly you can add as many new Server components as you want without ever having to modify any Containers.
+
+There is a very strong pluggability focus in OpenEJB as it was always intended to be embedded and customized in other environments.
+As a result all Containers are pluggable, isolated from each other, and no one Container is bound to another Container and therefore removing or adding a Container has no repercussions on the other Containers in the system.
+TransactionManager, SecurityService and Connector also pluggable and are services exposed to Containers.
+A Container may not be dependent on specific implementations of those services.
+Service Providers define what services they are offering (Container, Connector, Security, Transaction, etc.) in a file they place in their jar called service-jar.xml.
+
+The service-jar.xml should be placed not in the META-INF but somewhere in your package hierarchy (ours is in /org/apache/openejb/service-jar.xml) which allows the services in your service-jar.xml to be referenced by name (such as DefaultStatefulContainer) or more specifically by package and id (such as org.apache.openejb#DefaultStatefulContainer).
+
+The same implementation of a service can be declared several times in a service-jar.xml with different ids.
+This allows for you to setup several several different profiles or pre-configured versions of the services you provide each with a different name and different set of default values for its properties.
+
+In your openejb.conf file when you declare Containers and Connectors, we are actually hooking you up with Service Providers automatically.
+You get what is in the org/apache/openejb/service-jar.xml by default, but you are able to point specifically to a specific Service Provider by the 'provider' attribute on the Container, Connector, TransactionManager, SecurityService, etc. elements of the openejb.conf file.
+When you declare a service (Container, Connector, etc.) in your openejb.conf file the properties you supply override the properties supplied by the Service Provider, thus you only need to specify the properties you'd like to change and can have your openejb.conf file as large or as small as you would like it.
+The act of doing this can be thought of as essentially instantiating the Service Provider and configuring that instance for inclusion in the runtime system.
+
+For example Container(id=NoTimeoutStatefulContainer, provider=DefaultStatefulContainer) could be declared with it's Timeout property set to 0 for never, and a Container(id=ShortTimeoutStatefulContainer, provider=DefaultStatefulContainer) could be declared with it's Timeout property set to 15 minutes.
+Both would be instances of the DefaultStatefulContainer Service Provider which is a service of type Container.
diff --git a/src/main/jbake/content/concepts.md b/src/main/jbake/content/concepts.md
deleted file mode 100644
index dba6d33..0000000
--- a/src/main/jbake/content/concepts.md
+++ /dev/null
@@ -1,75 +0,0 @@
-Title: Concepts
-OpenEJB was founded on the idea that it would be embedded into third-party
-environments whom would likely already have three things:
-
- - their one "server" platform with existing clients and protocols
- - their own way to configure their platform
- - existing services like TransactionManager, Security, and Connector
-
-Thus the focus of OpenEJB was to create an EJB implementation that would be
-easily embeddible, configurable, and customizable.  
-
-Part of achieving that is a drive to be as simple as possible as to not
-over-define and therefore restrict the ability to be embeddible,
-configurable and customizable.	Smaller third-party environments could
-easily 'downscale' OpenEJB in their integrations by replacing standard
-components with lighter implementations or removing them all together and
-larger environments could 'upscale' OpenEJB by replacing and adding heavier
-implementations of those standard components likely tailored to their
-systems and infrastructure.
-
-Container and Server are mentioned in the EJB spec as being separate things
-but are never defined formally.  In our world Containers, which implement
-the basic component contract and lifecycle of a bean are not coupled to any
-particular Server, which has the job of providing a naming service and
-providing a way for it's clients to reference and invoke components (beans)
-hosted in Containers.  Because Containers have no dependence at all only
-Server, you can run OpenEJB without any Server at all in an embedded
-environment for example without any work or any extra overhead.  Similarly
-you can add as many new Server components as you want without ever having
-to modify any Containers.
-
-There is a very strong pluggability focus in OpenEJB as it was always
-intended to be embedded and customized in other environments.  As a result
-all Containers are pluggable, isolated from each other, and no one
-Container is bound to another Container and therefore removing or adding a
-Container has no repercussions on the other Containers in the system. 
-TransactionManager, SecurityService and Connector also pluggable and are
-services exposed to Containers.  A Container may not be dependent on
-specific implementations of those services.  Service Providers define what
-services they are offering (Container, Connector, Security, Transaction,
-etc.) in a file they place in their jar called service-jar.xml.  
-
-The service-jar.xml should be placed not in the META-INF but somewhere in
-your package hierarchy (ours is in /org/apache/openejb/service-jar.xml)
-which allows the services in your service-jar.xml to be referenced by name
-(such as DefaultStatefulContainer) or more specifically by package and id
-(such as org.apache.openejb#DefaultStatefulContainer).	
-
-The same implementation of a service can be declared several times in a
-service-jar.xml with different ids.  This allows for you to setup several
-several different profiles or pre-configured versions of the services you
-provide each with a different name and different set of default values for
-its properties.  
-
-In your openejb.conf file when you declare Containers and Connectors, we
-are actually hooking you up with Service Providers automatically.  You get
-what is in the org/apache/openejb/service-jar.xml by default, but you are
-able to point specifically to a specific Service Provider by the 'provider'
-attribute on the Container, Connector, TransactionManager, SecurityService,
-etc. elements of the openejb.conf file.  When you declare a service
-(Container, Connector, etc.) in your openejb.conf file the properties you
-supply override the properties supplied by the Service Provider, thus you
-only need to specify the properties you'd like to change and can have your
-openejb.conf file as large or as small as you would like it.  The act of
-doing this can be thought of as essentially instantiating the Service
-Provider and configuring that instance for inclusion in the runtime system. 
-
-For example Container(id=NoTimeoutStatefulContainer,
-provider=DefaultStatefulContainer) could be declared with it's Timeout
-property set to 0 for never, and a
-Container(id=ShortTimeoutStatefulContainer,
-provider=DefaultStatefulContainer) could be declared with it's Timeout
-property set to 15 minutes.  Both would be instances of the
-DefaultStatefulContainer Service Provider which is a service of type
-Container.
diff --git a/src/main/jbake/content/contribute.adoc b/src/main/jbake/content/contribute.adoc
new file mode 100644
index 0000000..5d6b4c7
--- /dev/null
+++ b/src/main/jbake/content/contribute.adoc
@@ -0,0 +1,177 @@
+= Contributing
+:jbake-type: page
+:jbake-status: published
+
+Contributing to the project is a great way to support the community.
+Some great links for getting involved
+
+* xref:dev/source-code.adoc[Source Code]
+* xref:dev/contribution-tips.adoc[Contribution Tips]
+
+NOTE: The next (broken) link on the current site points to an apparently generated list of pages in dev.
+
+* xref:dev/index.adoc[Developer Documentation]
+
+== Contributing doesn't always mean code.
+
+If you love the project and want to see it grow, follow it on Facebook and Twitter.
+
+* http://twitter.com/ApacheTomEE
+* http://facebook.com/ApacheTomEE
+
+The more people we reach the more the project grows.
+
+* Become an active retweeter + +++<a onclick="javascript:twshare()" class="tw-share sprite" title="share on Twitter">+++share [tw]+++</a>+++
+* Share pages you like on Facebook + +++<a onclick="javascript:fbshare()" class="fb-share sprite" title="share on Facebook">+++share [fb]+++</a>+++
+* Share pages you like on Pinterest + +++<a onclick="javascript:pinshare()" class="pin-share sprite" title="Share on Pinterest">+++share [pin]+++</a>+++
+
+Doing these things as often as possible are simple and powerful ways to help.
+Do your part and watch the project grow grow grow!
+
+== Edit This Site
+
+Top right, next to the Twitter symbol, there is an edit symbol <<edit,contribute>>.
+Most of the pages on this site can be edited by you.
+If you find a spelling mistake, or just want to improve the documentation then please do!
+
+If you want to edit the xref:{examples-vc}::index.adoc[Examples Documentation] then check-out the xref:dev/source-code.adoc[Source Code] and edit or create the README.md in the example directory you want to improve.
+
+== Committers
+
+[cols=4*]
+|===
+| link:mailto:adc@apache.org[Alan Cabrera]
+| Committer, PMC
+| http://people.apache.org/~adc[adc]
+| http://people.apache.org/map.html?adc[map]
+
+| link:mailto:ammulder@apache.org[Aaron Mulder]
+| Committer
+| http://people.apache.org/~ammulder[ammulder]
+| http://people.apache.org/map.html?ammulder[map]
+
+| link:mailto:andygumbrecht@apache.org[Andrew Gumbrecht]
+| Committer
+| http://people.apache.org/~andygumbrecht[andygumbrecht]
+| http://people.apache.org/map.html?andygumbrecht[map]
+
+| link:mailto:dain@apache.org[Dain Sundstrom]
+| Committer, PMC
+| http://people.apache.org/~dain[dain]
+| http://people.apache.org/map.html?dain[map]
+
+| link:mailto:dblevins@apache.org[David Blevins]
+| Founder, Chair
+| http://people.apache.org/~dblevins[dblevins]
+| http://people.apache.org/map.html?dblevins[map]
+
+| link:mailto:djencks@apache.org[David Jencks]
+| Committer, PMC
+| http://people.apache.org/~djencks[djencks]
+| http://people.apache.org/map.html?djencks[map]
+
+| link:mailto:dsh@apache.org[Daniel Stefan Haischt]
+| Committer
+| http://people.apache.org/~dsh[dsh]
+| http://people.apache.org/map.html?dsh[map]
+
+| link:mailto:gawor@apache.org[Jarek Gawor]
+| Committer
+| http://people.apache.org/~gawor[gawor]
+| http://people.apache.org/map.html?gawor[map]
+
+| link:mailto:gdamour@apache.org[Gianny Damour]
+| Committer
+| http://people.apache.org/~gdamour[gdamour]
+| http://people.apache.org/map.html?gdamour[map]
+
+| link:mailto:genspring@apache.org[Lin Quan Jiang]
+| Committer
+| http://people.apache.org/~genspring[genspring]
+| http://people.apache.org/map.html?genspring[map]
+
+| link:mailto:hogstrom@apache.org[Matt Richard Hogstrom]
+| Committer
+| http://people.apache.org/~hogstrom[hogstrom]
+| http://people.apache.org/map.html?hogstrom[map]
+
+| link:mailto:jgallimore@apache.org[Jonathan Gallimore]
+| Committer, PMC
+| http://people.apache.org/~jgallimore[jgallimore]
+| http://people.apache.org/map.html?jgallimore[map]
+
+| link:mailto:jgenender@apache.org[Jeff Genender]
+| Committer
+| http://people.apache.org/~jgenender[jgenender]
+| http://people.apache.org/map.html?jgenender[map]
+
+| link:mailto:jlaskowski@apache.org[Jacek Laskowski]
+| Committer, PMC
+| http://people.apache.org/~jlaskowski[jlaskowski]
+| http://people.apache.org/map.html?jlaskowski[map]
+
+| link:mailto:jlmonteiro@apache.org[Jean-Louis Monteiro]
+| Committer, PMC
+| http://people.apache.org/~jlmonteiro[jlmonteiro]
+| http://people.apache.org/map.html?jlmonteiro[map]
+
+| link:mailto:jvanzyl@apache.org[Jason van Zyl]
+| Committer
+| http://people.apache.org/~jvanzyl[jvanzyl]
+| http://people.apache.org/map.html?jvanzyl[map]
+
+| link:mailto:jwhitlock@apache.org[Jeremy Whitlock]
+| Committer
+| http://people.apache.org/~jwhitlock[jwhitlock]
+| http://people.apache.org/map.html?jwhitlock[map]
+
+| link:mailto:kevan@apache.org[Kevan Lee Miller]
+| Committer, PMC
+| http://people.apache.org/~kevan[kevan]
+| http://people.apache.org/map.html?kevan[map]
+
+| link:mailto:kmalhi@apache.org[Karan Singh Malhi]
+| Committer
+| http://people.apache.org/~kmalhi[kmalhi]
+| http://people.apache.org/map.html?kmalhi[map]
+
+| link:mailto:lajos@apache.org[Lajos Moczar]
+| Committer
+| http://people.apache.org/~lajos[lajos]
+| http://people.apache.org/map.html?lajos[map]
+
+| link:mailto:manugeorge@apache.org[Manu George]
+| Committer
+| http://people.apache.org/~manugeorge[manugeorge]
+| http://people.apache.org/map.html?manugeorge[map]
+
+| link:mailto:struberg@apache.org[Mark Struberg]
+| Committer, PMC
+| http://people.apache.org/~struberg[struberg]
+| http://people.apache.org/map.html?struberg[map]
+
+| link:mailto:mnour@apache.org[Mohammad Nour El-Din]
+| Committer
+| http://people.apache.org/~mnour[mnour]
+| http://people.apache.org/map.html?mnour[map]
+
+| link:mailto:rickmcguire@apache.org[Richard McGuire]
+| Committer
+| http://people.apache.org/~rickmcguire[rickmcguire]
+| http://people.apache.org/map.html?rickmcguire[map]
+
+| link:mailto:rmannibucau@apache.org[Romain Manni-Bucau]
+| Committer
+| http://people.apache.org/~rmannibucau[rmannibucau]
+| http://people.apache.org/map.html?rmannibucau[map]
+
+| link:mailto:tveronezi@apache.org[Thiago Veronezi]
+| Committer
+| http://people.apache.org/~tveronezi[tveronezi]
+| http://people.apache.org/map.html?tveronezi[map]
+
+| link:mailto:xuhaihong@apache.org[Haihong Xu]
+| Committer
+| http://people.apache.org/~xuhaihong[xuhaihong]
+| http://people.apache.org/map.html?xuhaihong[map]
+|===
diff --git a/src/main/jbake/content/contribute.md b/src/main/jbake/content/contribute.md
deleted file mode 100644
index f6f3495..0000000
--- a/src/main/jbake/content/contribute.md
+++ /dev/null
@@ -1,199 +0,0 @@
-Title: Contributing
-
-Contributing to the project is a great way to support the community.  Some great links for getting involved
-
-- [Source Code](dev/source-code.html)
-- [Contribution Tips](dev/contribution-tips.html)
-- [Developer Documentation](dev/index.html)
-
-###Contributing doesn't always mean code.
-If you love the project and want to see it grow, follow it on Facebook and Twitter.
-
-- [http://twitter.com/ApacheTomEE](http://twitter.com/ApacheTomEE)
-- [http://facebook.com/ApacheTomEE](http://facebook.com/ApacheTomEE)
-- [https://plus.google.com/118203123063829126066](https://plus.google.com/118203123063829126066)
-
-The more people we reach the more the project grows.
-
- - Become an active retweeter  
-   <a onclick="javascript:twshare()" class="tw-share sprite" title="share on Twitter">share [tw]</a>
- - Share pages you like on Facebook  
-   <a onclick="javascript:fbshare()" class="fb-share sprite" title="share on Facebook">share [fb]</a>
- - Share pages you like on Google+  
-   <a onclick="javascript:gpshare()" class="gp-share sprite" title="share on Google+">share [gp]</a>
- - Share pages you like on Pinterest  
-   <a onclick="javascript:pinshare()" class="pin-share sprite" title="Share on Pinterest">share [pin]</a>
-
-Doing these things as often as possible are simple and powerful ways to help.  Do your part and watch the project grow grow grow!
-
-###Edit This Site
-Top right, next to the Twitter symbol, there is an edit symbol <a data-toggle="modal" href="#edit" class="edit-page" title="Contribute to this Page">contribute</a>. Most of the pages on this site can be edited by you. If you find a spelling mistake, or just want to improve the documentation then please do!
-
-If you want to edit the [Examples Documentation](examples-trunk/index.html) then check-out the [Source Code](dev/source-code.html) and edit or create the README.md in the example directory you want to improve.
-
-###Committers
-
-<TABLE><TBODY>
-<TR>
-<TD> <A href="mailto:adc@apache.org" rel="nofollow">Alan Cabrera</A> </TD>
-<TD> Committer, PMC </TD>
-<TD> <A href="http://people.apache.org/~adc" rel="nofollow">adc</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?adc" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:ammulder@apache.org" rel="nofollow">Aaron Mulder</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~ammulder" rel="nofollow">ammulder</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?ammulder" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:andygumbrecht@apache.org" rel="nofollow">Andrew Gumbrecht</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~andygumbrecht" rel="nofollow">andygumbrecht</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?andygumbrecht" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:dain@apache.org" rel="nofollow">Dain Sundstrom</A> </TD>
-<TD> Committer, PMC </TD>
-<TD> <A href="http://people.apache.org/~dain" rel="nofollow">dain</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?dain" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:dblevins@apache.org" rel="nofollow">David Blevins</A> </TD>
-<TD> Founder, Chair </TD>
-<TD> <A href="http://people.apache.org/~dblevins" rel="nofollow">dblevins</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?dblevins" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:djencks@apache.org" rel="nofollow">David Jencks</A> </TD>
-<TD> Committer, PMC </TD>
-<TD> <A href="http://people.apache.org/~djencks" rel="nofollow">djencks</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?djencks" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:dsh@apache.org" rel="nofollow">Daniel Stefan Haischt</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~dsh" rel="nofollow">dsh</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?dsh" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:gawor@apache.org" rel="nofollow">Jarek Gawor</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~gawor" rel="nofollow">gawor</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?gawor" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:gdamour@apache.org" rel="nofollow">Gianny Damour</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~gdamour" rel="nofollow">gdamour</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?gdamour" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:genspring@apache.org" rel="nofollow">Lin Quan Jiang</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~genspring" rel="nofollow">genspring</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?genspring" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:hogstrom@apache.org" rel="nofollow">Matt Richard Hogstrom</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~hogstrom" rel="nofollow">hogstrom</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?hogstrom" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:jgallimore@apache.org" rel="nofollow">Jonathan Gallimore</A> </TD>
-<TD> Committer, PMC </TD>
-<TD> <A href="http://people.apache.org/~jgallimore" rel="nofollow">jgallimore</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?jgallimore" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:jgenender@apache.org" rel="nofollow">Jeff Genender</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~jgenender" rel="nofollow">jgenender</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?jgenender" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:jlaskowski@apache.org" rel="nofollow">Jacek Laskowski</A> </TD>
-<TD> Committer, PMC </TD>
-<TD> <A href="http://people.apache.org/~jlaskowski" rel="nofollow">jlaskowski</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?jlaskowski" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:jlmonteiro@apache.org" rel="nofollow">Jean-Louis Monteiro</A> </TD>
-<TD> Committer, PMC </TD>
-<TD> <A href="http://people.apache.org/~jlmonteiro" rel="nofollow">jlmonteiro</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?jlmonteiro" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:jvanzyl@apache.org" rel="nofollow">Jason van Zyl</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~jvanzyl" rel="nofollow">jvanzyl</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?jvanzyl" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:jwhitlock@apache.org" rel="nofollow">Jeremy Whitlock</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~jwhitlock" rel="nofollow">jwhitlock</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?jwhitlock" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:kevan@apache.org" rel="nofollow">Kevan Lee Miller</A> </TD>
-<TD> Committer, PMC </TD>
-<TD> <A href="http://people.apache.org/~kevan" rel="nofollow">kevan</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?kevan" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:kmalhi@apache.org" rel="nofollow">Karan Singh Malhi</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~kmalhi" rel="nofollow">kmalhi</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?kmalhi" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:lajos@apache.org" rel="nofollow">Lajos Moczar</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~lajos" rel="nofollow">lajos</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?lajos" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:manugeorge@apache.org" rel="nofollow">Manu George</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~manugeorge" rel="nofollow">manugeorge</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?manugeorge" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:struberg@apache.org" rel="nofollow">Mark Struberg</A> </TD>
-<TD> Committer, PMC </TD>
-<TD> <A href="http://people.apache.org/~struberg" rel="nofollow">struberg</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?struberg" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:mnour@apache.org" rel="nofollow">Mohammad Nour El-Din</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~mnour" rel="nofollow">mnour</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?mnour" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:rickmcguire@apache.org" rel="nofollow">Richard McGuire</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~rickmcguire" rel="nofollow">rickmcguire</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?rickmcguire" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:rmannibucau@apache.org" rel="nofollow">Romain Manni-Bucau</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~rmannibucau" rel="nofollow">rmannibucau</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?rmannibucau" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:tveronezi@apache.org" rel="nofollow">Thiago Veronezi</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~tveronezi" rel="nofollow">tveronezi</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?tveronezi" rel="nofollow">map</A></TD>
-</TR>
-<TR>
-<TD> <A href="mailto:xuhaihong@apache.org" rel="nofollow">Haihong Xu</A> </TD>
-<TD> Committer </TD>
-<TD> <A href="http://people.apache.org/~xuhaihong" rel="nofollow">xuhaihong</A> </TD>
-<TD> <A href="http://people.apache.org/map.html?xuhaihong" rel="nofollow">map</A></TD>
-</TR>
-</TBODY></TABLE>
diff --git a/src/main/jbake/content/dev/april2008.adoc b/src/main/jbake/content/dev/april2008.adoc
new file mode 100644
index 0000000..4bb87d9
--- /dev/null
+++ b/src/main/jbake/content/dev/april2008.adoc
@@ -0,0 +1,21 @@
+= April 2008
+:jbake-type: page
+:jbake-status: published
+
+The highlight of early February was the release of OpenEJB 3.0 beta 2 which was very well received and triggered another small increase in overall users@openejb.a.o traffic.
+
+We've also seen some encouraging growth signs we haven't seen for quite a while: users answering each other's questions;
+first time posters saying "we've added this feature, do you want it?";
+more questions answerable with documentation links;
+random new faces on IRC.
+
+Work on OpenEJB 3.0 final began towards the end of February with the first binaries up for vote on March 11th.
+Some wonderful feedback on both the dev and users list revealed some critical technical issues with those binaries and the vote was cancelled so that the issues could be fixed.
+Several members of the community went the extra mile to help get issues fixed and the release out the door.
+After steady stream of bug fixes, legal file maintenance, and a few more aborted votes, the long anticipated OpenEJB 3.0 Final was released April 12th.
+The binaries proposed a month prior pale in comparison to the binaries eventually released and we are all very pleased with the quality of the 3.0 final.
+We are very excited to see what kind of a splash 3.0 will make and expect a 3.0.1 will be required soon.
+
+The work contributor Jonathan Gallimore has been doing with an OpenEJB Eclipse plugin has taken root with other developers in the community and development naturally changed from code drops to frequent patches and discussion.
+A big thank you to committer Daniel Haischt for contributing to the Eclipse plugin and giving Jonathan someone to work with and the opportunity to demonstrate his collaborative skills.
+A bigger thank you to Jonathan for his patience.
diff --git a/src/main/jbake/content/dev/april2008.md b/src/main/jbake/content/dev/april2008.md
deleted file mode 100644
index 74bdffa..0000000
--- a/src/main/jbake/content/dev/april2008.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Title: April2008
-The highlight of early February was the release of OpenEJB 3.0 beta 2 which
-was very well received and triggered another small increase in overall
-users@openejb.a.o traffic.  We've also seen some encouraging growth signs
-we haven't seen for quite a while: users answering each other's questions;
-first time posters saying "we've added this feature, do you want it?"; more
-questions answerable with documentation links; random new faces on IRC.
-
-Work on OpenEJB 3.0 final began towards the end of February with the first
-binaries up for vote on March 11th.  Some wonderful feedback on both the
-dev and users list revealed some critical technical issues with those
-binaries and the vote was cancelled so that the issues could be fixed. 
-Several members of the community went the extra mile to help get issues
-fixed and the release out the door.  After steady stream of bug fixes,
-legal file maintenance, and a few more aborted votes, the long anticipated
-OpenEJB 3.0 Final was released April 12th.  The binaries proposed a month
-prior pale in comparison to the binaries eventually released and we are all
-very pleased with the quality of the 3.0 final.  We are very excited to see
-what kind of a splash 3.0 will make and expect a 3.0.1 will be required
-soon.
-
-The work contributor Jonathan Gallimore has been doing with an OpenEJB
-Eclipse plugin has taken root with other developers in the community and
-development naturally changed from code drops to frequent patches and
-discussion.  A big thank you to committer Daniel Haischt for contributing
-to the Eclipse plugin and giving Jonathan someone to work with and the
-opportunity to demonstrate his collaborative skills.  A bigger thank you to
-Jonathan for his patience.
-
-
-
diff --git a/src/main/jbake/content/dev/april2009.adoc b/src/main/jbake/content/dev/april2009.adoc
new file mode 100644
index 0000000..c75425b
--- /dev/null
+++ b/src/main/jbake/content/dev/april2009.adoc
@@ -0,0 +1,28 @@
+= April 2009
+:jbake-type: page
+:jbake-status: published
+
+A patch release of OpenEJB 3.0 (3.0.1) was released with fixes aimed to support the Geronimo 2.1.4 release.
+Talk has started on a release of the current 3.1 branch (to be OpenEJB 3.1.1), which already contains several fixes and improvements over the 3.1 version released in November.
+
+List traffic has continued to increase.
+In Q1 2008 traffic averaged 63 messages per month.
+In Q1 2009 the average is 133 per month.
+This resulted in occasional delays in response times due to bursts of requests.
+At a particularly heavier burst one user complained in an email titled, "Thank you for not supporting me in any way."  This proved to be an overall positive event as it provided an opportunity to reset expectations, get everyone behind the project, and resulted in a generous increase of participation from users and committers alikelink:1.html[1] .  Ultimately it was just what we needed.
+
+Jean-Louis Monteiro has been contributing some good patches and time on the user list and proving to be a good potential committer.
+His activity is primarily around web services which is one area where can certainly use the expertise.
+His participation is greatly appreciated and we look forward to continued contribution.
+
+Discussions have opened up with OpenWebBeans on providing them with the tools they need to support their own OpenEJB integration in efforts to complete the JSR-299 specification.
+The JSR-299 itself is currently very unstable and major changes to the core of the specification, requested by the Java EE 6 (JSR-316) EG, are planned to address overlap with other specifications like JSF and EJB.
+These will certainly provide some challenges as the specification is rebalanced.
+
+Several users have recently pointed out a possible incompatibly in regards to the handling of business remote interfaces also marked as a web service interface.
+The issue has been raised on the EJB 3.1 (JSR-318) EG.
+Regardless of the outcome, support for that feature is planned.
+
+link:1.html[1]
+
+http://mail-archives.apache.org/mod_mbox/openejb-users/200902.mbox/%3c98A91BE3-4ACC-4D86-AE19-4CD4A202E1CD@visi.com%3e
diff --git a/src/main/jbake/content/dev/april2009.md b/src/main/jbake/content/dev/april2009.md
deleted file mode 100644
index b2b3d26..0000000
--- a/src/main/jbake/content/dev/april2009.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Title: April2009
-A patch release of OpenEJB 3.0 (3.0.1) was released with fixes aimed to
-support the Geronimo 2.1.4 release.  Talk has started on a release of the
-current 3.1 branch (to be OpenEJB 3.1.1), which already contains several
-fixes and improvements over the 3.1 version released in November.
-
-List traffic has continued to increase.  In Q1 2008 traffic averaged 63 messages per month.  In Q1 2009 the average is 133 per month.  This resulted in occasional delays in response times due to bursts of requests.  At a particularly heavier burst one user complained in an email titled, "Thank you for not supporting me in any way."  This proved to be an overall positive event as it provided an opportunity to reset expectations, get everyone behind the project, and resulted in a generous increase of participation from users and committers alike[1](1.html)
-.  Ultimately it was just what we needed.
-
-Jean-Louis Monteiro has been contributing some good patches and time on the
-user list and proving to be a good potential committer.  His activity is
-primarily around web services which is one area where can certainly use the
-expertise.  His participation is greatly appreciated and we look forward to
-continued contribution.
-
-Discussions have opened up with OpenWebBeans on providing them with the
-tools they need to support their own OpenEJB integration in efforts to
-complete the JSR-299 specification.  The JSR-299 itself is currently very
-unstable and major changes to the core of the specification, requested by
-the Java EE 6 (JSR-316) EG, are planned to address overlap with other
-specifications like JSF and EJB.  These will certainly provide some
-challenges as the specification is rebalanced.
-
-Several users have recently pointed out a possible incompatibly in regards
-to the handling of business remote interfaces also marked as a web service
-interface.  The issue has been raised on the EJB 3.1 (JSR-318) EG. 
-Regardless of the outcome, support for that feature is planned.
-
-[1](1.html)
-
-http://mail-archives.apache.org/mod_mbox/openejb-users/200902.mbox/%3c98A91BE3-4ACC-4D86-AE19-4CD4A202E1CD@visi.com%3e
-
diff --git a/src/main/jbake/content/dev/arquillian-test-porting-initiative.adoc b/src/main/jbake/content/dev/arquillian-test-porting-initiative.adoc
new file mode 100644
index 0000000..678ef4c
--- /dev/null
+++ b/src/main/jbake/content/dev/arquillian-test-porting-initiative.adoc
@@ -0,0 +1,90 @@
+= Arquillian Test Porting Initiative
+:jbake-type: page
+:jbake-status: published
+
+First things, first.
+You can contribute your ideas by clicking the blue pencile icon in the upper right.
+Edit this page and help shape the initiative!
+
+== Unite the Armies to fight the Bugs!
+
+Testing is the most crucial part of any project.
+A project that incorporates as much functionality as TomEE does needs a _lot_ of tests.
+
+There's a saying that if it isn't documented it doesn't exist.
+Likely more true is that if it isn't tested it it might as well not exist, documentation or not.
+
+The simple truth is many of the critical tests that apply to functionality in TomEE actuall exist, but are spread across the numberous projects that TomEE incorporates.
+Just as TomEE is about unifying and integrating all these projects together, the same vision and initative must be given into unifying and integrating all these tests.
+
+If we could port them all to a common testing framework like Arquillian and consolidate them all into one codebase, the result would be nothing short of a marvel.
+An unparalleled feat.
+
+Such a thing has never been done at the ASF.
+Be ready to blaze some trails and be a pioneer.
+
+== The Kingdoms
+
+There are far more than 3,000 test classes we could port across the various projects, each using it's own flavor of home-made setup code.
+The coverage is also not what you'd expect.
+
+* Activemq 1281
+* CXF 979
+* TomEE 802
+* OpenEJB 215
+* MyFaces 171
+* OpenWebBeans 165
+* Bval 56
+* OpenJPA 33
+* Tomcat 20
+
+The above results are no dount eye-opening.
+In all fairness, the projects with so few test are not as "untested" as they appear, they simply rely more heavily on the proprietary Java EE TCK which is closed source.
+This is adequate, but not fantastic.
+*An open source project should have open tests.*
+
+== Generals Needed
+
+This is no small feet.
+With over 3,000 tests porting them all is not realistc.
+If we had 10 people working full time, that's till 300 tests each person would need to port.
+This simply is not realistic.
+More realistic would be for a person to port say 10 tests before they get an injury and need to leave the battlefield with hopes of joining the glorious fight another day -- aka.
+they get busy :)
+
+Even with 300 people each contributing 10 tests each, it's still quite a lot of patches for a small team to apply.
+Organizing 300 people and shaping an initiative like this is als no small feat.
+What we need are Generals.
+Individuals to survey the land and plan attacks with small groups of soldiers.
+
+Porting 50 tests yourself is impressive.
+Leading the charge on 500 tests being ported is astonishing.
+
+== Early stage
+
+The tests in question are located more or less here:
+
+* svn co http://svn.apache.org/repos/asf/activemq/trunk
+* svn co http://svn.apache.org/repos/asf/bval/trunk
+* svn co http://svn.apache.org/repos/asf/cxf/trunk
+* svn co http://svn.apache.org/repos/asf/myfaces/core/trunk
+* svn co http://svn.apache.org/repos/asf/tomee/tomee/trunk/itests
+* svn co http://svn.apache.org/repos/asf/openjpa/branches/2.2.x
+* svn co http://svn.apache.org/repos/asf/openwebbeans/trunk
+* svn co http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk
+
+While not part of TomEE, Wink has some wonderful JAX-RS tests we could use:
+
+* svn co http://svn.apache.org/repos/asf/wink/trunk
+
+At this stage there's still quite a lot of information needed to mobilize the troops.
+How to write Arquillian tests, which tests are most important, how should they be divided?
+
+The call goes out to all you would-be Generals!
+
+Any mode of cooperation is acceptable.
+Discussions on the `dev (at) tomee.apache.org` list welcome.
+This document can be edited by anyone.
+As well there's a JIRA we can use to move the discussion along:
+
+* https://issues.apache.org/jira/browse/TOMEE-746
diff --git a/src/main/jbake/content/dev/arquillian-test-porting-initiative.md b/src/main/jbake/content/dev/arquillian-test-porting-initiative.md
deleted file mode 100644
index ed3e44b..0000000
--- a/src/main/jbake/content/dev/arquillian-test-porting-initiative.md
+++ /dev/null
@@ -1,76 +0,0 @@
-Title: Arquillian Test Porting Initiative
-
-First things, first.  You can contribute your ideas by clicking the blue pencile icon in the upper right.  Edit this page and help shape the initiative!
-
-# Unite the Armies to fight the Bugs!
-
-Testing is the most crucial part of any project.  A project that incorporates as much functionality as TomEE does needs a *lot* of tests.
-
-There's a saying that if it isn't documented it doesn't exist.  Likely more true is that if it isn't tested it it might as well not exist,
-documentation or not.
-
-The simple truth is many of the critical tests that apply to functionality in TomEE actuall exist, but are spread across the numberous projects
-that TomEE incorporates.  Just as TomEE is about unifying and integrating all these projects together, the same vision and initative
-must be given into unifying and integrating all these tests.
-
-If we could port them all to a common testing framework like Arquillian and consolidate them all into one codebase, the result would be nothing short
-of a marvel.  An unparalleled feat.
-
-Such a thing has never been done at the ASF.  Be ready to blaze some trails and be a pioneer.
-
-# The Kingdoms
-
-There are far more than 3,000 test classes we could port across the various projects, each using it's own flavor of home-made setup code.
-The coverage is also not what you'd expect.
-
- - Activemq 1281
- - CXF 979
- - TomEE 802
- - OpenEJB 215
- - MyFaces 171
- - OpenWebBeans 165
- - Bval 56
- - OpenJPA 33
- - Tomcat 20
-
-The above results are no dount eye-opening.  In all fairness, the projects with so few test are not as "untested" as they appear, they simply rely more heavily
-on the proprietary Java EE TCK which is closed source.  This is adequate, but not fantastic.  **An open source project should have open tests.**
-
-# Generals Needed
-
-This is no small feet.  With over 3,000 tests porting them all is not realistc.  If we had 10 people working full time, that's till 300 tests each person
-would need to port.  This simply is not realistic.  More realistic would be for a person to port say 10 tests before they get an injury and need to leave the
-battlefield with hopes of joining the glorious fight another day -- aka. they get busy :)
-
-Even with 300 people each contributing 10 tests each, it's still quite a lot of patches for a small team to apply.  Organizing 300 people and shaping an initiative
-like this is als no small feat.  What we need are Generals.  Individuals to survey the land and plan attacks with small groups of soldiers.
-
-Porting 50 tests yourself is impressive.  Leading the charge on 500 tests being ported is astonishing.
-
-# Early stage
-
-The tests in question are located more or less here:
-
- - svn co http://svn.apache.org/repos/asf/activemq/trunk
- - svn co http://svn.apache.org/repos/asf/bval/trunk
- - svn co http://svn.apache.org/repos/asf/cxf/trunk
- - svn co http://svn.apache.org/repos/asf/myfaces/core/trunk
- - svn co http://svn.apache.org/repos/asf/tomee/tomee/trunk/itests
- - svn co http://svn.apache.org/repos/asf/openjpa/branches/2.2.x
- - svn co http://svn.apache.org/repos/asf/openwebbeans/trunk
- - svn co http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk
-
-While not part of TomEE, Wink has some wonderful JAX-RS tests we could use:
-
- - svn co http://svn.apache.org/repos/asf/wink/trunk
-
-At this stage there's still quite a lot of information needed to mobilize the troops.  How to write Arquillian tests, which tests are most important, how should
-they be divided?
-
-The call goes out to all you would-be Generals!
-
-Any mode of cooperation is acceptable.  Discussions on the `dev (at) tomee.apache.org` list welcome.  This document can be edited by anyone.  As well there's a
-JIRA we can use to move the discussion along:
-
- - https://issues.apache.org/jira/browse/TOMEE-746
-
diff --git a/src/main/jbake/content/dev/asf.adoc b/src/main/jbake/content/dev/asf.adoc
new file mode 100644
index 0000000..ca40c44
--- /dev/null
+++ b/src/main/jbake/content/dev/asf.adoc
@@ -0,0 +1,34 @@
+= ASF ASF Board meetings are the third Wednesday of each month:
+:jbake-type: page
+:jbake-status: published
+
+Reports must be filed monthly for the first three months after Incubation:
+
+* xref:june2007.adoc[June 18, 2007]
+* xref:july2007.adoc[July 16, 2007]
+* xref:august2007.adoc[August 13, 2007]
+
+Then quarterly after that starting the month after:
+
+* xref:october2007.adoc[October 15, 2007]
+* xref:january2008.adoc[January 14, 2008]
+* xref:april2008.adoc[April 14, 2008]
+* xref:july2008.adoc[July 14, 2008]
+* xref:october2008.adoc[October 13, 2008]
+
+NOTE: january2009 is missing
+
+* xref:january2009.adoc[January 19, 2009]
+* xref:april2009.adoc[April 13, 2009]
+* xref:july2009.adoc[July 13, 2009]
+* xref:october2009.adoc[October 21, 2009]
+* xref:january2010.adoc[January 20, 2010]
+
+NOTE: april2010 is missing
+
+* xref:april2010.adoc[April 21, 2010]
+* xref:july2010.adoc[July 21, 2010]
+
+NOTE: october2010 is missing
+
+* xref:october2010.adoc[October 20, 2010]
diff --git a/src/main/jbake/content/dev/asf.md b/src/main/jbake/content/dev/asf.md
deleted file mode 100644
index f8fab48..0000000
--- a/src/main/jbake/content/dev/asf.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Title: ASF
-ASF Board meetings are the third Wednesday of each month:
-
-Reports must be filed monthly for the first three months after Incubation:
-
- - [June 18, 2007](june2007.html)
- - [July 16, 2007](july2007.html)
- - [August 13, 2007](august2007.html)
-
-Then quarterly after that starting the month after:
-
- - [October 15, 2007](october2007.html)
- - [January 14, 2008](january2008.html)
- - [April 14, 2008](april2008.html)
- - [July 14, 2008](july2008.html)
- - [October 13, 2008](october2008.html)
- - [January 19, 2009](january2009.html)
- - [April 13, 2009](april2009.html)
- - [July 13, 2009](july2009.html)
- - [October 21, 2009](october2009.html)
- - [January 20, 2010](january2010.html)
- - [April 21, 2010](april2010.html)
- - [July 21, 2010](july2010.html)
- - [October 20, 2010](october2010.html)
diff --git a/src/main/jbake/content/dev/august2007.adoc b/src/main/jbake/content/dev/august2007.adoc
new file mode 100644
index 0000000..b361473
--- /dev/null
+++ b/src/main/jbake/content/dev/august2007.adoc
@@ -0,0 +1,17 @@
+= August2007
+:jbake-type: page
+:jbake-status: published
+
+Work on the OpenEJB 3.0 release is coming to a close.
+Documentation remains the largest outstanding item.
+A complete audit of all documentation was completed and concrete steps to improve it were detailed.
+Progress on updating the out-of-date documentation has already been made.
+
+The usability of the codebase has matured significantly through many contributions from the community and very little remains to be completed in that regard.
+
+Developer activity is up.
+We are delighted to have voted in a dedicated contributor, Karan Malhi, as a new committer and he has proudly excepted.
+No CLA is on file yet.
+
+User list activity overall remains low, though some new faces have started to pop up whom we are hoping can provide us with some good pre-release feedback.
+We hoping to see a measurable increase in user list activity post release.
diff --git a/src/main/jbake/content/dev/august2007.md b/src/main/jbake/content/dev/august2007.md
deleted file mode 100644
index fa8753e..0000000
--- a/src/main/jbake/content/dev/august2007.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Title: August2007
-Work on the OpenEJB 3.0 release is coming to a close. Documentation remains
-the largest outstanding item. A complete audit of all documentation was
-completed and concrete steps to improve it were detailed.  Progress on
-updating the out-of-date documentation has already been made.
-
-The usability of the codebase has matured significantly through many
-contributions from the community and very little remains to be completed in
-that regard.
-
-Developer activity is up. We are delighted to have voted in a dedicated
-contributor, Karan Malhi, as a new committer and he has proudly excepted.
-No CLA is on file yet.
-
-User list activity overall remains low, though some new faces have started
-to pop up whom we are hoping can provide us with some good pre-release
-feedback.  We hoping to see a measurable increase in user list activity
-post release.
diff --git a/src/main/jbake/content/dev/building-from-source.adoc b/src/main/jbake/content/dev/building-from-source.adoc
new file mode 100644
index 0000000..d06fecf
--- /dev/null
+++ b/src/main/jbake/content/dev/building-from-source.adoc
@@ -0,0 +1,31 @@
+= Building from source
+:jbake-type: page
+:jbake-status: published
+
+== Building from source
+
+=== Checking out the source
+
+To checkout the source, run this command with your subversion client.
+
+   svn checkout https://svn.apache.org/repos/asf/openejb/trunk/openejb-eclipse-plugin openejb-eclipse-plugin
+
+=== Building the source
+
+To build the plugin you will need Maven (the build has been tested with Maven 2.0.7).
+To run the build, issue this command
+
+   mvn -Dassemble clean install
+
+You should be aware that this will download any dependencies, including a copy of Eclipse.
+This will take a while for your first build.
+
+=== Importing the plugin code into an Eclipse workspace
+
+You can generate the Eclipse projects for the plugins by running the following command
+
+   mvn eclipse:clean eclipse:eclipse
+
+You can add the M2_REPO classpath variable to your Eclipse workspace by running the following command
+
+   mvn -Declipse.workspace=<path-to-eclipse-workspace> eclipse:add-maven-repo
diff --git a/src/main/jbake/content/dev/building-from-source.md b/src/main/jbake/content/dev/building-from-source.md
deleted file mode 100644
index b6c28f4..0000000
--- a/src/main/jbake/content/dev/building-from-source.md
+++ /dev/null
@@ -1,44 +0,0 @@
-Title: Building from source
-<a name="Buildingfromsource-Buildingfromsource"></a>
-# Building from source
-
-<a name="Buildingfromsource-Checkingoutthesource"></a>
-### Checking out the source
-
-To checkout the source, run this command with your subversion client.
-
-
-      svn checkout
-https://svn.apache.org/repos/asf/openejb/trunk/openejb-eclipse-plugin
-openejb-eclipse-plugin
-
-
-<a name="Buildingfromsource-Buildingthesource"></a>
-### Building the source
-
-To build the plugin you will need Maven (the build has been tested with
-Maven 2.0.7). To run the build, issue this command
-
-      mvn -Dassemble clean install
-
-
-You should be aware that this will download any dependencies, including a
-copy of Eclipse. This will take a while for your first build.
-
-<a name="Buildingfromsource-ImportingtheplugincodeintoanEclipseworkspace"></a>
-### Importing the plugin code into an Eclipse workspace
-
-You can generate the Eclipse projects for the plugins by running the
-following command
-
-
-      mvn eclipse:clean eclipse:eclipse
-
-
-You can add the M2_REPO classpath variable to your Eclipse workspace by
-running the following command
-
-
-      mvn -Declipse.workspace=<path-to-eclipse-workspace>
-eclipse:add-maven-repo
-
diff --git a/src/main/jbake/content/dev/cdi-tck-webappsdeployer.adoc b/src/main/jbake/content/dev/cdi-tck-webappsdeployer.adoc
new file mode 100644
index 0000000..e968c97
--- /dev/null
+++ b/src/main/jbake/content/dev/cdi-tck-webappsdeployer.adoc
@@ -0,0 +1,271 @@
+= CDI TCK status with webapps deployer
+:jbake-type: page
+:jbake-status: published
+
+To run the TCK with the webapps/ directory deployer:
+
+ cd openejb/tck/cdi-tomee/
+ mvn clean install -Pwebapp-deployer
+
+See https://issues.apache.org/jira/browse/TOMEE-37[TOMEE-37]
+
+The easiest way to run just one test is to update the `src/test/resources/passing.xml` file like so:
+
+ <?xml version="1.0" encoding="UTF-8"?>
+ <suite name="CDI TCK" verbose="0">
+   <test name="CDI TCK">
+     <classes>
+       <class name="org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest"/>
+     </classes>
+   </test>
+ </suite>
+
+You can enable remote debugging for the server with the following property:
+
+ mvn clean install -Pwebapp-deployer -Dopenejb.server.debug=true
+
+The default port is `5005`.
+That can be changed as well:
+
+ mvn clean install -Pwebapp-deployer -Dopenejb.server.debug=true -Dserver.debug.port=5001
+
+== Possible issues in the server
+
+* testBeanWithNameJavaxEnterpriseContextConversation(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/builtin.jsf
+* testBeanWithRequestScope(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/builtin.jsf
+* testBeginAlreadyLongRunningConversationThrowsException(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
+* testConversationActiveDuringNonFacesRequest(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cloud.jsf
+* testConversationBeginMakesConversationLongRunning(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
+* testConversationEndMakesConversationTransient(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
+* testConversationHasDefaultTimeout(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
+* testConversationIdMayBeSetByApplication(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
+* testConversationIdMayBeSetByContainer(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
+* testConversationIdSetByContainerIsUnique(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/storm.jsf
+* testConversationsDontCrossSessionBoundary1(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest)
+* testConversationsDontCrossSessionBoundary2(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/rain.jsf
+* testEndTransientConversationThrowsException(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
+* testLongRunningConversationInstancesNotDestroyedAtRequestEnd(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/storm.jsf
+* testSetConversationTimeoutOverride(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
+* testTransientConversationHasNullId(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/builtin.jsf
+* testTransientConversationInstancesDestroyedAtRequestEnd(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cloud.jsf
+* testInvalidatingSessionDestroysConversation(org.jboss.jsr299.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest/clouds.jsf
+* testConversationPropagated(org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest/storm.jsf
+* testConversationPropagatedOverRedirect(org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest/storm.jsf
+* testManualCidPropagation(org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest/storm.jsf
+* testRequestScopeActiveDuringCallToEjbTimeoutMethod(org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest): Error launching test org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest/?outputMode=serializedObject&methodName=testRequestScopeActiveDuringCallToEjbTimeoutMethod.
+Kept on getting 404s.
+* testRequestScopeDestroyedAfterCallToEjbTimeoutMethod(org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest): Error launching test org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest/?outputMode=serializedObject&methodName=testRequestScopeDestroyedAfterCallToEjbTimeoutMethod.
+Kept on getting 404s.
+* testScopeTypeDeclaredInheritedIsIndirectlyInherited(org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest): Error launching test org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest/?outputMode=serializedObject&methodName=testScopeTypeDeclaredInheritedIsIndirectlyInherited.
+Kept on getting 404s.
+* testScopeTypeDeclaredInheritedIsInherited(org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest): Error launching test org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest/?outputMode=serializedObject&methodName=testScopeTypeDeclaredInheritedIsInherited.
+Kept on getting 404s.
+* testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited(org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest): Error launching test org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest/?outputMode=serializedObject&methodName=testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited.
+Kept on getting 404s.
+* testScopeTypeNotDeclaredInheritedIsNotInherited(org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest): Error launching test org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest/?outputMode=serializedObject&methodName=testScopeTypeNotDeclaredInheritedIsNotInherited.
+Kept on getting 404s.
+* testStereotypeDeclaredInheritedIsIndirectlyInherited(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
+* testStereotypeDeclaredInheritedIsInherited(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
+* testStereotypeNotDeclaredInheritedIsNotIndirectlyInherited(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
+* testStereotypeNotDeclaredInheritedIsNotInherited(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
+* testStereotypeScopeIsOverriddenByIndirectlyInheritedScope(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
+* testStereotypeScopeIsOverriddenByInheritedScope(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
+* test(org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest)
+* testNonStaticObserverMethodIndirectlyInherited(org.jboss.jsr299.tck.tests.event.observer.enterprise.EnterpriseEventInheritenceTest)
+* testNonStaticObserverMethodInherited(org.jboss.jsr299.tck.tests.event.observer.enterprise.EnterpriseEventInheritenceTest)
+* testGetEJBName(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testGetSessionBeanType(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testProcessAnnotatedTypeFiredForSessionBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testProcessAnnotatedTypeFiredForSessionBeanInterceptor(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testProcessInjectionTargetFiredForManagedBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testProcessInjectionTargetFiredForSessionBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testProcessInjectionTargetFiredForSessionBeanInterceptor(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testProcessManagedBeanFired(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testProcessSessionBeanFiredForStatefulSessionBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testProcessSessionBeanFiredForStatelessSessionBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testTypeOfProcessInjectionTargetParameter(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
+* testProcessSessionBeanEvent(org.jboss.jsr299.tck.tests.extensions.processBean.ProcessSessionBeanTest)
+* testDefaultValidatorBean(org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest)
+* testDefaultValidatorFactoryBean(org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest)
+* testPrincipalBean(org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest)
+* testUserTransactionBean(org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest)
+* testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testBeanWithNamedAnnotation(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testBeanWithQualifiers(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testBeanWithScopeAnnotation(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testBeanWithStereotype(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testConstructorAnnotatedInjectCalled(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testDefaultName(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testEnterpriseBeanClassLocalView(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testObjectIsInAPITypes(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testRemoteInterfacesAreNotInAPITypes(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testSingletonWithApplicationScopeOK(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testSingletonWithDependentScopeOK(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testStatelessMustBeDependentScoped(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
+* testEjbDeclaredInXmlNotSimpleBean(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanViaXmlTest)
+* testCreateSLSB(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testDependentObjectsDestroyed(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testDestroyRemovesSFSB(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testDirectSubClassInheritsPostConstructOnSuperclass(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testIndirectSubClassInheritsPostConstructOnSuperclass(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testIndirectSubClassInheritsPreDestroyOnSuperclass(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testInitializerMethodsCalledWithCurrentParameterValues(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testRemovedEjbIgnored(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testSerializeSFSB(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testSubClassInheritsPreDestroyOnSuperclass(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
+* testNewBeanHasNoDisposalMethods(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest)
+* testNewBeanHasNoProducerMethods(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest)
+* testNewBeanHasSameConstructor(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest)
+* testNewBeanHasSameInitializers(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest)
+* testForEachEnterpriseBeanANewBeanExists(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
+* testNewBeanHasNoBeanELName(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
+* testNewBeanHasNoObservers(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
+* testNewBeanHasNoStereotypes(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
+* testNewBeanIsDependentScoped(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
+* testNewBeanIsHasOnlyNewBinding(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
+* testApplicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean(org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest):
+* testApplicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans(org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest)
+* testApplicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed(org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest)
+* testInitializerMethodNotABusinessMethod(org.jboss.jsr299.tck.tests.implementation.initializer.EjbInitializerMethodTest)
+* testBindingTypeOnInitializerParameter(org.jboss.jsr299.tck.tests.implementation.initializer.InitializerMethodTest)
+* testMultipleInitializerMethodsAreCalled(org.jboss.jsr299.tck.tests.implementation.initializer.InitializerMethodTest)
+* testStaticProducerField(org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise.EnterpriseProducerFieldDefinitionTest)
+* testNonStaticProducerMethodInheritedBySpecializingSubclass(org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest)
+* testNonStaticProducerMethodNotIndirectlyInherited(org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest)
+* testNonStaticProducerMethodNotInherited(org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest)
+* testConstructorHasDisposesParameter(org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter.ConstructorHasDisposesParameterTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testConstructorHasObservesParameter(org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter.ConstructorHasObservesParameterTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNonDependentScopedBeanCanNotHavePublicField(org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField.DependentWithPublicFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testTooManyInitializerAnnotatedConstructor(org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors.TooManyInitializerAnnotatedConstructorsTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNormalScopedUnproxyableBeanThrowsException(org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.unproxyable.UnproxyableManagedBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInjectionOfEjbs(org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest)
+* testPassivationOfEjbs(org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest)
+* testSpecializedBeanNotInstantiated(org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationIntegrationTest)
+* testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean(org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest)
+* testSpecializingBeanHasNameOfSpecializedBean(org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest)
+* testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding(org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder.SessionBeanInterceptorOrderTest)
+* testNonContextualSessionBeanReferenceIsIntercepted(org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest)
+* testSessionBeanIsIntercepted(org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.simpleInterception.SessionBeanInterceptorDefinitionTest)
+* testAnnotationMemberWithoutNonBinding(org.jboss.jsr299.tck.tests.lookup.binding.members.annotation.BindingAnnotationWithMemberTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testArrayMemberWithoutNonBinding(org.jboss.jsr299.tck.tests.lookup.binding.members.array.BindingAnnotationWithMemberTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testDuplicateNamedBeans(org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution.DuplicateNameResolutionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testDuplicateBeanNamePrefix(org.jboss.jsr299.tck.tests.lookup.byname.duplicatePrefixResolution.DuplicateNamePrefixResolutionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInjectionPointWithArrayType(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.array.ArrayTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedBean(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalClass.FinalClassTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testClassWithFinalMethodCannotBeProxied(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalMethod.FinalMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedBean(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.primitive.UnproxyableTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testClassWithPrivateConstructor(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.privateConstructor.PrivateConstructorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testELResolverRegisteredWithJsf(org.jboss.jsr299.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest/JSFTestPage.jsf
+* testInitializerCalledAfterFieldInjectionOfSuperclass(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionOrderingTest)
+* testInitializerCalledAfterResourceInjection(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionOrderingTest)
+* testPostConstructCalledAfterInitializerOfSuperclass(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionOrderingTest)
+* testFieldDeclaredInSuperclassIndirectlyInjected(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
+* testFieldDeclaredInSuperclassInjected(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
+* testInjectionOnContextualSessionBean(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
+* testInjectionOnEJBInterceptor(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
+* testInjectionOnNonContextualSessionBean(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
+* testInjectionIntoJSFManagedBean(org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest/ManagedBeanTestPage.jsf
+* testPrimitiveInjectionPointResolvesToNullableWebBean(org.jboss.jsr299.tck.tests.lookup.injection.nullableBean.NullableBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testBeanTypesOnSessionBean(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.EnterpriseResolutionByTypeTest)
+* testDecoratorNotResolved(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.decorator.DecoratorNotInjectedTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+
+== Issues likely with the deployer itself
+
+* testPassivationCapableBeanWithNonPassivatingDecoratorBeanConstructorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.DecoratorWithNonPassivatingInitializerMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testPassivationCapableBeanWithNonPassivatingDecoratorInjectedFieldFails(org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField.DecoratorWithNonPassivatingInjectedFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSessionBeanWithNonPassivatingBeanConstructorParamInInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor.EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSessionBeanWithNonPassivatingConstructorFieldInDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingConstructorFieldInDecorator.EnterpriseBeanWithNonPassivatingFieldInDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSessionBeanWithNonPassivatingInitializerFieldInDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator.EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSessionBeanWithNonPassivatingInitializerParamInInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor.EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSessionBeanWithNonPassivatingInjectedFieldInDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInDecorator.EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSessionBeanWithNonPassivatingInjectedFieldInInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor.EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testDependentBeanWithNonSerializableImplementationInStatefulSessionBeanInitializerFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonSerializableIntializerMethod.EnterpriseBeanWithNonSerializableIntializerMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNonPassivationCapableProducerFieldNotOk(org.jboss.jsr299.tck.tests.context.passivating.broken.finalProducerFieldNotPassivationCapable.NonPassivationCapableProducerFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testPassivationCapableBeanWithNonPassivatingInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter.PassivationCapableBeanWithNonPassivatingInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testPassivationCapableBeanWithNonPassivatingInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter.PassivationCapableBeanWithNonPassivatingInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testPassivationCapableBeanWithNonPassivatingInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField.PassivationCapableBeanWithNonPassivatingInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testManagedBeanWithNonPassivatingDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonPassivatingDecorator.ManagedBeanWithNonPassivatingDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testManagedBeanWithNonSerializableInterceptorClassNotOK(org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonSerializableInterceptorClass.ManagedBeanWithNonSerializableInterceptorClassTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSimpleWebBeanWithNonSerializableImplementationClassFails(org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableManagedBeanHasPassivatingScope.NonPassivationManagedBeanHasPassivatingScopeTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNonPassivationCapableProducerFieldNotOk(org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerField.NonPassivationCapableProducerFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNonPassivationCapableProducerMethodNotOk(org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod.NonPassivationCapableProducerMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoConstructorParameterOfWebBeanWithPassivatingScopeFails(org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingBeanConstructor.PassivatingManagedBeanWithNonPassivatingBeanConstructorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoInitializerParameterOfWebBeanWithPassivatingScopeFails(org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInitializerMethod.PassivatingManagedBeanWithNonPassivatingInitializerMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails(org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInjcetedField.PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails(org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter.PassivatingProducerMethodWithNonPassivatingParameterTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails(org.jboss.jsr299.tck.tests.context.passivating.broken.unserializableSimpleInjectedIntoPassivatingEnterpriseBean.UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testCustomDecoratorDecoratingFinalBean(org.jboss.jsr299.tck.tests.decorators.custom.broken.finalBeanClass.CustomDecoratorMatchingBeanWithFinalClassTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testDecoratorListedTwiceInBeansXmlNotOK(org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.DecoratorListedTwiceInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testEnabledDecoratorNotADecoratorTest(org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator.EnabledDecoratorNotADecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testAppliesToFinalManagedBeanClass(org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass.FinalBeanClassTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testAppliesToFinalMethodOnManagedBeanClass(org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod.FinalBeanMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testMultipleDelegateInjectionPoints(org.jboss.jsr299.tck.tests.decorators.definition.broken.multipleDelegateInjectionPoints.MultipleDelegateInjectionPointsTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNoDelegateInjectionPoints(org.jboss.jsr299.tck.tests.decorators.definition.broken.noDelegateInjectionPoints.NoDelegateInjectionPointsTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNonDecoratorWithDecoratesAnnotationNotOK(org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates.NonDecoratorWithDecoratesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNonExistantDecoratorClassInBeansXmlNotOK(org.jboss.jsr299.tck.tests.decorators.definition.broken.nonExistantClassInBeansXml.NonExistantDecoratorClassInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNotAllDecoratedTypesImplemented(org.jboss.jsr299.tck.tests.decorators.definition.broken.notAllDecoratedTypesImplemented.NotAllDecoratedTypesImplementedTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testDecoratorDelegateInjectionPoints(org.jboss.jsr299.tck.tests.decorators.definition.inject.broken.delegateProducerMethod.DelegateInjectionPointTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNonDependentGenericManagedBeanNotOk(org.jboss.jsr299.tck.tests.definition.bean.genericbroken.GenericManagedBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testTooManyScopesSpecifiedInJava(org.jboss.jsr299.tck.tests.definition.scope.broken.tooManyScopes.TooManyScopesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testStereotypeWithNonEmptyNamed(org.jboss.jsr299.tck.tests.definition.stereotype.broken.nonEmptyNamed.NonEmptyNamedTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testMultipleIncompatibleScopeStereotypes(org.jboss.jsr299.tck.tests.definition.stereotype.broken.scopeConflict.IncompatibleStereotypesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testStereotypeWithTooManyScopeTypes(org.jboss.jsr299.tck.tests.definition.stereotype.broken.tooManyScopes.TooManyScopeTypesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testObserverDefinitionErrorTreatedAsDefinitionError(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDefinitionError.AddDefinitionErrorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testObserverDeploymentProblemTreatedAsDeploymentError(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem.AddDeploymentProblemTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testThrowsException(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.beanDiscoveryMethodThrowsException.BeforeBeanDiscoveryThrowsExceptionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testObserverFailureTreatedAsDefinitionError(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver.AfterBeanDiscoveryObserverExecutionFailureTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testObserverFailureTreatedAsDeploymentError(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver.AfterDeploymentValidationObserverExecutionFailureTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testDeploymentFailsDuringValidation(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation.AfterBeanDiscoveryFailureTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testAddingScopeType(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.normalScope.AddingNormalScopeTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testAddingScopeType(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.passivatingScope.AddingPassivatingScopeTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testAnyAnnotationOnEventInjectionPointWithoutTypeParameterFails(org.jboss.jsr299.tck.tests.event.broken.inject.withoutType.EventInjectionWithoutTypeTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testDependentBeanWithConditionalObserverMethodIsDefinitionError(org.jboss.jsr299.tck.tests.event.broken.observer.dependentIsConditionalObserver.DependentIsConditionalObserverTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testObserverMethodWithDisposesParamFails(org.jboss.jsr299.tck.tests.event.broken.observer.isDisposer.ObserverMethodAnnotatedDisposesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testObserverMethodAnnotatedInitializerFails(org.jboss.jsr299.tck.tests.event.broken.observer.isInitializer.ObserverMethodAnnotatedInitialzerTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testObserverMethodAnnotatedProducesFails(org.jboss.jsr299.tck.tests.event.broken.observer.isProducer.ObserverMethodAnnotatedProducesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testObserverMethodMustHaveOnlyOneEventParameter(org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters.ObserverMethodWithTwoEventParametersTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testProcessAnnotatedTypeEventThrowsExceptionNotOk(org.jboss.jsr299.tck.tests.extensions.annotated.broken.processAnnotatedObserverThrowsException.ProcessAnnotatedTypeEventThrowsExceptionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testProcessInjectionTargetEventThrowsExceptionNotOk(org.jboss.jsr299.tck.tests.extensions.annotated.broken.processInjectionTargetThrowsException.ProcessInjectionTargetEventThrowsExceptionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testAddDefinitionError(org.jboss.jsr299.tck.tests.extensions.container.event.broken.processBeanObserverRegistersException.AddDefinitionErrorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testProcessBeanObserverThrowsException(org.jboss.jsr299.tck.tests.extensions.container.event.broken.processBeanObserverThrowsException.ThrowExceptionInProcessBeanObserverTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testAddDefinitionError(org.jboss.jsr299.tck.tests.extensions.observer.broken.definitionError.ProcessObserverMethodErrorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testExceptionIsDefinitionError(org.jboss.jsr299.tck.tests.extensions.observer.broken.exception.ProcessObserverMethodExceptionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testAddingDefinitionError(org.jboss.jsr299.tck.tests.extensions.producer.broken.injectionTargetError.InjectionTargetDefinitionErrorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInitializerUnallowed(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed.InitializerUnallowedDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testMultipleDisposeParameters(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams.MultipleDisposeParametersDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testObserverParameterUnallowed(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed.ObserverParameterUnallowedDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testProducesUnallowed(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed.ProducesUnallowedDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testUnresolvedDisposalMethod(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod.UnresolvedDisposalMethodDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInitializerMethodAnnotatedProduces(org.jboss.jsr299.tck.tests.implementation.initializer.broken.methodAnnotatedProduces.InitializerMethodAnnotatedProducesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInitializerMethodHasParameterAnnotatedDisposes(org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes.ParameterAnnotatedDisposesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInitializerMethodHasParameterAnnotatedObserves(org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves.ParameterAnnotatedObservesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testParameterizedReturnTypeWithWildcard(org.jboss.jsr299.tck.tests.implementation.producer.field.definition.broken.parameterizedReturnTypeWithWildcard.ParameterizedReturnTypeWithWildcardTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testProducerMethodWithParameterAnnotatedDisposes(org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedDisposes.ParameterAnnotatedDisposesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testProducerMethodWithParameterAnnotatedObserves(org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedObserves.ParameterAnnotatedObservesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testParameterizedType(org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter2.ParameterizedTypeWithTypeParameterTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testParameterizedReturnTypeWithWildcard(org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithWildcard.ParameterizedTypeWithWildcardTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSpecializedMethodIndirectlyOverridesAnotherProducerMethod(org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride.IndirectOverrideTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSpecializedStaticMethod(org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod.SpecializesStaticMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSpecializingAndSpecializedBeanHasName(org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName.SpecializingAndSpecializedBeanHaveNameTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInconsistentSpecialization(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.inconsistent.InconsistentSpecializationTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSpecializingAndSpecializedBeanHasName(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names.SpecializingAndSpecializedBeanHasNameTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSpecializingClassImplementsInterfaceAndExtendsNothing(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1.SpecializingBeanImplementsInterfaceOnly): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSpecializingClassDirectlyExtendsNothing(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2.SpecializingBeanExtendsNothingTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSpecializingClassExtendsNonSimpleBean(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3.SpecializingClassExtendsNonSimpleBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInterceptorCanNotAlsoBeDecorator(org.jboss.jsr299.tck.tests.interceptors.definition.broken.interceptorCanNotBeDecorator.InterceptorCanNotBeDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testInterceptorBindingsWithConflictingAnnotationMembersNotOk(org.jboss.jsr299.tck.tests.interceptors.definition.broken.invalidBindingAnnotations.InvalidInterceptorBindingAnnotationsTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNonExistantClassInBeansXmlNotOk(org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonExistantClassInBeansXml.NonExistantClassInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testNonInterceptorClassInBeansXmlNotOk(org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml.NonInterceptorClassInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSameInterceptorClassListedTwiceInBeansXmlNotOk(org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml.SameClassListedTwiceInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testAmbiguousDependency(org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.ambiguous.AmbiguousDependencyTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testUnsatisfiedDependency(org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.unsatisfied.UnsatisfiedDependencyTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testSessionScopedBeanWithInjectionPoint(org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.normal.scope.NormalScopedBeanWithInjectionPoint): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testDefinitionErrorDetected(org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testPrimitiveInjectionPointResolvedToNonPrimitiveProducerMethod(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.primitive.PrimitiveInjectionPointTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* testTypeVariableInjectionPoint(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.type.variable.TypeVariableInjectionPointTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* test(org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.NoClassWithSpecifiedNameTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* test(org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.stereotype.NoAnnotationWithSpecifiedNameTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* test(org.jboss.jsr299.tck.tests.policy.broken.not.policy.ClassIsNotPolicyTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* test(org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype.ClassIsNotPolicyTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
+* test(org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.SameTypeListedTwiceTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
diff --git a/src/main/jbake/content/dev/cdi-tck-webappsdeployer.md b/src/main/jbake/content/dev/cdi-tck-webappsdeployer.md
deleted file mode 100644
index b5a6c04..0000000
--- a/src/main/jbake/content/dev/cdi-tck-webappsdeployer.md
+++ /dev/null
@@ -1,266 +0,0 @@
-Title: CDI TCK status with webapps/ deployer
-
-To run the TCK with the webapps/ directory deployer:
-
-    cd openejb/tck/cdi-tomee/
-    mvn clean install -Pwebapp-deployer
-
-See [TOMEE-37](https://issues.apache.org/jira/browse/TOMEE-37)
-
-The easiest way to run just one test is to update the `src/test/resources/passing.xml` file like so:
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <suite name="CDI TCK" verbose="0">
-      <test name="CDI TCK">
-        <classes>
-          <class name="org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest"/>
-        </classes>
-      </test>
-    </suite>
-
-You can enable remote debugging for the server with the following property:
-
-    mvn clean install -Pwebapp-deployer -Dopenejb.server.debug=true
-
-The default port is `5005`.  That can be changed as well:
-
-    mvn clean install -Pwebapp-deployer -Dopenejb.server.debug=true -Dserver.debug.port=5001
-
-
-
-# Possible issues in the server
-
- -   testBeanWithNameJavaxEnterpriseContextConversation(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/builtin.jsf
- -   testBeanWithRequestScope(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/builtin.jsf
- -   testBeginAlreadyLongRunningConversationThrowsException(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
- -   testConversationActiveDuringNonFacesRequest(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cloud.jsf
- -   testConversationBeginMakesConversationLongRunning(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
- -   testConversationEndMakesConversationTransient(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
- -   testConversationHasDefaultTimeout(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
- -   testConversationIdMayBeSetByApplication(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
- -   testConversationIdMayBeSetByContainer(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
- -   testConversationIdSetByContainerIsUnique(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/storm.jsf
- -   testConversationsDontCrossSessionBoundary1(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest)
- -   testConversationsDontCrossSessionBoundary2(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/rain.jsf
- -   testEndTransientConversationThrowsException(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
- -   testLongRunningConversationInstancesNotDestroyedAtRequestEnd(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/storm.jsf
- -   testSetConversationTimeoutOverride(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cumulus.jsf
- -   testTransientConversationHasNullId(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/builtin.jsf
- -   testTransientConversationInstancesDestroyedAtRequestEnd(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/cloud.jsf
- -   testInvalidatingSessionDestroysConversation(org.jboss.jsr299.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest/clouds.jsf
- -   testConversationPropagated(org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest/storm.jsf
- -   testConversationPropagatedOverRedirect(org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest/storm.jsf
- -   testManualCidPropagation(org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest/storm.jsf
- -   testRequestScopeActiveDuringCallToEjbTimeoutMethod(org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest): Error launching test org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest/?outputMode=serializedObject&methodName=testRequestScopeActiveDuringCallToEjbTimeoutMethod. Kept on getting 404s.
- -   testRequestScopeDestroyedAfterCallToEjbTimeoutMethod(org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest): Error launching test org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest/?outputMode=serializedObject&methodName=testRequestScopeDestroyedAfterCallToEjbTimeoutMethod. Kept on getting 404s.
- -   testScopeTypeDeclaredInheritedIsIndirectlyInherited(org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest): Error launching test org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest/?outputMode=serializedObject&methodName=testScopeTypeDeclaredInheritedIsIndirectlyInherited. Kept on getting 404s.
- -   testScopeTypeDeclaredInheritedIsInherited(org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest): Error launching test org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest/?outputMode=serializedObject&methodName=testScopeTypeDeclaredInheritedIsInherited. Kept on getting 404s.
- -   testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited(org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest): Error launching test org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest/?outputMode=serializedObject&methodName=testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited. Kept on getting 404s.
- -   testScopeTypeNotDeclaredInheritedIsNotInherited(org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest): Error launching test org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest at http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest/?outputMode=serializedObject&methodName=testScopeTypeNotDeclaredInheritedIsNotInherited. Kept on getting 404s.
- -   testStereotypeDeclaredInheritedIsIndirectlyInherited(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
- -   testStereotypeDeclaredInheritedIsInherited(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
- -   testStereotypeNotDeclaredInheritedIsNotIndirectlyInherited(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
- -   testStereotypeNotDeclaredInheritedIsNotInherited(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
- -   testStereotypeScopeIsOverriddenByIndirectlyInheritedScope(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
- -   testStereotypeScopeIsOverriddenByInheritedScope(org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest)
- -   test(org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest)
- -   testNonStaticObserverMethodIndirectlyInherited(org.jboss.jsr299.tck.tests.event.observer.enterprise.EnterpriseEventInheritenceTest)
- -   testNonStaticObserverMethodInherited(org.jboss.jsr299.tck.tests.event.observer.enterprise.EnterpriseEventInheritenceTest)
- -   testGetEJBName(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testGetSessionBeanType(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testProcessAnnotatedTypeFiredForSessionBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testProcessAnnotatedTypeFiredForSessionBeanInterceptor(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testProcessInjectionTargetFiredForManagedBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testProcessInjectionTargetFiredForSessionBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testProcessInjectionTargetFiredForSessionBeanInterceptor(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testProcessManagedBeanFired(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testProcessSessionBeanFiredForStatefulSessionBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testProcessSessionBeanFiredForStatelessSessionBean(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testTypeOfProcessInjectionTargetParameter(org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest)
- -   testProcessSessionBeanEvent(org.jboss.jsr299.tck.tests.extensions.processBean.ProcessSessionBeanTest)
- -   testDefaultValidatorBean(org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest)
- -   testDefaultValidatorFactoryBean(org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest)
- -   testPrincipalBean(org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest)
- -   testUserTransactionBean(org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest)
- -   testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testBeanWithNamedAnnotation(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testBeanWithQualifiers(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testBeanWithScopeAnnotation(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testBeanWithStereotype(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testConstructorAnnotatedInjectCalled(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testDefaultName(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testEnterpriseBeanClassLocalView(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testObjectIsInAPITypes(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testRemoteInterfacesAreNotInAPITypes(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testSingletonWithApplicationScopeOK(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testSingletonWithDependentScopeOK(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testStatelessMustBeDependentScoped(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest)
- -   testEjbDeclaredInXmlNotSimpleBean(org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanViaXmlTest)
- -   testCreateSLSB(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testDependentObjectsDestroyed(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testDestroyRemovesSFSB(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testDirectSubClassInheritsPostConstructOnSuperclass(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testIndirectSubClassInheritsPostConstructOnSuperclass(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testIndirectSubClassInheritsPreDestroyOnSuperclass(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testInitializerMethodsCalledWithCurrentParameterValues(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testRemovedEjbIgnored(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testSerializeSFSB(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testSubClassInheritsPreDestroyOnSuperclass(org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest)
- -   testNewBeanHasNoDisposalMethods(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest)
- -   testNewBeanHasNoProducerMethods(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest)
- -   testNewBeanHasSameConstructor(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest)
- -   testNewBeanHasSameInitializers(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest)
- -   testForEachEnterpriseBeanANewBeanExists(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
- -   testNewBeanHasNoBeanELName(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
- -   testNewBeanHasNoObservers(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
- -   testNewBeanHasNoStereotypes(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
- -   testNewBeanIsDependentScoped(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
- -   testNewBeanIsHasOnlyNewBinding(org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest)
- -   testApplicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean(org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest):
- -   testApplicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans(org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest)
- -   testApplicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed(org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest)
- -   testInitializerMethodNotABusinessMethod(org.jboss.jsr299.tck.tests.implementation.initializer.EjbInitializerMethodTest)
- -   testBindingTypeOnInitializerParameter(org.jboss.jsr299.tck.tests.implementation.initializer.InitializerMethodTest)
- -   testMultipleInitializerMethodsAreCalled(org.jboss.jsr299.tck.tests.implementation.initializer.InitializerMethodTest)
- -   testStaticProducerField(org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise.EnterpriseProducerFieldDefinitionTest)
- -   testNonStaticProducerMethodInheritedBySpecializingSubclass(org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest)
- -   testNonStaticProducerMethodNotIndirectlyInherited(org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest)
- -   testNonStaticProducerMethodNotInherited(org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest)
- -   testConstructorHasDisposesParameter(org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter.ConstructorHasDisposesParameterTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testConstructorHasObservesParameter(org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter.ConstructorHasObservesParameterTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNonDependentScopedBeanCanNotHavePublicField(org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField.DependentWithPublicFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testTooManyInitializerAnnotatedConstructor(org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors.TooManyInitializerAnnotatedConstructorsTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNormalScopedUnproxyableBeanThrowsException(org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.unproxyable.UnproxyableManagedBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInjectionOfEjbs(org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest)
- -   testPassivationOfEjbs(org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest)
- -   testSpecializedBeanNotInstantiated(org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationIntegrationTest)
- -   testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean(org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest)
- -   testSpecializingBeanHasNameOfSpecializedBean(org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest)
- -   testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding(org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder.SessionBeanInterceptorOrderTest)
- -   testNonContextualSessionBeanReferenceIsIntercepted(org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest)
- -   testSessionBeanIsIntercepted(org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.simpleInterception.SessionBeanInterceptorDefinitionTest)
- -   testAnnotationMemberWithoutNonBinding(org.jboss.jsr299.tck.tests.lookup.binding.members.annotation.BindingAnnotationWithMemberTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testArrayMemberWithoutNonBinding(org.jboss.jsr299.tck.tests.lookup.binding.members.array.BindingAnnotationWithMemberTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testDuplicateNamedBeans(org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution.DuplicateNameResolutionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testDuplicateBeanNamePrefix(org.jboss.jsr299.tck.tests.lookup.byname.duplicatePrefixResolution.DuplicateNamePrefixResolutionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInjectionPointWithArrayType(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.array.ArrayTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedBean(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalClass.FinalClassTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testClassWithFinalMethodCannotBeProxied(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalMethod.FinalMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedBean(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.primitive.UnproxyableTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testClassWithPrivateConstructor(org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.privateConstructor.PrivateConstructorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testELResolverRegisteredWithJsf(org.jboss.jsr299.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest/JSFTestPage.jsf
- -   testInitializerCalledAfterFieldInjectionOfSuperclass(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionOrderingTest)
- -   testInitializerCalledAfterResourceInjection(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionOrderingTest)
- -   testPostConstructCalledAfterInitializerOfSuperclass(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionOrderingTest)
- -   testFieldDeclaredInSuperclassIndirectlyInjected(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
- -   testFieldDeclaredInSuperclassInjected(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
- -   testInjectionOnContextualSessionBean(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
- -   testInjectionOnEJBInterceptor(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
- -   testInjectionOnNonContextualSessionBean(org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest)
- -   testInjectionIntoJSFManagedBean(org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest/ManagedBeanTestPage.jsf
- -   testPrimitiveInjectionPointResolvesToNullableWebBean(org.jboss.jsr299.tck.tests.lookup.injection.nullableBean.NullableBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testBeanTypesOnSessionBean(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.EnterpriseResolutionByTypeTest)
- -   testDecoratorNotResolved(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.decorator.DecoratorNotInjectedTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
-
-# Issues likely with the deployer itself
-
- -   testPassivationCapableBeanWithNonPassivatingDecoratorBeanConstructorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.DecoratorWithNonPassivatingInitializerMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testPassivationCapableBeanWithNonPassivatingDecoratorInjectedFieldFails(org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField.DecoratorWithNonPassivatingInjectedFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSessionBeanWithNonPassivatingBeanConstructorParamInInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor.EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSessionBeanWithNonPassivatingConstructorFieldInDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingConstructorFieldInDecorator.EnterpriseBeanWithNonPassivatingFieldInDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSessionBeanWithNonPassivatingInitializerFieldInDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator.EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSessionBeanWithNonPassivatingInitializerParamInInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor.EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSessionBeanWithNonPassivatingInjectedFieldInDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInDecorator.EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSessionBeanWithNonPassivatingInjectedFieldInInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor.EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testDependentBeanWithNonSerializableImplementationInStatefulSessionBeanInitializerFails(org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonSerializableIntializerMethod.EnterpriseBeanWithNonSerializableIntializerMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNonPassivationCapableProducerFieldNotOk(org.jboss.jsr299.tck.tests.context.passivating.broken.finalProducerFieldNotPassivationCapable.NonPassivationCapableProducerFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testPassivationCapableBeanWithNonPassivatingInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter.PassivationCapableBeanWithNonPassivatingInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testPassivationCapableBeanWithNonPassivatingInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter.PassivationCapableBeanWithNonPassivatingInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testPassivationCapableBeanWithNonPassivatingInterceptorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField.PassivationCapableBeanWithNonPassivatingInterceptorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testManagedBeanWithNonPassivatingDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonPassivatingDecorator.ManagedBeanWithNonPassivatingDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testManagedBeanWithNonSerializableInterceptorClassNotOK(org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonSerializableInterceptorClass.ManagedBeanWithNonSerializableInterceptorClassTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSimpleWebBeanWithNonSerializableImplementationClassFails(org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableManagedBeanHasPassivatingScope.NonPassivationManagedBeanHasPassivatingScopeTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNonPassivationCapableProducerFieldNotOk(org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerField.NonPassivationCapableProducerFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNonPassivationCapableProducerMethodNotOk(org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod.NonPassivationCapableProducerMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoConstructorParameterOfWebBeanWithPassivatingScopeFails(org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingBeanConstructor.PassivatingManagedBeanWithNonPassivatingBeanConstructorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoInitializerParameterOfWebBeanWithPassivatingScopeFails(org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInitializerMethod.PassivatingManagedBeanWithNonPassivatingInitializerMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails(org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInjcetedField.PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails(org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter.PassivatingProducerMethodWithNonPassivatingParameterTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails(org.jboss.jsr299.tck.tests.context.passivating.broken.unserializableSimpleInjectedIntoPassivatingEnterpriseBean.UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testCustomDecoratorDecoratingFinalBean(org.jboss.jsr299.tck.tests.decorators.custom.broken.finalBeanClass.CustomDecoratorMatchingBeanWithFinalClassTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testDecoratorListedTwiceInBeansXmlNotOK(org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.DecoratorListedTwiceInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testEnabledDecoratorNotADecoratorTest(org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator.EnabledDecoratorNotADecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testAppliesToFinalManagedBeanClass(org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass.FinalBeanClassTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testAppliesToFinalMethodOnManagedBeanClass(org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod.FinalBeanMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testMultipleDelegateInjectionPoints(org.jboss.jsr299.tck.tests.decorators.definition.broken.multipleDelegateInjectionPoints.MultipleDelegateInjectionPointsTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNoDelegateInjectionPoints(org.jboss.jsr299.tck.tests.decorators.definition.broken.noDelegateInjectionPoints.NoDelegateInjectionPointsTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNonDecoratorWithDecoratesAnnotationNotOK(org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates.NonDecoratorWithDecoratesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNonExistantDecoratorClassInBeansXmlNotOK(org.jboss.jsr299.tck.tests.decorators.definition.broken.nonExistantClassInBeansXml.NonExistantDecoratorClassInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNotAllDecoratedTypesImplemented(org.jboss.jsr299.tck.tests.decorators.definition.broken.notAllDecoratedTypesImplemented.NotAllDecoratedTypesImplementedTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testDecoratorDelegateInjectionPoints(org.jboss.jsr299.tck.tests.decorators.definition.inject.broken.delegateProducerMethod.DelegateInjectionPointTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNonDependentGenericManagedBeanNotOk(org.jboss.jsr299.tck.tests.definition.bean.genericbroken.GenericManagedBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testTooManyScopesSpecifiedInJava(org.jboss.jsr299.tck.tests.definition.scope.broken.tooManyScopes.TooManyScopesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testStereotypeWithNonEmptyNamed(org.jboss.jsr299.tck.tests.definition.stereotype.broken.nonEmptyNamed.NonEmptyNamedTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testMultipleIncompatibleScopeStereotypes(org.jboss.jsr299.tck.tests.definition.stereotype.broken.scopeConflict.IncompatibleStereotypesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testStereotypeWithTooManyScopeTypes(org.jboss.jsr299.tck.tests.definition.stereotype.broken.tooManyScopes.TooManyScopeTypesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testObserverDefinitionErrorTreatedAsDefinitionError(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDefinitionError.AddDefinitionErrorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testObserverDeploymentProblemTreatedAsDeploymentError(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem.AddDeploymentProblemTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testThrowsException(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.beanDiscoveryMethodThrowsException.BeforeBeanDiscoveryThrowsExceptionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testObserverFailureTreatedAsDefinitionError(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver.AfterBeanDiscoveryObserverExecutionFailureTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testObserverFailureTreatedAsDeploymentError(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver.AfterDeploymentValidationObserverExecutionFailureTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testDeploymentFailsDuringValidation(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation.AfterBeanDiscoveryFailureTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testAddingScopeType(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.normalScope.AddingNormalScopeTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testAddingScopeType(org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.passivatingScope.AddingPassivatingScopeTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testAnyAnnotationOnEventInjectionPointWithoutTypeParameterFails(org.jboss.jsr299.tck.tests.event.broken.inject.withoutType.EventInjectionWithoutTypeTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testDependentBeanWithConditionalObserverMethodIsDefinitionError(org.jboss.jsr299.tck.tests.event.broken.observer.dependentIsConditionalObserver.DependentIsConditionalObserverTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testObserverMethodWithDisposesParamFails(org.jboss.jsr299.tck.tests.event.broken.observer.isDisposer.ObserverMethodAnnotatedDisposesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testObserverMethodAnnotatedInitializerFails(org.jboss.jsr299.tck.tests.event.broken.observer.isInitializer.ObserverMethodAnnotatedInitialzerTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testObserverMethodAnnotatedProducesFails(org.jboss.jsr299.tck.tests.event.broken.observer.isProducer.ObserverMethodAnnotatedProducesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testObserverMethodMustHaveOnlyOneEventParameter(org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters.ObserverMethodWithTwoEventParametersTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testProcessAnnotatedTypeEventThrowsExceptionNotOk(org.jboss.jsr299.tck.tests.extensions.annotated.broken.processAnnotatedObserverThrowsException.ProcessAnnotatedTypeEventThrowsExceptionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testProcessInjectionTargetEventThrowsExceptionNotOk(org.jboss.jsr299.tck.tests.extensions.annotated.broken.processInjectionTargetThrowsException.ProcessInjectionTargetEventThrowsExceptionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testAddDefinitionError(org.jboss.jsr299.tck.tests.extensions.container.event.broken.processBeanObserverRegistersException.AddDefinitionErrorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testProcessBeanObserverThrowsException(org.jboss.jsr299.tck.tests.extensions.container.event.broken.processBeanObserverThrowsException.ThrowExceptionInProcessBeanObserverTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testAddDefinitionError(org.jboss.jsr299.tck.tests.extensions.observer.broken.definitionError.ProcessObserverMethodErrorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testExceptionIsDefinitionError(org.jboss.jsr299.tck.tests.extensions.observer.broken.exception.ProcessObserverMethodExceptionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testAddingDefinitionError(org.jboss.jsr299.tck.tests.extensions.producer.broken.injectionTargetError.InjectionTargetDefinitionErrorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInitializerUnallowed(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed.InitializerUnallowedDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testMultipleDisposeParameters(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams.MultipleDisposeParametersDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testObserverParameterUnallowed(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed.ObserverParameterUnallowedDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testProducesUnallowed(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed.ProducesUnallowedDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testUnresolvedDisposalMethod(org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod.UnresolvedDisposalMethodDefinitionTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInitializerMethodAnnotatedProduces(org.jboss.jsr299.tck.tests.implementation.initializer.broken.methodAnnotatedProduces.InitializerMethodAnnotatedProducesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInitializerMethodHasParameterAnnotatedDisposes(org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes.ParameterAnnotatedDisposesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInitializerMethodHasParameterAnnotatedObserves(org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves.ParameterAnnotatedObservesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testParameterizedReturnTypeWithWildcard(org.jboss.jsr299.tck.tests.implementation.producer.field.definition.broken.parameterizedReturnTypeWithWildcard.ParameterizedReturnTypeWithWildcardTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testProducerMethodWithParameterAnnotatedDisposes(org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedDisposes.ParameterAnnotatedDisposesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testProducerMethodWithParameterAnnotatedObserves(org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedObserves.ParameterAnnotatedObservesTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testParameterizedType(org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter2.ParameterizedTypeWithTypeParameterTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testParameterizedReturnTypeWithWildcard(org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithWildcard.ParameterizedTypeWithWildcardTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSpecializedMethodIndirectlyOverridesAnotherProducerMethod(org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride.IndirectOverrideTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSpecializedStaticMethod(org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod.SpecializesStaticMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSpecializingAndSpecializedBeanHasName(org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName.SpecializingAndSpecializedBeanHaveNameTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInconsistentSpecialization(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.inconsistent.InconsistentSpecializationTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSpecializingAndSpecializedBeanHasName(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names.SpecializingAndSpecializedBeanHasNameTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSpecializingClassImplementsInterfaceAndExtendsNothing(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1.SpecializingBeanImplementsInterfaceOnly): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSpecializingClassDirectlyExtendsNothing(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2.SpecializingBeanExtendsNothingTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSpecializingClassExtendsNonSimpleBean(org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3.SpecializingClassExtendsNonSimpleBeanTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInterceptorCanNotAlsoBeDecorator(org.jboss.jsr299.tck.tests.interceptors.definition.broken.interceptorCanNotBeDecorator.InterceptorCanNotBeDecoratorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testInterceptorBindingsWithConflictingAnnotationMembersNotOk(org.jboss.jsr299.tck.tests.interceptors.definition.broken.invalidBindingAnnotations.InvalidInterceptorBindingAnnotationsTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNonExistantClassInBeansXmlNotOk(org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonExistantClassInBeansXml.NonExistantClassInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testNonInterceptorClassInBeansXmlNotOk(org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml.NonInterceptorClassInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSameInterceptorClassListedTwiceInBeansXmlNotOk(org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml.SameClassListedTwiceInBeansXmlTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testAmbiguousDependency(org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.ambiguous.AmbiguousDependencyTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testUnsatisfiedDependency(org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.unsatisfied.UnsatisfiedDependencyTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testSessionScopedBeanWithInjectionPoint(org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.normal.scope.NormalScopedBeanWithInjectionPoint): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testDefinitionErrorDetected(org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testPrimitiveInjectionPointResolvedToNonPrimitiveProducerMethod(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.primitive.PrimitiveInjectionPointTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   testTypeVariableInjectionPoint(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.type.variable.TypeVariableInjectionPointTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   test(org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.NoClassWithSpecifiedNameTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   test(org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.stereotype.NoAnnotationWithSpecifiedNameTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   test(org.jboss.jsr299.tck.tests.policy.broken.not.policy.ClassIsNotPolicyTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   test(org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype.ClassIsNotPolicyTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
- -   test(org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.SameTypeListedTwiceTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
-
-
diff --git a/src/main/jbake/content/dev/configuration-and-assembly.adoc b/src/main/jbake/content/dev/configuration-and-assembly.adoc
new file mode 100644
index 0000000..a159c2f
--- /dev/null
+++ b/src/main/jbake/content/dev/configuration-and-assembly.adoc
@@ -0,0 +1,162 @@
+= Configuration and Assembly
+:jbake-type: page
+:jbake-status: published
+
+Disclaimer that we do tweak and change this code frequently, without notice.
+It is the very heart of OpenEJB.
+To keep things tight and clean, we reserve the right to change it at anytime.
+Do not consider it a stable public API.
+
+== Overview in Code
+
+First a glimpse of how OpenEJB looks internally.
+Here's a test that builds OpenEJB using it's internal API.
+This is somewhat similar to how you might see people constructing Jetty in code.
+All our internal tests look like this.
+
+This usage involves no xml parsing or classpath scanning.
+If you don't give it to OpenEJB, OpenEJB doesn't know about it.
+This is OpenEJB with all the magic stripped away.
+At a high level:
+
+. You build your app in code using the JAXB tree in code and hand it to the `ConfigurationFactory`.
+ .. The `org.apache.openejb.jee` package contains JAXB trees for ejb-jar.xml, beans.xml and all the Java EE deployment descriptors.
+. The `ConfigurationFactory` will produce a fully canonical version of the app called the `Info` tree by:
+ .. Merging all sources of meta-data -- xml and annotations
+ .. Resolving all ejb, persistence unit, datasource and other references
+ .. Validating the app and looking for mistakes
+. The `Info` tree is
+ .. The singular source of information about the application from this point forward.
+ .. Pure data with no smarts or logic of any kind.
+ .. The instruction set of what would be built by the assembler.
+. The `Assembler` will build and start the application exactly as described in the `Info` tree.
+ .. When this step completes, you have a running application.
+ .. Any failures prior to this point require no cleanup.
+Only the assembler builds "live" objects.
+
+An example of what this looks like in code
+
+....
+import javax.ejb.LocalBean;
+import javax.ejb.Stateful;
+import javax.naming.InitialContext;
+
+import junit.framework.TestCase;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.client.LocalInitialContextFactory;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatefulBean;
+
+public class StatefulTest extends TestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+
+        System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
+
+        ConfigurationFactory config = new ConfigurationFactory();
+        Assembler assembler = new Assembler();
+
+        assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
+        assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+
+        EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatefulBean(MyBean.class));
+
+        assembler.createApplication(config.configureApplication(ejbJar));
+    }
+
+    public void test() throws Exception {
+        InitialContext context = new InitialContext();
+        MyBean myBean = (MyBean) context.lookup("MyBeanLocalBean");
+
+        assertEquals("pan", myBean.echo("nap"));
+    }
+
+    @Stateful
+    @LocalBean
+    public static class MyBean {
+
+        public String echo(String string) {
+            StringBuilder sb = new StringBuilder(string);
+            return sb.reverse().toString();
+        }
+    }
+}
+....
+
+== Logical Overview
+
+Slightly more detailed account of the above.
+Our startup and deploy world is broken into two phases:
+
+. configuration (app.jar \-> AppInfo)  we build up a fully normalized and validated tree.
+Some of the steps are
+ ** read in descriptors
+ ** process annotations filling in the descriptor tree
+ ** validating app compliance
+ ** resolving resource references
+ ** resolving ejb references
+ ** turning the descriptor tree into Info objects for final assembly
+ ** final validation check
+. assembly (AppInfo \-> actual running app)  we assemble a running app as detailed by the AppInfo
+ ** creating classloaders for the application
+ ** creating EntityManagers and EntityManagerFactories
+ ** creating live objects associated with resource-env-refs
+ ** creating deployment (CoreDeploymentInfo) objects for each ejb
+ ** creating the jndi enc of each ejb
+ ** adding method permission objects into the security system (JACC Provider)
+ ** creating transaction policy objects for each ejb
+ ** creating interceptor stacks and bindings for each ejb
+ ** adding ejbs to containers (which may also do things like create pools)
+ ** adding ejbs to the live ContainerSystem registry of ejbs
+ ** adding global jndi entries for each ejb
+
+The listings above aren't necesarrily complete or perfectly ordered, but generally show the nature of the work done in each phase.
+
+=== Configuration Phase
+
+A goal is that nothing gets through configuration and into assembly if it can't actually be built.
+The configuration phase is where we're supposed to wipe away any ambiguity, fully normalize the app, make sure it's internally consistent, spec compliant and generally good to go.
+If it's not, no worries as we actually haven't built anything permanent yet.
+Everything in the configuration phase is temporary.
+If it fails the configuration phase we just issue an error and say "App will not be loaded" and that's it, there's nothing to undo.
+
+=== Info Objects - Data between Configuration and Assembly
+
+The output of the configuration phase is what we call Info objects and the root of that tree is OpenEjbConfiguration.
+These objects are all simple, serializable data types with no methods, no constructors and no code or logic of any kind.
+We even have a test that uses ASM to walk down the Info tree and check that everything is compliant to these strict rules.
+
+All of the aforementioned configuration phase sits behind this info object tree and an interface that produces it:
+
+* org.apache.openejb.assembler.classic.OpenEjbConfiguration
+* org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory
+
+The job of the OpenEjbConfigurationFactory is simply to produce an  OpenEjbConfiguration tree.
+With this simple decoupling when the time comes we can actually support much different styles of use/topologies.
+For example, a cluster scenario.
+We could create an OpenEjbConfigurationFactory implementation that actually pulled the OpenEjbConfiguration from a central store or some sort of configuration server of our creation.
+Perhaps, someday we write an OpenEjbConfigurationFactory implementation to wrap the existing one and look for any changed files.
+If nothing has changed since last boot, we simple deserialize an OpenEjbConfiguration tree saved from a previous boot as a way of reducing startup time on very large apps.
+
+=== Assembly
+
+The assembly phase is where real running things are actually built.
+This process is inherently ingrained in the details on how OpenEJB works internally.
+Keeping it separated from descriptor parsing, validation, resolving, etc.
+keeps the actual "openejb building" code as simple as possible.
+It also allows for some flexibility and change to take place architecturally with less chance of it rippling through the entire system.
+However it's also not so generic (like spring, etc.) that becomes very difficult to get things built in a certain way or in a certain order requiring you to jump through several hoops just to keep the generic system as beautiful as possible.
+It knows all the details on how to build each individual part and in what order to build them.
+
+In OpenEJB, the Assembler is not supposed to be the gem of the project that we keep clean, motivating us to push complex things out into other areas for other people (usually users) to worry about.
+In fact, it's the opposite.
+The runtime system gets top priority on it's architectural needs and the assembler gets last priority.
+If there's something we can do in the Assembler that saves the rest of the system from complexity, we gladly throw the Assembler on that grenade.
+Our philosophy is that you can't make 100% of your system "perfect" all the time and sometime the mess has to go somewhere.
+The assembler is where.
+It's purposely not over architected so that it can continue to serve as a place to take up slack and not make all this stuff harder than it has to be.
diff --git a/src/main/jbake/content/dev/configuration-and-assembly.md b/src/main/jbake/content/dev/configuration-and-assembly.md
deleted file mode 100644
index dd33331..0000000
--- a/src/main/jbake/content/dev/configuration-and-assembly.md
+++ /dev/null
@@ -1,185 +0,0 @@
-Title: Configuration and Assembly
-
-Disclaimer that we do tweak and change this code frequently, without
-notice.  It is the very heart of OpenEJB.  To keep things tight and clean,
-we reserve the right to change it at anytime.  Do not consider it a stable
-public API.
-
-<a name="ConfigurationandAssembly-OverviewinCode"></a>
-# Overview in Code
-
-First a glimpse of how OpenEJB looks internally.  Here's a test that builds
-OpenEJB using it's internal API.  This is somewhat similar to how you might
-see people constructing Jetty in code.	All our internal tests look like
-this.
-
-This usage involves no xml parsing or classpath scanning.  If you don't
-give it to OpenEJB, OpenEJB doesn't know about it.  This is OpenEJB with
-all the magic stripped away.  At a high level:
-
-1. You build your app in code using the JAXB tree in code and hand it to the `ConfigurationFactory`.
-    1. The `org.apache.openejb.jee` package contains JAXB trees for ejb-jar.xml, beans.xml and all the Java EE deployment descriptors.
-1. The `ConfigurationFactory` will produce a fully canonical version of the app called the `Info` tree by:
-    1. Merging all sources of meta-data -- xml and annotations
-    1. Resolving all ejb, persistence unit, datasource and other references
-    1. Validating the app and looking for mistakes
-1. The `Info` tree is
-    1. The singular source of information about the application from this point forward.
-    1. Pure data with no smarts or logic of any kind.
-    1. The instruction set of what would be built by the assembler.
-1. The `Assembler` will build and start the application exactly as described in the `Info` tree.
-    1. When this step completes, you have a running application.
-    1. Any failures prior to this point require no cleanup.  Only the assembler builds "live" objects.
-
-An example of what this looks like in code
-
-    import javax.ejb.LocalBean;
-    import javax.ejb.Stateful;
-    import javax.naming.InitialContext;
-
-    import junit.framework.TestCase;
-    import org.apache.openejb.assembler.classic.Assembler;
-    import org.apache.openejb.assembler.classic.SecurityServiceInfo;
-    import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-    import org.apache.openejb.client.LocalInitialContextFactory;
-    import org.apache.openejb.config.ConfigurationFactory;
-    import org.apache.openejb.jee.EjbJar;
-    import org.apache.openejb.jee.StatefulBean;
-
-    public class StatefulTest extends TestCase {
-
-        @Override
-        protected void setUp() throws Exception {
-
-            System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
-
-            ConfigurationFactory config = new ConfigurationFactory();
-            Assembler assembler = new Assembler();
-
-            assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
-            assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
-
-            EjbJar ejbJar = new EjbJar();
-            ejbJar.addEnterpriseBean(new StatefulBean(MyBean.class));
-
-            assembler.createApplication(config.configureApplication(ejbJar));
-        }
-
-        public void test() throws Exception {
-            InitialContext context = new InitialContext();
-            MyBean myBean = (MyBean) context.lookup("MyBeanLocalBean");
-
-            assertEquals("pan", myBean.echo("nap"));
-        }
-
-        @Stateful
-        @LocalBean
-        public static class MyBean {
-
-            public String echo(String string) {
-                StringBuilder sb = new StringBuilder(string);
-                return sb.reverse().toString();
-            }
-        }
-    }
-
-
-<a name="ConfigurationandAssembly-LogicalOverview"></a>
-# Logical Overview
-
-Slightly more detailed account of the above.  Our startup and deploy world
-is broken into two phases:
-  
-  1. configuration (app.jar -> AppInfo)  we build up a fully normalized and validated tree.  Some of the steps are
-       - read in descriptors
-       - process annotations filling in the descriptor tree
-       - validating app compliance
-       - resolving resource references
-       - resolving ejb references
-       - turning the descriptor tree into Info objects for final assembly
-       - final validation check
-
-  2. assembly (AppInfo -> actual running app)  we assemble a running app as detailed by the AppInfo
-       - creating classloaders for the application
-       - creating EntityManagers and EntityManagerFactories
-       - creating live objects associated with resource-env-refs
-       - creating deployment (CoreDeploymentInfo) objects for each ejb
-       - creating the jndi enc of each ejb
-       - adding method permission objects into the security system (JACC Provider)
-       - creating transaction policy objects for each ejb
-       - creating interceptor stacks and bindings for each ejb
-       - adding ejbs to containers (which may also do things like create pools)
-       - adding ejbs to the live ContainerSystem registry of ejbs
-       - adding global jndi entries for each ejb
-
-
-
-The listings above aren't necesarrily complete or perfectly ordered, but
-generally show the nature of the work done in each phase.  
-
-<a name="ConfigurationandAssembly-ConfigurationPhase"></a>
-## Configuration Phase
-
-A goal is that nothing gets through configuration and into assembly if it
-can't actually be built.  The configuration phase is where we're supposed
-to wipe away any ambiguity, fully normalize the app, make sure it's
-internally consistent, spec compliant and generally good to go.  If it's
-not, no worries as we actually haven't built anything permanent yet. 
-Everything in the configuration phase is temporary.  If it fails the
-configuration phase we just issue an error and say "App will not be loaded"
-and that's it, there's nothing to undo.  
-
-<a name="ConfigurationandAssembly-InfoObjects-DatabetweenConfigurationandAssembly"></a>
-## Info Objects - Data between Configuration and Assembly
-
-The output of the configuration phase is what we call Info objects and the
-root of that tree is OpenEjbConfiguration.  These objects are all simple,
-serializable data types with no methods, no constructors and no code or
-logic of any kind.  We even have a test that uses ASM to walk down the Info
-tree and check that everything is compliant to these strict rules.
-
-All of the aforementioned configuration phase sits behind this info object
-tree and an interface that produces it:
-
- - org.apache.openejb.assembler.classic.OpenEjbConfiguration
- - org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory
-
-The job of the OpenEjbConfigurationFactory is simply to produce an 
-OpenEjbConfiguration tree.  With this simple decoupling when the time comes
-we can actually support much different styles of use/topologies.  For
-example, a cluster scenario.  We could create an
-OpenEjbConfigurationFactory implementation that actually pulled the
-OpenEjbConfiguration from a central store or some sort of configuration
-server of our creation.  Perhaps, someday we write an
-OpenEjbConfigurationFactory implementation to wrap the existing one and
-look for any changed files.  If nothing has changed since last boot, we
-simple deserialize an OpenEjbConfiguration tree saved from a previous boot
-as a way of reducing startup time on very large apps.
-
-<a name="ConfigurationandAssembly-Assembly"></a>
-## Assembly
-
-The assembly phase is where real running things are actually built.  This
-process is inherently ingrained in the details on how OpenEJB works
-internally.  Keeping it separated from descriptor parsing, validation,
-resolving, etc. keeps the actual "openejb building" code as simple as
-possible.  It also allows for some flexibility and change to take place
-architecturally with less chance of it rippling through the entire system. 
-However it's also not so generic (like spring, etc.) that becomes very
-difficult to get things built in a certain way or in a certain order
-requiring you to jump through several hoops just to keep the generic system
-as beautiful as possible.  It knows all the details on how to build each
-individual part and in what order to build them. 
-
-In OpenEJB, the Assembler is not supposed to be the gem of the project that
-we keep clean, motivating us to push complex things out into other areas
-for other people (usually users) to worry about.  In fact, it's the
-opposite.  The runtime system gets top priority on it's architectural needs
-and the assembler gets last priority.  If there's something we can do in
-the Assembler that saves the rest of the system from complexity, we gladly
-throw the Assembler on that grenade.  Our philosophy is that you can't make
-100% of your system "perfect" all the time and sometime the mess has to go
-somewhere.  The assembler is where.  It's purposely not over architected so
-that it can continue to serve as a place to take up slack and not make all
-this stuff harder than it has to be.
-
diff --git a/src/main/jbake/content/dev/contribution-tips.adoc b/src/main/jbake/content/dev/contribution-tips.adoc
new file mode 100644
index 0000000..18dab88
--- /dev/null
+++ b/src/main/jbake/content/dev/contribution-tips.adoc
@@ -0,0 +1,181 @@
+= Contribution Tips
+:jbake-type: page
+:jbake-status: published
+
+== First steps
+
+. Subscribe to the link:mailto:dev-subscribe@tomee.apache.org[developer mailing list] and say Hi
+. Get the source code with svn
+ ** svn https://svn.apache.org/repos/asf/tomee/tomee/trunk
+. Build the code (maven 3.0.5 or better required)
+ ** mvn clean install
+
+Play around with the examples under the examples/ directory.
+Some of the neater ones are (ordered simple to complex):
+
+* xref:{examples-vc}::simple-stateless.adoc[simple-stateless]
+* xref:{examples-vc}::simple-stateful.adoc[simple-stateful]
+* xref:{examples-vc}::simple-singleton.adoc[simple-singleton]
+* xref:{examples-vc}::simple-mdb.adoc[simple-mdb]
+* xref:{examples-vc}::async-methods.adoc[async-methods]
+* xref:{examples-vc}::schedule-methods.adoc[schedule-methods]
+* xref:{examples-vc}::injection-of-env-entry.adoc[injection-of-env-entry]
+* xref:{examples-vc}::injection-of-ejbs.adoc[injection-of-ejbs]
+* xref:{examples-vc}::injection-of-datasource.adoc[injection-of-datasource]
+* xref:{examples-vc}::injection-of-entitymanager.adoc[injection-of-entitymanager]
+* xref:{examples-vc}::testcase-injection.adoc[testcase-injection]
+* xref:{examples-vc}::testing-transactions.adoc[testing-transactions]
+* xref:{examples-vc}::transaction-rollback.adoc[transaction-rollback]
+* xref:{examples-vc}::testing-security.adoc[testing-security]
+* xref:{examples-vc}::testing-security-2.adoc[testing-security-2]
+* xref:{examples-vc}::simple-webservice.adoc[simple-webservice]
+
+== What is the process?
+
+....
+public void contributeToOpenSource() {
+
+    boolean stillInterestedAndHavingFun = true;
+    int taskSize = 1; // start small!
+
+    contributing:
+    while (stillInterestedAndHavingFun) {
+
+        Task task = findSomethingInteresting(taskSize++);
+
+        if (!task.hasJira()) {
+            createJira(task);
+        } else {
+            requestToBeAssignedToJira(task.jiraId());
+        }
+
+        while (task.inProgress()) {
+
+            chatOnListALittleGetCleverIdeas(task, new Ideas(task));
+            hackALittle(task);
+
+            if (task.tooHard() || task.notFun()) {
+                // no big deal, try again with something else
+                taskSize--;
+                continue contributing;
+            }
+        }
+
+        File patchFile = createSvnOrGitPatch(task);
+        attachToJira(task.jiraId(), patchFile);
+        askForReviewOnList(task.jiraId());
+
+        while (!committed(patchFile)) {
+
+            try {
+                pokeAtSometingElse();
+                helpOnUserList();
+                dayDream();
+            } catch (MoreThanAWeekException e) {
+                // Assume it fell off the radar -- happens.
+                // Evidence we need more committers.
+                bumpThreadOnList(task);
+            }
+        }
+    }
+
+}
+....
+
+After a while when people feel comfortable with you as contributor, they vote you in as a committer and ...
+big surprise ...
+there's almost no change in the daily routine.
+You get access to svn and pretty much everything else stays the same.
+Instead of submitting patches, now you have to help review them and commit them.
+Instead of learning how to contribute to an open source project, now you have to learn how to help others get involved.
+And of course it doesn't happen all at once, you never stop learning these things and you never stop wishing you had more time.
+
+No one cares how much code you can write or how fast you can write it.
+We all just contribute what we can when we can and there are no expectations on how much, how often, or where.
+
+It's very much about the journey and there is no real end as long as you're having fun and learning.
+
+Probably finding something to do when you do have time is the hardest part ...
+that never changes.
+
+== Be Brave
+
+Don't assume everything has already been discussed a million times and you're the only one who doesn't know and so you shouldn't bother anyone and should just figure it out on your own.
+That thinking is your enemy.
+Don't do that or you will get nowhere ...
+very slowly.
+So slowly that now you feel you really can't ask about it because surely everyone assumes you know it or have done it by now.
+That thinking is a terrible trap.
+Ask questions.
+Post your thoughts.
+
+Don't worry about asking "stupid" questions on the list -- even simple questions have great value.
+They often lead to surprisingly good discussions.
+They also have a profound impact on the people around you, the ones you don't see.
+
+There are always a handful of people silently reading the list and wishing they could participate, but are less brave.
+Whenever someone like you finally does show up and asks basic questions and shows it's ok, we usually get another 1 or 2 new faces who suddenly find the courage to speak up.
+
+Maybe it's like Karaoke;
+if the people singing sound like you when you sing, there are better odds you might get up and sign too.
+Seeing people like yourself do the things you want to do is inspiring.
+
+== Start Small
+
+You may suddenly get a creative surge and see many many things that could be done.
+One thing you learn about open source is that you never know when life is going to intervene and you have to stop.
+So it's always really good to get a little tiny thing working, checked in, and just grow it iteratively as time permits.
+It is a practice that is key for people of any skill level.
+And it goes wonderfully with Open Source as it adds plenty of space for new ideas.
+Stone soup starts with the stone, not the soup!
+
+So no matter how big the idea or task, ask yourself "do I really need all of this to get started?".
+Start with the tiniest possible version.
+And then cut it down again :)
+
+Code is easier to grow than change.
+And with today's refactoring tools even change is pretty easy.
+What's hard is taking a big piece of code and jamming it into another big piece of code.
+Don't work too long in isolation.
+
+Start small, get it checked in (or patch submitted) and work iteratively.
+
+== Things that always need doing
+
+* Final variables & fields are preferred where possible, but a lot of the code is old.
+Feel free to add them and hand the code back.
+* If you have any skills with code coverage tools, then you'll probably find way too much to do!
+Tests are always welcome.
+* There are over a 1,000 TODO comments in the code.
+Maybe some should be deleted.
+Maybe some could be completed.
+They probably all should have a JIRA id on them.
+* Pick a random class, see if you can figure out what it is doing and javadoc it.
+* Add @Override where applicable
+* Intellij has an 'Inspect Code' feature.
+Yikes does it produce a lot of output.
+* No doubt there is some exception handling that can be greatly improved.
+
+Obviously, one could get quite bored doing just the above.
+But sometimes the above tasks can lead to more fun and exciting things.
+Anything that gets you in and looking at code and actually touching and changing it usually results in questions, discussions and ideas...
+then little passions and late nights and lack of sleep and caffeine abuse.
+
+== Things to avoid
+
+=== Huge patches
+
+Huge patches are hard to digest.
+Try to avoid them whenever possible.
+Any step forward is a good one.
+Small steps allow people to see where you're headed and give input.
+That's true regardless if you are a committer or contributor.
+
+=== Be careful with reformatting
+
+Try to never mix logic changes with code reformatting.
+It makes it nearly impossible for others to see what the actual change was.
+
+* If you are a committer and want to reformat something, do the reformat as a separate commit before or after the real change.
+As long as they are separate and clearly marked it should be easy for people to see what is going on.
+* If you are a contributor and want to reformat something, maybe suggest it on the list, but avoid submitting patches that are just reformatting.
diff --git a/src/main/jbake/content/dev/contribution-tips.md b/src/main/jbake/content/dev/contribution-tips.md
deleted file mode 100644
index a2435ef..0000000
--- a/src/main/jbake/content/dev/contribution-tips.md
+++ /dev/null
@@ -1,201 +0,0 @@
-Title: Contribution Tips
-
-<a name="ContributionTips-Firststeps"></a>
-# First steps
-
-1. Subscribe to the [developer mailing list](mailto:dev-subscribe@tomee.apache.org)
-   and say Hi
-1. Get the source code with svn
-    - svn https://svn.apache.org/repos/asf/tomee/tomee/trunk
-1. Build the code (maven 3.0.5 or better required)
-    - mvn clean install
-
-Play around with the examples under the examples/ directory.  Some of the
-neater ones are (ordered simple to complex):
-
- -  [simple-stateless](http://tomee.apache.org/examples-trunk/simple-stateless/README.html)
- -  [simple-stateful](http://tomee.apache.org/examples-trunk/simple-stateful/README.html)
- -  [simple-singleton](http://tomee.apache.org/examples-trunk/simple-singleton/README.html)
- -  [simple-mdb](http://tomee.apache.org/examples-trunk/simple-mdb/README.html)
- -  [async-methods](http://tomee.apache.org/examples-trunk/async-methods/README.html)
- -  [schedule-methods](http://tomee.apache.org/examples-trunk/schedule-methods/README.html)
- -  [injection-of-env-entry](http://tomee.apache.org/examples-trunk/injection-of/README.html)
- -  [injection-of-ejbs](http://tomee.apache.org/examples-trunk/injection-of/README.html)
- -  [injection-of-datasource](http://tomee.apache.org/examples-trunk/injection-of-datasource/README.html)
- -  [injection-of-entitymanager](http://tomee.apache.org/examples-trunk/injection-of-entitymanager/README.html)
- -  [testcase-injection](http://tomee.apache.org/examples-trunk/testcase-injection/README.html)
- -  [testing-transactions](http://tomee.apache.org/examples-trunk/testing-transactions/README.html)
- -  [transaction-rollback](http://tomee.apache.org/examples-trunk/transaction-rollback/README.html)
- -  [testing-security](http://tomee.apache.org/examples-trunk/testing-security/README.html)
- -  [testing-security-2](http://tomee.apache.org/examples-trunk/testing-security-2/README.html)
- -  [simple-webservice](http://tomee.apache.org/examples-trunk/simple-webservice/README.html)
-
-
-<a name="ContributionTips-Whatistheprocess?"></a>
-# What is the process?
-
-    public void contributeToOpenSource() {
-
-        boolean stillInterestedAndHavingFun = true;
-        int taskSize = 1; // start small!
-
-        contributing:
-        while (stillInterestedAndHavingFun) {
-
-            Task task = findSomethingInteresting(taskSize++);
-
-            if (!task.hasJira()) {
-                createJira(task);
-            } else {
-                requestToBeAssignedToJira(task.jiraId());
-            }
-
-            while (task.inProgress()) {
-
-                chatOnListALittleGetCleverIdeas(task, new Ideas(task));
-                hackALittle(task);
-
-                if (task.tooHard() || task.notFun()) {
-                    // no big deal, try again with something else
-                    taskSize--;
-                    continue contributing;
-                }
-            }
-
-            File patchFile = createSvnOrGitPatch(task);
-            attachToJira(task.jiraId(), patchFile);
-            askForReviewOnList(task.jiraId());
-
-            while (!committed(patchFile)) {
-
-                try {
-                    pokeAtSometingElse();
-                    helpOnUserList();
-                    dayDream();
-                } catch (MoreThanAWeekException e) {
-                    // Assume it fell off the radar -- happens.
-                    // Evidence we need more committers.
-                    bumpThreadOnList(task);
-                }
-            }
-        }
-
-    }
-
-
-After a while when people feel comfortable with you as contributor, they
-vote you in as a committer and ... big surprise ... there's almost no
-change in the daily routine.  You get access to svn and pretty much
-everything else stays the same.  Instead of submitting patches, now you
-have to help review them and commit them.  Instead of learning how to
-contribute to an open source project, now you have to learn how to help
-others get involved.  And of course it doesn't happen all at once, you
-never stop learning these things and you never stop wishing you had more
-time.
-
-No one cares how much code you can write or how fast you can write it.	We
-all just contribute what we can when we can and there are no expectations
-on how much, how often, or where.
-
-It's very much about the journey and there is no real end as long as you're
-having fun and learning.
-
-Probably finding something to do when you do have time is the hardest part
-... that never changes.
-
-<a name="ContributionTips-BeBrave"></a>
-# Be Brave
-
-Don't assume everything has already been discussed a million times and
-you're the only one who doesn't know and so you shouldn't bother anyone and
-should just figure it out on your own.	That thinking is your enemy.  Don't
-do that or you will get nowhere ... very slowly.  So slowly that now you
-feel you really can't ask about it because surely everyone assumes you know
-it or have done it by now.  That thinking is a terrible trap.  Ask
-questions.  Post your thoughts.
-
-Don't worry about asking "stupid" questions on the list -- even simple
-questions have great value.  They often lead to surprisingly good
-discussions.  They also have a profound impact on the people around you,
-the ones you don't see.
-
-There are always a handful of people silently reading the list and wishing
-they could participate, but are less brave.  Whenever someone like you
-finally does show up and asks basic questions and shows it's ok, we usually
-get another 1 or 2 new faces who suddenly find the courage to speak up.
-
-Maybe it's like Karaoke; if the people singing sound like you when you
-sing, there are better odds you might get up and sign too. Seeing people
-like yourself do the things you want to do is inspiring.
-
-<a name="ContributionTips-StartSmall"></a>
-# Start Small
-
-You may suddenly get a creative surge and see many many things that could
-be done.  One thing you learn about open source is that you never know when
-life is going to intervene and you have to stop.  So it's always really
-good to get a little tiny thing working, checked in, and just grow it
-iteratively as time permits.  It is a practice that is key for people of
-any skill level.  And it goes wonderfully with Open Source as it adds
-plenty of space for new ideas.	Stone soup starts with the stone, not the
-soup!
-
-So no matter how big the idea or task, ask yourself "do I really need all
-of this to get started?".  Start with the tiniest possible version.  And
-then cut it down again :)
-
-Code is easier to grow than change.  And with today's refactoring tools
-even change is pretty easy.  What's hard is taking a big piece of code and
-jamming it into another big piece of code.  Don't work too long in
-isolation.
-
-Start small, get it checked in (or patch submitted) and work iteratively.
-
-<a name="ContributionTips-Thingsthatalwaysneeddoing"></a>
-# Things that always need doing
-
- - Final variables & fields are preferred where possible, but a lot of the
-code is old.  Feel free to add them and hand the code back.
- - If you have any skills with code coverage tools, then you'll probably
-find way too much to do!  Tests are always welcome.
- - There are over a 1,000 TODO comments in the code.  Maybe some should be
-deleted.  Maybe some could be completed.  They probably all should have a
-JIRA id on them.
- - Pick a random class, see if you can figure out what it is doing and
-javadoc it.
- - Add @Override where applicable
- - Intellij has an 'Inspect Code' feature.  Yikes does it produce a lot of
-output.
- - No doubt there is some exception handling that can be greatly improved.
-
-Obviously, one could get quite bored doing just the above.  But sometimes
-the above tasks can lead to more fun and exciting things.  Anything that
-gets you in and looking at code and actually touching and changing it
-usually results in questions, discussions and ideas... then little passions
-and late nights and lack of sleep and caffeine abuse.
-
-
-<a name="ContributionTips-Thingstoavoid"></a>
-# Things to avoid
-
-<a name="ContributionTips-Hugepatches"></a>
-#### Huge patches
-
-Huge patches are hard to digest.  Try to avoid them whenever possible.	Any
-step forward is a good one.  Small steps allow people to see where you're
-headed and give input.	That's true regardless if you are a committer or
-contributor.
-
-<a name="ContributionTips-Becarefulwithreformatting"></a>
-#### Be careful with reformatting
-
-Try to never mix logic changes with code reformatting.	It makes it nearly
-impossible for others to see what the actual change was.
-
- - If you are a committer and want to reformat something, do the reformat
-as a separate commit before or after the real change.  As long as they are
-separate and clearly marked it should be easy for people to see what is
-going on.
- - If you are a contributor and want to reformat something, maybe suggest
-it on the list, but avoid submitting patches that are just reformatting.
-
diff --git a/src/main/jbake/content/dev/creating-itests.adoc b/src/main/jbake/content/dev/creating-itests.adoc
new file mode 100644
index 0000000..fc22738
--- /dev/null
+++ b/src/main/jbake/content/dev/creating-itests.adoc
@@ -0,0 +1,153 @@
+= Creating itests
+:jbake-type: page
+:jbake-status: published
+
+== OpenEJB itests
+
+The OpenEJB itests module is a framework to create EJB test cases that are designed according to the JUnit rules, i.e.
+they all have setUp, tests and tearDown methods.
+Since it's JUnit-based, you can do whatever you could do in JUnit.
+
+This page describes the steps to create EJB test cases.
+
+=== How itests work
+
+The itests module lives in OpenEJB's repository in the _modules\itests_ directory.
+Setting up the test environment to execute the itests is based on (http://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/itest/[maven-itest-plugin-1.0 plugin] ).
+
+Take a look at maven.xml in modules\itests directory.
+There you'll see that the default goal is _ejb:install_, which in turn executes _itest_.
+When the EJBs (todo: describe it a bit more) are done, the _itest:setup_ goal is executed, which starts the real game.
+First, _org/openejb/Security_ configuration is started.
+Once it's done, _openejb-itests-xxx.jar_ is deployed, which is _org/openejb/Itests_ configuration to be started, afterwards.
+When the configurations are deployed and started, the maven-itest-plugin executes junit (see http://ant.apache.org/manual/OptionalTasks/junit.html[Ant JUnit task documentation]  and project.properties of the itests module).
+The project.properties file configures which itests are run and some other stuff.
+
+The first itest test case is _org.openejb.test.entity.cmp.CmpTestSuite_.
+Consult this for more information.
+Then the others defined in _maven.itest.includes_ property are executed.
+
+The order in which the itests are executed is important, so the first order is set up via the maven.itest.includes property, then the test suites add their tests in some order, and finally the method names in the test classes put yet another order.
+So, be careful what name your test method name will become.
+It may influence the order.
+
+Some EJBs access database resources.
+It's even more important for CMPs.
+The itests module uses the database as defined in the _openejb.test.database_ property.
+It's currently defined in the _project.properties_ file of the module.
+You can change its value to whatever you wish using the Maven property setting approaches (-D on the command line, project.properties, build.properties in your home directory or the project you work in).
+
+So, the last important information is how the junit tests access the server resources - EJBs.
+It's done via executing session beans that in turn get at the test EJBs, mostly CMPs.
+It's also possible that the CMP itests will be accessed directly without having to pass on the call through a session bean.
+
+If itests are part of a larger project structure you can disable executing it using the _maven.itest.skip_ property.
+Set it to _true_ and Maven won't run the itests.
+
+=== Simple CMP 2.1 itest
+
+==== Database setup
+
+The itests default database is Derby.
+The class - _org.openejb.test.DerbyTestDatabase_ - is instantiated upon executing _org.openejb.testTestManager.getDatabase()_ in each test case's _setUp()_ method.
+Remember, you can define any other database using the _openejb.test.database_ property or do initialization of your own database choice in the setUp() method.
+
+The current implementation of database initialization is based on two DerbyTestDatabse methods: _createCMP2Model()_ and _dropCMP2Model()_ that create and drop database structure, accordingly.
+
+==== CMP 2.1 deployment
+
+{info:title=Information} Unless specified, all directories are relative to _modules/itests_ directory and commands are executed in it.
+\{info}
+
+A Maven project can produce one build artefact.
+It's very important to keep in mind whenever your tests are to be based on a EJB that's not built by default.
+The default EJBs are defined in _modules/itests/src/ejb/META-INF/ejb-jar.xml_.
+The corresponding deployment plan - the _openejb-jar.xml_ file is in _modules/itests/src/ejb/META-INF/openejb-jar.xml_.
+
+If you want to test your own EJB, you need to build it yourself, i.e.
+describe the build and deployment in _modules/itests/maven.xml_ in the pregoal of _itest:setup_.
+
+In the following example, Ant's jar builds openejb-cmp2-petstore.jar file, which in turn is distributed and started in Geronimo.
+The _id_ attribute of _deploy:start_ is as specified in the module's deployment plan.
+See http://wiki.apache.org/geronimo/Deployment[Geronimo Deployment]  for more information about Geronimo deployment plans.
+
+ <ant:jar destfile="${basedir}/target/openejb-cmp2-petstore.jar">
+   <fileset dir="${basedir}/target/classes">
+     <include name="**/cmp2/petstore/*.class"/>
+     <include name="**/TestFailureException.class"/>
+   </fileset>
+   <metainf dir="${basedir}/src/cmp2/petstore" includes="*.xml"/>
+ </ant:jar>
+ <deploy:distribute
+   uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+   username="system"
+   password="manager"
+   module="${basedir}/target/openejb-cmp2-petstore.jar"
+ />
+ <deploy:start
+   uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+   username="system"
+   password="manager"
+   id="org/openejb/cmp2/petstore"/>
+
+==== Execution
+
+When EJB classes, deployment descriptor and plan, maven.xml are all set up, it's time to execute your tests.
+In order to run itests you will run Maven in _modules/itests_ directory.
+
+ ~/openejb/modules/itests
+ $ maven
+
+It's also possible to override project properties and run only some test cases.
+
+ ~/openejb/modules/itests
+ $ maven -Dmaven.itest.includes=**/Cmp2TestSuite.java
+
+When a failure occurs, you should take a look at the result file of the failed test suite in _target/itest-reports_, e.g.
+
+....
+~/openejb/modules/itests
+$ maven -Dmaven.itest.includes=**/Cmp2TestSuite.java -o
+...
+ [junit]  Tests run: 113, Failures: 1, Errors: 0, Time elapsed: 22,132 sec
+ [junit]  [ERROR]  TEST org.openejb.test.entity.cmp2.Cmp2TestSuite FAILED
+...
+BUILD FAILED
+File...... C:\Documents and Settings\root\.maven\cache\maven-itest-plugin-1.0\plugin.jelly
+Element... fail
+Line...... 166
+Column.... 64
+There were test failures.
+Total time: 2 minutes 3 seconds
+Finished at: Sun Jul 17 17:48:36 CEST 2005
+
+$ more target/itest-reports/TEST-org.openejb.test.entity.cmp2.Cmp2TestSuite.txt
+Testsuite: org.openejb.test.entity.cmp2.Cmp2TestSuite
+Tests run: 113, Failures: 1, Errors: 0, Time elapsed: 22,132 sec
+
+Testcase: PetstoreTests.create: FAILED
+Received Exception class java.lang.NullPointerException : null
+junit.framework.AssertionFailedError: Received Exception class java.lang.NullPointerException : null
+	at org.openejb.test.entity.cmp2.PetstoreTests.test01_create(PetstoreTests.java:84)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+	at org.openejb.test.NumberedTestCase.runTestMethod(NumberedTestCase.java:195)
+	at org.openejb.test.NumberedTestCase$3.protect(NumberedTestCase.java:169)
+	at org.openejb.test.NumberedTestCase.run(NumberedTestCase.java:172)
+	at org.openejb.test.NumberedTestCase.run(NumberedTestCase.java:141)
+	at org.openejb.test.TestSuite.run(TestSuite.java:71)
+...
+....
+
+Complete execution log is in _target/openejb/var/log/openejb.log_ of the itests module.
+
+===== Running the Tests in Eclipse.
+
+The steps for running the iTests inside of Eclipse are given below.
+They are
+
+1) For Local Interface Tests, the class to be run is _org.apache.openejb.iTest_.
+2) For Remote Interface Tests, the class to be run is _org.apache.openejb.RemoteiTest_.
+
+In both the cases you need to give _'-Dopenejb.home=target/test-classes/'_ as a vm argument  for the tests to run.
diff --git a/src/main/jbake/content/dev/creating-itests.md b/src/main/jbake/content/dev/creating-itests.md
deleted file mode 100644
index 0bbbef8..0000000
--- a/src/main/jbake/content/dev/creating-itests.md
+++ /dev/null
@@ -1,203 +0,0 @@
-Title: Creating itests
-<a name="Creatingitests-OpenEJBitests"></a>
-# OpenEJB itests
-
-The OpenEJB itests module is a framework to create EJB test cases that are
-designed according to the JUnit rules, i.e. they all have setUp, tests and
-tearDown methods. Since it's JUnit-based, you can do whatever you could do
-in JUnit.
-
-This page describes the steps to create EJB test cases.
-
-<a name="Creatingitests-Howitestswork"></a>
-## How itests work
-
-The itests module lives in OpenEJB's repository in the _modules\itests_ directory. Setting up the test environment to execute the itests is based on ([maven-itest-plugin-1.0 plugin](http://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/itest/)
-). 
-
-Take a look at maven.xml in modules\itests directory. There you'll see that
-the default goal is _ejb:install_, which in turn executes _itest_. When the
-EJBs (todo: describe it a bit more) are done, the _itest:setup_ goal is
-executed, which starts the real game. First, _org/openejb/Security_
-configuration is started. Once it's done, _openejb-itests-xxx.jar_ is
-deployed, which is _org/openejb/Itests_ configuration to be started,
-afterwards. When the configurations are deployed and started, the
-maven-itest-plugin executes junit (see [Ant JUnit task documentation](http://ant.apache.org/manual/OptionalTasks/junit.html)
- and project.properties of the itests module). The project.properties file
-configures which itests are run and some other stuff.
-
-The first itest test case is _org.openejb.test.entity.cmp.CmpTestSuite_.
-Consult this for more information. Then the others defined in
-_maven.itest.includes_ property are executed.
-
-The order in which the itests are executed is important, so the first order
-is set up via the maven.itest.includes property, then the test suites add
-their tests in some order, and finally the method names in the test classes
-put yet another order. So, be careful what name your test method name will
-become. It may influence the order.
-
-Some EJBs access database resources. It's even more important for CMPs. The
-itests module uses the database as defined in the _openejb.test.database_
-property. It's currently defined in the _project.properties_ file of the
-module. You can change its value to whatever you wish using the Maven
-property setting approaches (-D on the command line, project.properties,
-build.properties in your home directory or the project you work in).
-
-So, the last important information is how the junit tests access the server
-resources - EJBs. It's done via executing session beans that in turn get at
-the test EJBs, mostly CMPs. It's also possible that the CMP itests will be
-accessed directly without having to pass on the call through a session
-bean.
-
-If itests are part of a larger project structure you can disable executing
-it using the _maven.itest.skip_ property. Set it to _true_ and Maven won't
-run the itests.
-
-<a name="Creatingitests-SimpleCMP2.1itest"></a>
-## Simple CMP 2.1 itest
-
-<a name="Creatingitests-Databasesetup"></a>
-### Database setup
-
-The itests default database is Derby. The class -
-_org.openejb.test.DerbyTestDatabase_ - is instantiated upon executing
-_org.openejb.testTestManager.getDatabase()_ in each test case's _setUp()_
-method. Remember, you can define any other database using the
-_openejb.test.database_ property or do initialization of your own database
-choice in the setUp() method.
-
-The current implementation of database initialization is based on two
-DerbyTestDatabse methods: _createCMP2Model()_ and _dropCMP2Model()_ that
-create and drop database structure, accordingly.
-
-<a name="Creatingitests-CMP2.1deployment"></a>
-### CMP 2.1 deployment
-
-{info:title=Information}
-Unless specified, all directories are relative to _modules/itests_
-directory and commands are executed in it.
-{info}
-
-A Maven project can produce one build artefact. It's very important to keep
-in mind whenever your tests are to be based on a EJB that's not built by
-default. The default EJBs are defined in
-_modules/itests/src/ejb/META-INF/ejb-jar.xml_. The corresponding deployment
-plan - the _openejb-jar.xml_ file is in
-_modules/itests/src/ejb/META-INF/openejb-jar.xml_.
-
-If you want to test your own EJB, you need to build it yourself, i.e.
-describe the build and deployment in _modules/itests/maven.xml_ in the
-pregoal of _itest:setup_.
-
-In the following example, Ant's jar builds openejb-cmp2-petstore.jar file,
-which in turn is distributed and started in Geronimo. The _id_ attribute of
-_deploy:start_ is as specified in the module's deployment plan. See [Geronimo Deployment](http://wiki.apache.org/geronimo/Deployment)
- for more information about Geronimo deployment plans.
-
-
-    <ant:jar destfile="${basedir}/target/openejb-cmp2-petstore.jar">
-      <fileset dir="${basedir}/target/classes">
-        <include name="**/cmp2/petstore/*.class"/>
-        <include name="**/TestFailureException.class"/>
-      </fileset>
-      <metainf dir="${basedir}/src/cmp2/petstore" includes="*.xml"/>
-    </ant:jar>
-    <deploy:distribute
-      uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
-      username="system"
-      password="manager"
-      module="${basedir}/target/openejb-cmp2-petstore.jar"
-    />
-    <deploy:start
-      uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
-      username="system"
-      password="manager"
-      id="org/openejb/cmp2/petstore"/>
-
-
-<a name="Creatingitests-Execution"></a>
-### Execution
-
-When EJB classes, deployment descriptor and plan, maven.xml are all set up,
-it's time to execute your tests. In order to run itests you will run Maven
-in _modules/itests_ directory.
-
-
-    ~/openejb/modules/itests
-    $ maven
-
-
-It's also possible to override project properties and run only some test
-cases.
-
-
-    ~/openejb/modules/itests
-    $ maven -Dmaven.itest.includes=**/Cmp2TestSuite.java
-
-
-When a failure occurs, you should take a look at the result file of the
-failed test suite in _target/itest-reports_, e.g.
-
-
-    ~/openejb/modules/itests
-    $ maven -Dmaven.itest.includes=**/Cmp2TestSuite.java -o
-    ...
-     [junit]
- Tests run: 113, Failures: 1, Errors: 0, Time elapsed: 22,132 sec
-     [junit]
- [ERROR]
- TEST org.openejb.test.entity.cmp2.Cmp2TestSuite FAILED
-    ...
-    BUILD FAILED
-    File...... C:\Documents and
-Settings\root\.maven\cache\maven-itest-plugin-1.0\plugin.jelly
-    Element... fail
-    Line...... 166
-    Column.... 64
-    There were test failures.
-    Total time: 2 minutes 3 seconds
-    Finished at: Sun Jul 17 17:48:36 CEST 2005
-    
-    $ more
-target/itest-reports/TEST-org.openejb.test.entity.cmp2.Cmp2TestSuite.txt
-    Testsuite: org.openejb.test.entity.cmp2.Cmp2TestSuite
-    Tests run: 113, Failures: 1, Errors: 0, Time elapsed: 22,132 sec
-    
-    Testcase: PetstoreTests.create: FAILED
-    Received Exception class java.lang.NullPointerException : null
-    junit.framework.AssertionFailedError: Received Exception class
-java.lang.NullPointerException : null
-    	at
-org.openejb.test.entity.cmp2.PetstoreTests.test01_create(PetstoreTests.java:84)
-    	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-    	at
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
-    	at
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
-    	at
-org.openejb.test.NumberedTestCase.runTestMethod(NumberedTestCase.java:195)
-    	at
-org.openejb.test.NumberedTestCase$3.protect(NumberedTestCase.java:169)
-    	at org.openejb.test.NumberedTestCase.run(NumberedTestCase.java:172)
-    	at org.openejb.test.NumberedTestCase.run(NumberedTestCase.java:141)
-    	at org.openejb.test.TestSuite.run(TestSuite.java:71)
-    ...
-
-
-Complete execution log is in _target/openejb/var/log/openejb.log_ of the
-itests module.
-
-<a name="Creatingitests-RunningtheTestsinEclipse."></a>
-#### Running the Tests in Eclipse.
-
-The steps for running the iTests inside of Eclipse are given below. They
-are
-
-1) For Local Interface Tests, the class to be run is
-_org.apache.openejb.iTest_.
-2) For Remote Interface Tests, the class to be run is
-_org.apache.openejb.RemoteiTest_.
-
-In both the cases you need to give _'-Dopenejb.home=target/test-classes/'_
-as a vm argument 
-for the tests to run. 
diff --git a/src/main/jbake/content/dev/design-application-server.adoc b/src/main/jbake/content/dev/design-application-server.adoc
new file mode 100644
index 0000000..e2ce9b9
--- /dev/null
+++ b/src/main/jbake/content/dev/design-application-server.adoc
@@ -0,0 +1,38 @@
+= Design - Application Server
+:jbake-type: page
+:jbake-status: published
+
+== Application Server
+
+Sub-component of xref:design.adoc[OpenEJB]
+
+
+== Definition
+
+Any component wishing to serve or deliver Enterprise JavaBeans.
+
+
+== Also Known As
+
+* Server Adapter
+* Server Provider
+
+
+== Responsibilities
+
+* Remote client access to OpenEJB
+* Implement the bean's remote and home interfaces.
+* Distribute its implementation of the remote and home interfaces.
+* Provide clients with a JNDI name space for looking up beans.
+* Delegate method invocations to the container.
+
+
+== Related Classes
+
+* org.apache.openejb.spi.ApplicationServer
+
+
+== Implementations
+
+* xref:design-local-server.adoc[Local Server]
+* xref:design-remote-server.adoc[Remote Server]
diff --git a/src/main/jbake/content/dev/design-application-server.md b/src/main/jbake/content/dev/design-application-server.md
deleted file mode 100644
index 62f367c..0000000
--- a/src/main/jbake/content/dev/design-application-server.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Title: Design - Application Server
-<a name="Design-ApplicationServer-ApplicationServer"></a>
-## Application Server
-
-Sub-component of [OpenEJB](design.html)
-
-
-<a name="Design-ApplicationServer-Definition"></a>
-## Definition
-
-Any component wishing to serve or deliver Enterprise JavaBeans.
-
-<a name="Design-ApplicationServer-AlsoKnownAs"></a>
-## Also Known As
- * Server Adapter
- * Server Provider
-
-<a name="Design-ApplicationServer-Responsibilities"></a>
-## Responsibilities
- * Remote client access to OpenEJB
- * Implement the bean's remote and home interfaces.
- * Distribute its implementation of the remote and home interfaces.
- * Provide clients with a JNDI name space for looking up beans.
- * Delegate method invocations to the container.
-
-<a name="Design-ApplicationServer-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.spi.ApplicationServer
-
-<a name="Design-ApplicationServer-Implementations"></a>
-## Implementations
- * [Local Server](design-local-server.html)
- * [Remote Server](design-remote-server.html)
diff --git a/src/main/jbake/content/dev/design-application-serverlinks.adoc b/src/main/jbake/content/dev/design-application-serverlinks.adoc
new file mode 100644
index 0000000..eafbd84
--- /dev/null
+++ b/src/main/jbake/content/dev/design-application-serverlinks.adoc
@@ -0,0 +1,7 @@
+= Design - Application ServerLinks
+:jbake-type: page
+:jbake-status: published
+
+NOTE: this image is not present in source nor on the current site
+
+!http://tomee.apache.org/images/figure-appserver.gif!
diff --git a/src/main/jbake/content/dev/design-application-serverlinks.md b/src/main/jbake/content/dev/design-application-serverlinks.md
deleted file mode 100644
index c5d5b18..0000000
--- a/src/main/jbake/content/dev/design-application-serverlinks.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Title: Design - Application ServerLinks
-!http://tomee.apache.org/images/figure-appserver.gif!
diff --git a/src/main/jbake/content/dev/design-assembler.adoc b/src/main/jbake/content/dev/design-assembler.adoc
new file mode 100644
index 0000000..707eaa6
--- /dev/null
+++ b/src/main/jbake/content/dev/design-assembler.adoc
@@ -0,0 +1,31 @@
+= Design - Assembler
+:jbake-type: page
+:jbake-status: published
+
+== Assembler
+
+Sub-component of xref:design.adoc[OpenEJB]
+
+== Definition
+
+Instantiates and assembles a configured, runnable, instance of the container system and all sub-components.
+Vendors needing extreme control over the construction of the container system can get it by implementing this class.
+Doing this comes with large amounts of resposibility and complexity and should not be done without a deep understanding of OpenEJB.
+
+== Responsibilities
+
+* Instantiate and initialize all Container implementations
+* Instantiate and initialize TransactionService implementation
+* Instantiate and initialize SecurityService implementation
+* Instantiate and initialize all ResourceManagers
+* Load all deployed beans
+* Populate each deployment's JNDI ENC
+* Populate the IntraVM Server's global, client, JNDI namespace
+
+== Related Packages
+
+* org.apache.openejb.spi.Assembler
+
+== Implementations
+
+* xref:design-classic-assembler.adoc[Classic Assembler]
diff --git a/src/main/jbake/content/dev/design-assembler.md b/src/main/jbake/content/dev/design-assembler.md
deleted file mode 100644
index d28b818..0000000
--- a/src/main/jbake/content/dev/design-assembler.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Title: Design - Assembler
-
-<a name="Design-Assembler-Assembler"></a>
-## Assembler
-
-Sub-component of [OpenEJB](design.html)
-
-<a name="Design-Assembler-Definition"></a>
-## Definition
-
-Instantiates and assembles a configured, runnable, instance of the
-container system and all sub-components. Vendors needing extreme control
-over the construction of the container system can get it by implementing
-this class. Doing this comes with large amounts of resposibility and
-complexity and should not be done without a deep understanding of OpenEJB.
-
-<a name="Design-Assembler-Responsibilities"></a>
-## Responsibilities
- * Instantiate and initialize all Container implementations
- * Instantiate and initialize TransactionService implementation
- * Instantiate and initialize SecurityService implementation
- * Instantiate and initialize all ResourceManagers
- * Load all deployed beans
- * Populate each deployment's JNDI ENC
- * Populate the IntraVM Server's global, client, JNDI namespace
-
-<a name="Design-Assembler-RelatedPackages"></a>
-## Related Packages
- * org.apache.openejb.spi.Assembler
-
-<a name="Design-Assembler-Implementations"></a>
-## Implementations
- * [Classic Assembler](design-classic-assembler.html)
diff --git a/src/main/jbake/content/dev/design-bmp-entitybean-container.adoc b/src/main/jbake/content/dev/design-bmp-entitybean-container.adoc
new file mode 100644
index 0000000..c8dc518
--- /dev/null
+++ b/src/main/jbake/content/dev/design-bmp-entitybean-container.adoc
@@ -0,0 +1,20 @@
+= Design - BMP EntityBean Container
+:jbake-type: page
+:jbake-status: published
+
+== BMP EntityBean Container
+
+Implementation of xref:design-container.adoc[Container]
+
+== Description
+
+Container that implements the EJB defined bean-container contract for EntityBeans with bean-managed persistence.
+
+== Also Known As
+
+* BMP Entity Container
+* BMP Container
+
+== Related Classes
+
+* org.apache.openejb.core.entity.EntityContainer
diff --git a/src/main/jbake/content/dev/design-bmp-entitybean-container.md b/src/main/jbake/content/dev/design-bmp-entitybean-container.md
deleted file mode 100644
index 50e3811..0000000
--- a/src/main/jbake/content/dev/design-bmp-entitybean-container.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Title: Design - BMP EntityBean Container
-
-<a name="Design-BMPEntityBeanContainer-BMPEntityBeanContainer"></a>
-## BMP EntityBean Container
-
-Implementation of [Container](design-container.html)
-
-
-<a name="Design-BMPEntityBeanContainer-Description"></a>
-## Description
-
-Container that implements the EJB defined bean-container contract for
-EntityBeans with bean-managed persistence.
-
-<a name="Design-BMPEntityBeanContainer-AlsoKnownAs"></a>
-## Also Known As
- * BMP Entity Container
- * BMP Container
-
-<a name="Design-BMPEntityBeanContainer-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.core.entity.EntityContainer
-
diff --git a/src/main/jbake/content/dev/design-classic-assembler.adoc b/src/main/jbake/content/dev/design-classic-assembler.adoc
new file mode 100644
index 0000000..96fad54
--- /dev/null
+++ b/src/main/jbake/content/dev/design-classic-assembler.adoc
@@ -0,0 +1,26 @@
+= Design - Classic Assembler
+:jbake-type: page
+:jbake-status: published
+
+== Classic Assembler
+
+Implementation of xref:design-assembler.adoc[Assembler]
+
+== Description
+
+The standard assembler supported by the OpenEJB team.
+Uses meta-data supplied via the Configuration Factory to create all components in the system.
+It is assumed the meta-data has been checked and validated, all links and references will resolve, all classes are present, and all apps compliant.
+
+== Related Classes
+
+* org.apache.openejb.assembler.classic.Assembler
+* org.apache.openejb.assembler.classic.OpenEjbConfiguration
+
+== Related Packages
+
+* org.apache.openejb.assembler.classic
+
+== Sub-components
+
+* xref:design-configuration-factory.adoc[Configuration Factory]
diff --git a/src/main/jbake/content/dev/design-classic-assembler.md b/src/main/jbake/content/dev/design-classic-assembler.md
deleted file mode 100644
index 59a8162..0000000
--- a/src/main/jbake/content/dev/design-classic-assembler.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: Design - Classic Assembler
-
-<a name="Design-ClassicAssembler-ClassicAssembler"></a>
-## Classic Assembler
-
-Implementation of [Assembler](design-assembler.html)
-
-<a name="Design-ClassicAssembler-Description"></a>
-## Description
-
-The standard assembler supported by the OpenEJB team.  Uses meta-data
-supplied via the Configuration Factory to create all components in the
-system.  It is assumed the meta-data has been checked and validated, all
-links and references will resolve, all classes are present, and all apps
-compliant.
-
-<a name="Design-ClassicAssembler-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.assembler.classic.Assembler
- * org.apache.openejb.assembler.classic.OpenEjbConfiguration
-
-<a name="Design-ClassicAssembler-RelatedPackages"></a>
-## Related Packages
- * org.apache.openejb.assembler.classic
-
-<a name="Design-ClassicAssembler-Sub-components"></a>
-## Sub-components
- * [Configuration Factory](design-configuration-factory.html)
diff --git a/src/main/jbake/content/dev/design-cmp-entitybean-container.adoc b/src/main/jbake/content/dev/design-cmp-entitybean-container.adoc
new file mode 100644
index 0000000..b4f478f
--- /dev/null
+++ b/src/main/jbake/content/dev/design-cmp-entitybean-container.adoc
@@ -0,0 +1,21 @@
+= Design - CMP EntityBean Container
+:jbake-type: page
+:jbake-status: published
+
+== CMP EntityBean Container
+
+Implementation of xref:design-container.adoc[Container]
+
+== Description
+
+Container that implements the bean-container contract for CMP 1.1 and CMP 2.1 EntityBeans.
+The container adapts these old CMP EntityBeans to the new JPA Entity bean model and persists them using a JPA Persistence Provider.
+
+== Also Known As
+
+* CMP Entity Container
+* CMP Container
+
+== Formerly Known As
+
+* Castor Container
diff --git a/src/main/jbake/content/dev/design-cmp-entitybean-container.md b/src/main/jbake/content/dev/design-cmp-entitybean-container.md
deleted file mode 100644
index 5201676..0000000
--- a/src/main/jbake/content/dev/design-cmp-entitybean-container.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Title: Design - CMP EntityBean Container
-
-<a name="Design-CMPEntityBeanContainer-CMPEntityBeanContainer"></a>
-## CMP EntityBean Container
-
-Implementation of [Container](design-container.html)
-
-<a name="Design-CMPEntityBeanContainer-Description"></a>
-## Description
-
-Container that implements the bean-container contract for CMP 1.1 and CMP
-2.1 EntityBeans.  The container adapts these old CMP EntityBeans to the new
-JPA Entity bean model and persists them using a JPA Persistence Provider.
-
-<a name="Design-CMPEntityBeanContainer-AlsoKnownAs"></a>
-## Also Known As
- * CMP Entity Container
- * CMP Container
-
-<a name="Design-CMPEntityBeanContainer-FormerlyKnownAs"></a>
-## Formerly Known As
- * Castor Container
diff --git a/src/main/jbake/content/dev/design-configuration-factory.adoc b/src/main/jbake/content/dev/design-configuration-factory.adoc
new file mode 100644
index 0000000..d0e0add
--- /dev/null
+++ b/src/main/jbake/content/dev/design-configuration-factory.adoc
@@ -0,0 +1,33 @@
+= Design - Configuration Factory
+:jbake-type: page
+:jbake-status: published
+
+== Configuration Factory
+
+Sub-component of xref:design-classic-assembler.adoc[Classic Assembler]
+
+== Definition
+
+Creates an instance of the OpenEjbConfiguration class that contains all the data and configuration information the Classic assembler needs to construct the container system.
+The object structure in the OpenEjbConfiguration class is refered to as the InfoObjects.
+The Configuration Factory can construct, retreive, or populate the InfoObjects from any data source it chooses or by any means it chooses.
+
+== Also Known As
+
+* Config Factory
+* InfoObject Factory
+
+== Responsibilities
+
+* Creates an instance of the OpenEjbConfiguration
+* The data in the InfoObjects must be validated and accurately represent the system, services, jars, and beans to be constructed
+
+== Related Classes
+
+* org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory
+* org.apache.openejb.assembler.classic.OpenEjbConfiguration
+
+== Implementations
+
+* XML Configuration Factory _(no longer supported)_
+* xref:design-nova-configuration-factory.adoc[Nova Configuration Factory]
diff --git a/src/main/jbake/content/dev/design-configuration-factory.md b/src/main/jbake/content/dev/design-configuration-factory.md
deleted file mode 100644
index ba4b5a5..0000000
--- a/src/main/jbake/content/dev/design-configuration-factory.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Title: Design - Configuration Factory
-
-<a name="Design-ConfigurationFactory-ConfigurationFactory"></a>
-## Configuration Factory
-
-Sub-component of [Classic Assembler](design-classic-assembler.html)
-
-<a name="Design-ConfigurationFactory-Definition"></a>
-## Definition
-
-Creates an instance of the OpenEjbConfiguration class that contains all the
-data and configuration information the Classic assembler needs to construct
-the container system. The object structure in the OpenEjbConfiguration
-class is refered to as the InfoObjects. The Configuration Factory can
-construct, retreive, or populate the InfoObjects from any data source it
-chooses or by any means it chooses.
-
-<a name="Design-ConfigurationFactory-AlsoKnownAs"></a>
-## Also Known As
- * Config Factory
- * InfoObject Factory
-
-<a name="Design-ConfigurationFactory-Responsibilities"></a>
-## Responsibilities
- * Creates an instance of the OpenEjbConfiguration
- * The data in the InfoObjects must be validated and accurately represent
-the system, services, jars, and beans to be constructed
-
-<a name="Design-ConfigurationFactory-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory
- * org.apache.openejb.assembler.classic.OpenEjbConfiguration
-
-<a name="Design-ConfigurationFactory-Implementations"></a>
-## Implementations
- * XML Configuration Factory _(no longer supported)_
- * [Nova Configuration Factory](design-nova-configuration-factory.html)
-
diff --git a/src/main/jbake/content/dev/design-container.adoc b/src/main/jbake/content/dev/design-container.adoc
new file mode 100644
index 0000000..d0b6d23
--- /dev/null
+++ b/src/main/jbake/content/dev/design-container.adoc
@@ -0,0 +1,34 @@
+= Design - Container
+:jbake-type: page
+:jbake-status: published
+
+== Container
+
+Sub-component of xref:design.adoc[OpenEJB]
+
+== Definition
+
+An Enterprise JavaBeans container enforce the container-bean contract for an EJB 1.1, 2.0, 2.1 or 3.0 bean type.
+Containers for custom container-bean contracts can also be created.
+
+== Also Known As
+
+* Container Provider
+
+== Responsibilities
+
+* Adopt the OpenEJB architecture
+* Use the Transaction Manager assigned to the container system to assist in handling transactions
+* Use the Security Manager assigned to the container system to assist in enforcing security and privileges
+* Implement the org.apache.openejb.Container interface
+
+== Related Classes
+
+* org.apache.openejb.Container
+
+== Implementations
+
+* xref:design-stateful-sessionbean-container.adoc[Stateful SessionBean Container]
+* xref:design-stateless-sessionbean-container.adoc[Stateless SessionBean Container]
+* xref:design-bmp-entitybean-container.adoc[BMP EntityBean Container]
+* xref:design-cmp-entitybean-container.adoc[CMP EntityBean Container]
diff --git a/src/main/jbake/content/dev/design-container.md b/src/main/jbake/content/dev/design-container.md
deleted file mode 100644
index 1164cd0..0000000
--- a/src/main/jbake/content/dev/design-container.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Title: Design - Container
-<a name="Design-Container-Container"></a>
-## Container
-
-Sub-component of [OpenEJB](-design.html)
-
-<a name="Design-Container-Definition"></a>
-## Definition
-
-An Enterprise JavaBeans container enforce the container-bean contract for
-an EJB 1.1, 2.0, 2.1 or 3.0 bean type. Containers for custom container-bean
-contracts can also be created.
-
-<a name="Design-Container-AlsoKnownAs"></a>
-## Also Known As
- * Container Provider
-
-<a name="Design-Container-Responsibilities"></a>
-## Responsibilities
- * Adopt the OpenEJB architecture
- * Use the Transaction Manager assigned to the container system to assist
-in handling transactions
- * Use the Security Manager assigned to the container system to assist in
-enforcing security and privileges
- * Implement the org.apache.openejb.Container interface
-
-<a name="Design-Container-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.Container
-
-<a name="Design-Container-Implementations"></a>
-## Implementations
- * [Stateful SessionBean Container](design-stateful-sessionbean-container.html)
- * [Stateless SessionBean Container](design-stateless-sessionbean-container.html)
- * [BMP EntityBean Container](design-bmp-entitybean-container.html)
- * [CMP EntityBean Container](design-cmp-entitybean-container.html)
diff --git a/src/main/jbake/content/dev/design-local-server.adoc b/src/main/jbake/content/dev/design-local-server.adoc
new file mode 100644
index 0000000..36d096a
--- /dev/null
+++ b/src/main/jbake/content/dev/design-local-server.adoc
@@ -0,0 +1,23 @@
+= Design - Local Server
+:jbake-type: page
+:jbake-status: published
+
+== Local Server
+
+Implementation of xref:design-application-server.adoc[Application Server]
+
+
+== Description
+
+Allows for optimized interaction among beans and clients in the same virtual machine.
+
+
+== Also Known As
+
+* IntraVM
+* IntraVM Server
+
+
+== Related Packages
+
+* org.apache.openejb.core.ivm
diff --git a/src/main/jbake/content/dev/design-local-server.md b/src/main/jbake/content/dev/design-local-server.md
deleted file mode 100644
index fb1c833..0000000
--- a/src/main/jbake/content/dev/design-local-server.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Title: Design - Local Server
-<a name="Design-LocalServer-LocalServer"></a>
-## Local Server
-
-Implementation of [Application Server](design-application-server.html)
-
-<a name="Design-LocalServer-Description"></a>
-## Description
-
-Allows for optimized interaction among beans and clients in the same
-virtual machine.
-
-
-<a name="Design-LocalServer-AlsoKnownAs"></a>
-## Also Known As
- * IntraVM
- * IntraVM Server
-
-<a name="Design-LocalServer-RelatedPackages"></a>
-## Related Packages
- * org.apache.openejb.core.ivm
diff --git a/src/main/jbake/content/dev/design-local-serverlinks.adoc b/src/main/jbake/content/dev/design-local-serverlinks.adoc
new file mode 100644
index 0000000..5b4d636
--- /dev/null
+++ b/src/main/jbake/content/dev/design-local-serverlinks.adoc
@@ -0,0 +1,5 @@
+= Design - Local ServerLinks
+:jbake-type: page
+:jbake-status: published
+
+include::design-application-serverlinks.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/dev/design-local-serverlinks.md b/src/main/jbake/content/dev/design-local-serverlinks.md
deleted file mode 100644
index 7d5ce94..0000000
--- a/src/main/jbake/content/dev/design-local-serverlinks.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Title: Design - Local ServerLinks
-{include:Design - Application ServerLinks}
diff --git a/src/main/jbake/content/dev/design-nova-configuration-factory.adoc b/src/main/jbake/content/dev/design-nova-configuration-factory.adoc
new file mode 100644
index 0000000..cc9f47b
--- /dev/null
+++ b/src/main/jbake/content/dev/design-nova-configuration-factory.adoc
@@ -0,0 +1,24 @@
+= Design - Nova Configuration Factory
+:jbake-type: page
+:jbake-status: published
+
+== Nova Configuration Factory
+
+Implementation of xref:design-configuration-factory.adoc[Configuration Factory]
+
+== Description
+
+Populates an OpenEjbConfiguration object by combining the data from an openejb.xml file, the ejb-jar.xml and openejb-jar.xml from deployed bean jars, and service-jar.xml containing OpenEJB service implementations.
+
+== Also Known As
+
+* New Configuration Factory
+* Modular Configuration Factory
+
+== Related Classes
+
+* org.apache.openejb.config.ConfigurationFactory
+
+== Related Packages
+
+* org.apache.openejb.alt.config
diff --git a/src/main/jbake/content/dev/design-nova-configuration-factory.md b/src/main/jbake/content/dev/design-nova-configuration-factory.md
deleted file mode 100644
index af18a44..0000000
--- a/src/main/jbake/content/dev/design-nova-configuration-factory.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: Design - Nova Configuration Factory
-
-<a name="Design-NovaConfigurationFactory-NovaConfigurationFactory"></a>
-## Nova Configuration Factory
-
-Implementation of [Configuration Factory](design-configuration-factory.html)
-
-<a name="Design-NovaConfigurationFactory-Description"></a>
-## Description
-
-Populates an OpenEjbConfiguration object by combining the data from an
-openejb.xml file, the ejb-jar.xml and openejb-jar.xml from deployed bean
-jars, and service-jar.xml containing OpenEJB service implementations.
-
-
-<a name="Design-NovaConfigurationFactory-AlsoKnownAs"></a>
-## Also Known As
- * New Configuration Factory
- * Modular Configuration Factory
-
-<a name="Design-NovaConfigurationFactory-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.config.ConfigurationFactory
-
-<a name="Design-NovaConfigurationFactory-RelatedPackages"></a>
-## Related Packages
- * org.apache.openejb.alt.config
-
diff --git a/src/main/jbake/content/dev/design-passivation-strategy.adoc b/src/main/jbake/content/dev/design-passivation-strategy.adoc
new file mode 100644
index 0000000..97b76bd
--- /dev/null
+++ b/src/main/jbake/content/dev/design-passivation-strategy.adoc
@@ -0,0 +1,24 @@
+= Design - Passivation Strategy
+:jbake-type: page
+:jbake-status: published
+
+== Passivation Strategy
+
+Sub-component of xref:design-stateful-sessionbean-container.adoc[Stateful SessionBean Container]
+
+== Definition
+
+Used by the Stateful Container to passivate and activate stateful session beans to a temporary storage.
+
+== Responsibilities
+
+* Store and retrieve instances
+
+== Related Classes
+
+* org.apache.openejb.core.stateful.PassivationStrategy
+
+== Implementations
+
+* xref:design-random-access-file-passivater.adoc[Random Access File Passivater]
+* xref:design-simple-passivater.adoc[Simple Passivater]
diff --git a/src/main/jbake/content/dev/design-passivation-strategy.md b/src/main/jbake/content/dev/design-passivation-strategy.md
deleted file mode 100644
index 5ceb9bd..0000000
--- a/src/main/jbake/content/dev/design-passivation-strategy.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Title: Design - Passivation Strategy
-<a name="Design-PassivationStrategy-PassivationStrategy"></a>
-## Passivation Strategy
-
-Sub-component of [Stateful SessionBean Container](design-stateful-sessionbean-container.html)
-
-
-<a name="Design-PassivationStrategy-Definition"></a>
-## Definition
-
-Used by the Stateful Container to passivate and activate stateful session
-beans to a temporary storage.
-
-
-<a name="Design-PassivationStrategy-Responsibilities"></a>
-## Responsibilities
- * Store and retrieve instances
-
-<a name="Design-PassivationStrategy-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.core.stateful.PassivationStrategy
-
-<a name="Design-PassivationStrategy-Implementations"></a>
-## Implementations
- * [Random Access File Passivater](design-random-access-file-passivater.html)
- * [Simple Passivater](design-simple-passivater.html)
diff --git a/src/main/jbake/content/dev/design-random-access-file-passivater.adoc b/src/main/jbake/content/dev/design-random-access-file-passivater.adoc
new file mode 100644
index 0000000..08d42a1
--- /dev/null
+++ b/src/main/jbake/content/dev/design-random-access-file-passivater.adoc
@@ -0,0 +1,19 @@
+= Design - Random Access File Passivater
+:jbake-type: page
+:jbake-status: published
+
+== Random Access File Passivater
+
+Implementation of xref:design-passivation-strategy.adoc[Passivation Strategy]
+
+== Description
+
+A PassivationStrategy that bulk passivates bean instances to a random access file.
+
+== Also Known As
+
+* RAF Passivater
+
+== Related Classes
+
+* org.apache.openejb.core.stateful.RAFPassivater
diff --git a/src/main/jbake/content/dev/design-random-access-file-passivater.md b/src/main/jbake/content/dev/design-random-access-file-passivater.md
deleted file mode 100644
index 2a2eb37..0000000
--- a/src/main/jbake/content/dev/design-random-access-file-passivater.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Title: Design - Random Access File Passivater
-
-<a name="Design-RandomAccessFilePassivater-RandomAccessFilePassivater"></a>
-## Random Access File Passivater
-
-Implementation of [Passivation Strategy](design-passivation-strategy.html)
-
-<a name="Design-RandomAccessFilePassivater-Description"></a>
-## Description
-
-A PassivationStrategy that bulk passivates bean instances to a random
-access file.
-
-<a name="Design-RandomAccessFilePassivater-AlsoKnownAs"></a>
-## Also Known As
- * RAF Passivater
-
-<a name="Design-RandomAccessFilePassivater-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.core.stateful.RAFPassivater
diff --git a/src/main/jbake/content/dev/design-remote-server.adoc b/src/main/jbake/content/dev/design-remote-server.adoc
new file mode 100644
index 0000000..cd87018
--- /dev/null
+++ b/src/main/jbake/content/dev/design-remote-server.adoc
@@ -0,0 +1,30 @@
+= Design - Remote Server
+:jbake-type: page
+:jbake-status: published
+
+== Remote Server
+
+Implementation of xref:design-application-server.adoc[Application Server]
+
+== Description
+
+Distributes EJB interface implementations to remote clients using a conversational serialization-based protocol.
+
+== Also Known As
+
+* EJBd Protocol
+
+== Related Classes
+
+* org.apache.openejb.server.EjbDaemon
+
+== Related Packages
+
+* org.apache.openejb.client
+* org.apache.openejb.server
+
+== Required Libraries
+
+* openejb-server-3.0.x.jar
+* openejb-ejbd-3.0.x.jar
+* openejb-client-3.0.x.jar
diff --git a/src/main/jbake/content/dev/design-remote-server.md b/src/main/jbake/content/dev/design-remote-server.md
deleted file mode 100644
index 47eb1f1..0000000
--- a/src/main/jbake/content/dev/design-remote-server.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Title: Design - Remote Server
-<a name="Design-RemoteServer-RemoteServer"></a>
-## Remote Server
-
-Implementation of [Application Server](design-application-server.html)
-
-<a name="Design-RemoteServer-Description"></a>
-## Description
-
-Distributes EJB interface implementations to remote clients using a
-conversational serialization-based protocol.
-
-<a name="Design-RemoteServer-AlsoKnownAs"></a>
-## Also Known As
- * EJBd Protocol
-
-<a name="Design-RemoteServer-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.server.EjbDaemon
-
-<a name="Design-RemoteServer-RelatedPackages"></a>
-## Related Packages
- * org.apache.openejb.client
- * org.apache.openejb.server
-
-<a name="Design-RemoteServer-RequiredLibraries"></a>
-## Required Libraries
- * openejb-server-3.0.x.jar
- * openejb-ejbd-3.0.x.jar
- * openejb-client-3.0.x.jar
-
diff --git a/src/main/jbake/content/dev/design-remote-serverlinks.adoc b/src/main/jbake/content/dev/design-remote-serverlinks.adoc
new file mode 100644
index 0000000..1ed9a97
--- /dev/null
+++ b/src/main/jbake/content/dev/design-remote-serverlinks.adoc
@@ -0,0 +1,5 @@
+= Design - Remote ServerLinks
+:jbake-type: page
+:jbake-status: published
+
+include::design-application-serverlinks.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/dev/design-remote-serverlinks.md b/src/main/jbake/content/dev/design-remote-serverlinks.md
deleted file mode 100644
index 6c85052..0000000
--- a/src/main/jbake/content/dev/design-remote-serverlinks.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Title: Design - Remote ServerLinks
-{include:Design - Application ServerLinks}
diff --git a/src/main/jbake/content/dev/design-resource-manager.adoc b/src/main/jbake/content/dev/design-resource-manager.adoc
new file mode 100644
index 0000000..4256f73
--- /dev/null
+++ b/src/main/jbake/content/dev/design-resource-manager.adoc
@@ -0,0 +1,25 @@
+= Design - Resource Manager
+:jbake-type: page
+:jbake-status: published
+
+== Resource Manager
+
+Sub-component of xref:-design.adoc[OpenEJB]
+
+== Definition
+
+Provides the container with managed connections to transactional data sources required by beans
+
+== Also Known As
+
+* Connector
+* Connection Manager
+
+== Responsibilities
+
+* Provides beans with connection handles
+* Manages pysical connections
+
+== Related Packages
+
+* javax.resource.spi
diff --git a/src/main/jbake/content/dev/design-resource-manager.md b/src/main/jbake/content/dev/design-resource-manager.md
deleted file mode 100644
index 9d601aa..0000000
--- a/src/main/jbake/content/dev/design-resource-manager.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Title: Design - Resource Manager
-
-<a name="Design-ResourceManager-ResourceManager"></a>
-## Resource Manager
-
-Sub-component of [OpenEJB](-design.html)
-
-
-<a name="Design-ResourceManager-Definition"></a>
-## Definition
-
-Provides the container with managed connections to transactional data
-sources required by beans
-
-
-<a name="Design-ResourceManager-AlsoKnownAs"></a>
-## Also Known As
- * Connector
- * Connection Manager
-
-<a name="Design-ResourceManager-Responsibilities"></a>
-## Responsibilities
- * Provides beans with connection handles
- * Manages pysical connections
-
-<a name="Design-ResourceManager-RelatedPackages"></a>
-## Related Packages
- * javax.resource.spi
-
diff --git a/src/main/jbake/content/dev/design-security-service.adoc b/src/main/jbake/content/dev/design-security-service.adoc
new file mode 100644
index 0000000..0211c10
--- /dev/null
+++ b/src/main/jbake/content/dev/design-security-service.adoc
@@ -0,0 +1,25 @@
+= Design - Security Service
+:jbake-type: page
+:jbake-status: published
+
+== Security Service
+
+Sub-component of xref:-design.adoc[OpenEJB]
+
+== Definition
+
+Provides the container with an authenticated client identity.
+
+== Also Known As
+
+* Security Provider
+
+== Responsibilities
+
+* Authenticate the user in an implementation specific way
+* Provides OpenEJB a reference to the current security identity of the client
+* Assists OpenEJB with role-based authorization control
+
+== Related Classes
+
+* org.apache.openejb.spi.SecurityService
diff --git a/src/main/jbake/content/dev/design-security-service.md b/src/main/jbake/content/dev/design-security-service.md
deleted file mode 100644
index aade92a..0000000
--- a/src/main/jbake/content/dev/design-security-service.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Title: Design - Security Service
-<a name="Design-SecurityService-SecurityService"></a>
-## Security Service
-
-Sub-component of [OpenEJB](-design.html)
-
-
-<a name="Design-SecurityService-Definition"></a>
-## Definition
-
-Provides the container with an authenticated client identity.
-
-<a name="Design-SecurityService-AlsoKnownAs"></a>
-## Also Known As
- * Security Provider
-
-<a name="Design-SecurityService-Responsibilities"></a>
-## Responsibilities
- * Authenticate the user in an implementation specific way
- * Provides OpenEJB a reference to the current security identity of the
-client
- * Assists OpenEJB with role-based authorization control
-
-<a name="Design-SecurityService-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.spi.SecurityService
-
diff --git a/src/main/jbake/content/dev/design-simple-passivater.adoc b/src/main/jbake/content/dev/design-simple-passivater.adoc
new file mode 100644
index 0000000..62cbf30
--- /dev/null
+++ b/src/main/jbake/content/dev/design-simple-passivater.adoc
@@ -0,0 +1,15 @@
+= Design - Simple Passivater
+:jbake-type: page
+:jbake-status: published
+
+== Simple Passivater
+
+Implementation of xref:design-passivation-strategy.adoc[Passivation Strategy]
+
+== Description
+
+A PassivationStrategy that idividually passivates bean instances to a binary file.
+
+== Related Classes
+
+* org.apache.openejb.core.stateful.SimplePassivater
diff --git a/src/main/jbake/content/dev/design-simple-passivater.md b/src/main/jbake/content/dev/design-simple-passivater.md
deleted file mode 100644
index 1d47a83..0000000
--- a/src/main/jbake/content/dev/design-simple-passivater.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Title: Design - Simple Passivater
-
-<a name="Design-SimplePassivater-SimplePassivater"></a>
-## Simple Passivater
-
-Implementation of [Passivation Strategy](design-passivation-strategy.html)
-
-
-<a name="Design-SimplePassivater-Description"></a>
-## Description
-
-A PassivationStrategy that idividually passivates bean instances to a
-binary file.
-
-
-<a name="Design-SimplePassivater-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.core.stateful.SimplePassivater
diff --git a/src/main/jbake/content/dev/design-stateful-sessionbean-container.adoc b/src/main/jbake/content/dev/design-stateful-sessionbean-container.adoc
new file mode 100644
index 0000000..d06ddb2
--- /dev/null
+++ b/src/main/jbake/content/dev/design-stateful-sessionbean-container.adoc
@@ -0,0 +1,24 @@
+= Design - Stateful SessionBean Container
+:jbake-type: page
+:jbake-status: published
+
+== Stateful SessionBean Container
+
+Implementation of xref:design-container.adoc[Container]
+
+== Description
+
+Container that implements the EJB defined bean-container contract for Stateful SessionBeans.
+
+== Also Known As
+
+* Stateful Session Container
+* Stateful Container
+
+== Related Classes
+
+* org.apache.openejb.core.stateful.StatefulContainer
+
+== Sub-components
+
+* xref:design-passivation-strategy.adoc[Passivation Strategy]
diff --git a/src/main/jbake/content/dev/design-stateful-sessionbean-container.md b/src/main/jbake/content/dev/design-stateful-sessionbean-container.md
deleted file mode 100644
index 409495b..0000000
--- a/src/main/jbake/content/dev/design-stateful-sessionbean-container.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Title: Design - Stateful SessionBean Container
-<a name="Design-StatefulSessionBeanContainer-StatefulSessionBeanContainer"></a>
-## Stateful SessionBean Container
-
-Implementation of [Container](design-container.html)
-
-<a name="Design-StatefulSessionBeanContainer-Description"></a>
-## Description
-
-Container that implements the EJB defined bean-container contract for
-Stateful SessionBeans.
-
-<a name="Design-StatefulSessionBeanContainer-AlsoKnownAs"></a>
-## Also Known As
- * Stateful Session Container
- * Stateful Container
-
-<a name="Design-StatefulSessionBeanContainer-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.core.stateful.StatefulContainer
-
-<a name="Design-StatefulSessionBeanContainer-Sub-components"></a>
-## Sub-components
- * [Passivation Strategy](design-passivation-strategy.html)
diff --git a/src/main/jbake/content/dev/design-stateless-sessionbean-container.adoc b/src/main/jbake/content/dev/design-stateless-sessionbean-container.adoc
new file mode 100644
index 0000000..cf7fcae
--- /dev/null
+++ b/src/main/jbake/content/dev/design-stateless-sessionbean-container.adoc
@@ -0,0 +1,20 @@
+= Design - Stateless SessionBean Container
+:jbake-type: page
+:jbake-status: published
+
+== Stateless SessionBean Container
+
+Implementation of xref:design-container.adoc[Container]
+
+== Description
+
+Container that implements the EJB defined bean-container contract for stateless SessionBeans.
+
+== Also Known As
+
+* Stateless Session Container
+* Stateless Container
+
+== Related Classes
+
+* org.apache.openejb.core.stateless.StatelessContainer
diff --git a/src/main/jbake/content/dev/design-stateless-sessionbean-container.md b/src/main/jbake/content/dev/design-stateless-sessionbean-container.md
deleted file mode 100644
index 52a9111..0000000
--- a/src/main/jbake/content/dev/design-stateless-sessionbean-container.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Title: Design - Stateless SessionBean Container
-
-<a name="Design-StatelessSessionBeanContainer-StatelessSessionBeanContainer"></a>
-## Stateless SessionBean Container
-
-Implementation of [Container](design-container.html)
-
-<a name="Design-StatelessSessionBeanContainer-Description"></a>
-## Description
-
-Container that implements the EJB defined bean-container contract for
-stateless SessionBeans.
-
-<a name="Design-StatelessSessionBeanContainer-AlsoKnownAs"></a>
-## Also Known As
- * Stateless Session Container
- * Stateless Container
-
-<a name="Design-StatelessSessionBeanContainer-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.core.stateless.StatelessContainer
-
diff --git a/src/main/jbake/content/dev/design-transaction-service.adoc b/src/main/jbake/content/dev/design-transaction-service.adoc
new file mode 100644
index 0000000..1c7694f
--- /dev/null
+++ b/src/main/jbake/content/dev/design-transaction-service.adoc
@@ -0,0 +1,24 @@
+= Design - Transaction Service
+:jbake-type: page
+:jbake-status: published
+
+== Transaction Service
+
+Sub-component of xref:design.adoc[OpenEJB]
+
+== Definition
+
+Provides the container with transactional integrity.
+
+== Also Known As
+
+* Transaction Manager
+
+== Responsibilities
+
+* To give OpenEJB a reference to a valid implementation of javax.transaction.TransactionManager
+
+== Related Classes
+
+* org.apache.openejb.spi.TransactionService
+* javax.transaction.TransactionManager
diff --git a/src/main/jbake/content/dev/design-transaction-service.md b/src/main/jbake/content/dev/design-transaction-service.md
deleted file mode 100644
index d314680..0000000
--- a/src/main/jbake/content/dev/design-transaction-service.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: Design - Transaction Service
-
-<a name="Design-TransactionService-TransactionService"></a>
-## Transaction Service
-
-Sub-component of [OpenEJB](design.html)
-
-
-<a name="Design-TransactionService-Definition"></a>
-## Definition
-
-Provides the container with transactional integrity.
-
-
-<a name="Design-TransactionService-AlsoKnownAs"></a>
-## Also Known As
- * Transaction Manager
-
-<a name="Design-TransactionService-Responsibilities"></a>
-## Responsibilities
- * To give OpenEJB a reference to a valid implementation of
-javax.transaction.TransactionManager
-
-<a name="Design-TransactionService-RelatedClasses"></a>
-## Related Classes
- * org.apache.openejb.spi.TransactionService
- * javax.transaction.TransactionManager
-
diff --git a/src/main/jbake/content/dev/design.adoc b/src/main/jbake/content/dev/design.adoc
new file mode 100644
index 0000000..232b4ca
--- /dev/null
+++ b/src/main/jbake/content/dev/design.adoc
@@ -0,0 +1,43 @@
+= Design
+:jbake-type: page
+:jbake-status: published
+
+== OpenEJB
+
+System Design
+
+
+== Definition
+
+A modular, configurable, customizable, embeddable open source EJB container system
+
+
+== Also Known As
+
+* container system
+
+
+== Responsibilities
+
+* Implement EJB 3.0 Specification
+
+
+== Related Classes
+
+* org.apache.openejb.OpenEJB
+
+
+== Required Libraries
+
+* openejb-javaagent-3.0.x.jar
+* openejb-jee-3.0.x.jar
+* openejb-core-3.0.x.jar
+
+== Sub-components
+
+* xref:design-application-server.adoc[Application Server]
+* xref:design-transaction-service.adoc[Transaction Service]
+* xref:design-security-service.adoc[Security Service]
+* xref:design-resource-manager.adoc[Resource Manager]
+* xref:design-container.adoc[Container]
+* xref:design-assembler.adoc[Assembler]
diff --git a/src/main/jbake/content/dev/design.md b/src/main/jbake/content/dev/design.md
deleted file mode 100644
index 72c830c..0000000
--- a/src/main/jbake/content/dev/design.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Title: Design
-<a name="Design-OpenEJB"></a>
-## OpenEJB
-System Design
-
-<a name="Design-Definition"></a>
-## Definition
-A modular, configurable, customizable, embeddable open source EJB container
-system
-
-<a name="Design-AlsoKnownAs"></a>
-## Also Known As
-* container system
-
-<a name="Design-Responsibilities"></a>
-## Responsibilities
-* Implement EJB 3.0 Specification
-
-<a name="Design-RelatedClasses"></a>
-## Related Classes
-* org.apache.openejb.OpenEJB
-
-<a name="Design-RequiredLibraries"></a>
-## Required Libraries
-* openejb-javaagent-3.0.x.jar
-* openejb-jee-3.0.x.jar
-* openejb-core-3.0.x.jar
-
-<a name="Design-Sub-components"></a>
-## Sub-components
-* [Application Server](design-application-server.html)
-* [Transaction Service](design-transaction-service.html)
-* [Security Service](design-security-service.html)
-* [Resource Manager](design-resource-manager.html)
-* [Container](design-container.html)
-* [Assembler](design-assembler.html)
-
diff --git a/src/main/jbake/content/dev/git.adoc b/src/main/jbake/content/dev/git.adoc
new file mode 100644
index 0000000..a89b715
--- /dev/null
+++ b/src/main/jbake/content/dev/git.adoc
@@ -0,0 +1,108 @@
+= GIT for TomEE Developers
+:jbake-type: page
+:jbake-status: published
+
+== The GitFlow Workflow
+
+Notes before you begin (mostly for SVN users):
+
+* The '_develop_' repository is the equivalent of the SVN _trunk_ directory.
+* The '_master_' repository is the equivalent of the SVN _tags_ directory.
+* The '_origin_' is the actual GIT repository that contains the projects _master_, _develop_ and other branches (Like trunk, branches and tags).
+* Unlike SVN a 'commit' is only a local action.
+The local commits are only published to the remote repository using 'push'.
+* Commit and push code to your own feature branch as often as you like, but only merge stable branches back into to the _develop_ branch.
+* Only the release manager should manage the _master_ repository
+* Read the official Apache Committer documentation https://gitbox.apache.org/#committers-getting-started[here]
+
+Run commands in the directory of the project you are working on, for example 'tomee':
+
+Always create a feature branch from _develop_ using an '_extremely_' descriptive name, this should usually be the https://issues.apache.org/jira/browse/TOMEE[JIRA] id or task name you want to work on:
+
+----
+git checkout -b TOMEE-007 develop
+
+Switched to a new branch 'TOMEE-007'
+----
+
+----
+git status
+
+nothing to commit, working directory clean
+----
+
+Immediately push the new branch to the repository so everyone can see it remotely (and possibly collaborate):
+
+----
+git push -u origin TOMEE-007
+
+Branch TOMEE-007 set up to track remote branch TOMEE-007 from origin.
+----
+
+Once that is done then you just need the simple push for subsequent calls on this branch:
+
+----
+git push
+----
+
+Work like mad on the JIRA issue calling commit and add as often as you like...
+
+If others are working on your branch also remember to pull their changes (Or just as good practice):
+
+----
+git pull
+
+git commit
+
+git push
+----
+
+Finally, to push the completed (or significant non-breaking progress on the) feature to _develop_ at any time (ensuring _develop_ is up to date first):
+
+----
+git pull origin develop
+----
+
+----
+git checkout develop
+----
+
+----
+git merge --no-ff TOMEE-007
+----
+
+Once the completed feature is merged and the JIRA resolved then the branch can and 'should' be deleted before pushing:
+
+----
+git branch -d TOMEE-007
+----
+
+----
+git push origin develop
+----
+
+== The GUI Way
+
+Now we have learned to do it the hard way, time to look at the simplified version.
+The GitHub native tools!
+
+For the latest mac version go here: https://mac.github.com/[Mac Latest],
+
+And windows here: https://windows.github.com/[Win Latest]
+
+These tools will probably not save you much time over the command line, but provide a much better visualization of ongoing processes.
+
+The steps are and remain as described above:
+
+. From _develop_ create a new branch called, for example TOMEE-007
+. 'Publish' (push -u) the new branch
+. Work on the branch and commit regularly
+. Synchronize (pull and push) changes in the the branch when stable
+. Switch to _develop_ and synchronize (pull)
+. Merge the branch into _develop_, i.e. 'TOMEE-007' + 'develop'  = 'develop' *See note below
+. Commit _develop_
+. Synchronize _develop_ (pull and push)
+. Delete the branch TOMEE-007
+
+NOTE: You can actually merge the current *develop_ (or any other 'synchronized' branch) into your branch first to make sure it is stable,i.e.
+'develop' + 'TOMEE-007' = 'TOMEE-007' - This is really cool!
diff --git a/src/main/jbake/content/dev/git.md b/src/main/jbake/content/dev/git.md
deleted file mode 100644
index 2e94bbe..0000000
--- a/src/main/jbake/content/dev/git.md
+++ /dev/null
@@ -1,85 +0,0 @@
-Title: GIT for TomEE Developers
-
-###The GitFlow Workflow
-
-Notes before you begin (mostly for SVN users):
-
-* The '*develop*' repository is the equivalent of the SVN *trunk* directory.  
-* The '*master*' repository is the equivalent of the SVN *tags* directory.    
-* The '*origin*' is the actual GIT repository that contains the projects *master*, *develop* and other branches (Like trunk, branches and tags).  
-* Unlike SVN a 'commit' is only a local action. The local commits are only published to the remote repository using 'push'.  
-* Commit and push code to your own feature branch as often as you like, but only merge stable branches back into to the *develop* branch.  
-* Only the release manager should manage the *master* repository
-* Read the official Apache Committer documentation [here](https://gitbox.apache.org/#committers-getting-started)
-
-<span style="color: rgb(128,0,0);">Run commands in the directory of the project you are working on, for example 'tomee':</span>
-
-Always create a feature branch from *develop* using an '*extremely*' descriptive name, this should usually be the [JIRA](https://issues.apache.org/jira/browse/TOMEE) id or task name you want to work on:
-
-><span style="color: rgb(51,51,153);">git checkout -b TOMEE-007 develop</span>
->
->Switched to a new branch 'TOMEE-007'  
-
-
-><span style="color: rgb(51,51,153);">git status</span>
->
->nothing to commit, working directory clean
-
- Immediately push the new branch to the repository so everyone can see it remotely (and possibly collaborate):
-
-><span style="color: rgb(51,51,153);">git push -u origin TOMEE-007</span>
->
->Branch TOMEE-007 set up to track remote branch TOMEE-007 from origin.
-
-Once that is done then you just need the simple push for subsequent calls on this branch:
-
-><span style="color: rgb(51,51,153);">git push</span>
-
-<span style="color: rgb(0,128,0);">Work like mad on the JIRA issue calling commit and add as often as you like...</span>
-
-If others are working on your branch also remember to pull their changes (Or just as good practice):
-
-><span style="color: rgb(51,51,153);">git pull</span>
->
-><span style="color: rgb(51,51,153);">git commit</span>
->
-><span style="color: rgb(51,51,153);">git push</span>
-
-Finally, to push the completed (or significant non-breaking progress on the) feature to *develop* at any time (ensuring *develop* is up to date first):
-
-><span style="color: rgb(51,51,153);">git pull origin develop</span>
-
-><span style="color: rgb(51,51,153);">git checkout develop</span>
-
-><span style="color: rgb(51,51,153);">git merge --no-ff TOMEE-007</span>
-
-Once the completed feature is merged and the JIRA resolved then the branch can and 'should' be deleted before pushing:
-
-><span style="color: rgb(51,51,153);">git branch -d TOMEE-007</span>
-
-><span style="color: rgb(51,51,153);">git push origin develop</span>
-
-<a name="git-gui"></a>
-###The GUI Way
-
-Now we have learned to do it the hard way, time to look at the simplified version. The GitHub native tools!
-
-For the latest mac version go here: [Mac Latest](https://mac.github.com/), 
-
-And windows here: [Win Latest](https://windows.github.com/)
-
-These tools will probably not save you much time over the command line, but provide a much better visualization of ongoing processes.
-
-The steps are and remain as described above:
-
-1. From *develop* create a new branch called, for example TOMEE-007
-1. 'Publish' (push -u) the new branch
-1. Work on the branch and commit regularly
-1. Synchronize (pull and push) changes in the the branch when stable
-1. Switch to *develop* and synchronize (pull)
-1. Merge the branch into *develop*, i.e. 'TOMEE-007' + 'develop'  = 'develop' <span style="color: rgb(255,102,0);">*See note below</span>
-1. Commit *develop*
-1. Synchronize *develop* (pull and push)
-1. Delete the branch TOMEE-007
-
-<span style="color: rgb(255,102,0);">*Note</span>: You can actually merge the current *develop* (or any other 'synchronized' branch) into your branch first to make sure it is stable,i.e. 'develop' + 'TOMEE-007' = 'TOMEE-007' - This is really cool!
\ No newline at end of file
diff --git a/src/main/jbake/content/dev/itests-overview.adoc b/src/main/jbake/content/dev/itests-overview.adoc
new file mode 100644
index 0000000..98a1e98
--- /dev/null
+++ b/src/main/jbake/content/dev/itests-overview.adoc
@@ -0,0 +1,70 @@
+= iTests Overview
+:jbake-type: page
+:jbake-status: published
+
+== Motivation
+
+The basic idea behind itests that makes them slightly different than plain junit tests ran by maven is that it's assumed that there are other systems (servers, databases, brokers, etc) that need to be started or connected to before the tests can run.
+The tests themselves don't setup the other systems themselves so that the tests don't become coupled with them and you can actually swap out various aspects of those systems behind the back of the tests;
+server version, protocol implementation, java version, VM implementation, database provider, operating systems, even using embedded servers and embedded databases.
+
+The idea came from the tests in OpenEJB that do this.
+It took a lot of work to get them to run as part of the maven build and the itest plugin was the result.
+
+Definitely give those a look at:  http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/
+
+== Plugging in
+
+You can have systems started and stopped before and after the tests in a number of ways.
+
+=== In maven 1
+
+This series of articles established a basic technique for Container Driven Testing with Maven and OpenEJB using preGoals and postGoals to do server and databse setup and teardown before and after Maven runs the unit tests.
+http://www.theserverside.com/articles/article.tss?l=ContainerDrivenTestingSeries
+
+This concept evolved from OpenEJB into a reusable maven plugin created by Dain Sundstrom that gave these integration tests (itests) their own source directory and added itest:setup and itest:teardown goals to your maven build rather than just using a preGoal on "test:test" for setup and a postGoal on "test:test" for teardown.
+The advantage to the new goals is that maven does not call any postGoals on "test:test" if the tests failed;
+something the above series of articles hacked around with an odd bit of jelly code.
+
+The new itest plugin was checked into Geronimo with the expectation that Geronimo would also use it.
+After some time of OpenEJB still being the only consumer of it, it was moved into the Maven repository where they keep it in the Maven sandbox.
+
+http://maven.apache.org/plugins-sandbox/itest/
+
+ActiveMQ later started using the itest plugin and now has a large suite of their own JMS specific integration tests.
+
+=== In maven 2
+
+The concept of integration tests (itests) has been built into the lifecycle of maven 2, so it is no longer required to have the itest plugin around to get the extra "itest:setup" and "itest:teardown" goals.
+See this document for more info:  http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
+
+=== In junit setup and teardown
+
+The ejb tests in particular require you to plug in facades for the server and the database so the client (the tests) can say "give me an initial context" or "create these tables i need" in a generic way.
+It's assumed that those systems were setup and guaranteed in working state in the itest setup phase.
+It's also guaranteed that the server and database facades know how to contact the server or database to carry out the "give me an initial context" and "create these tables" calls.
+
+Here are some implementations of the database provider for reference:   - http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/AxionTestDatabase.java   - http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/DerbyTestDatabase.java   - http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/InstantDbTestDatabase.java   - http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/PostgreSqlTestDatabase.java
+
+Here are some implementations for the server facades:   - http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/CorbaTestServer.java   - http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/RemoteTestServer.java   - http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/IvmTestServer.java   - http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/RiTestServer.java
+
+Using the itest concept you could setup any system you need before hand, then just provide an abstraction of that system to the actual tests.
+So it's not limited to just a server or a database.
+You could do queue, topic, clustering heartbeat agent, directory server, etc.
+
+== Testing matrix
+
+Even with just what we have we can get quite far.
+In a perfect world, we would actually test against the full matrix:
+
+Server: Local, Database: Axion   Server: Local, Database: Derby   Server: Local, Database: PostgreSQL   Server: Remote, Database: Axion   Server: Remote, Database: Derby   Server: Remote, Database: PostgreSQL   Server: Corba, Database: Axion   Server: Corba, Database: Derby   Server: Corba, Database: PostgreSQL
+
+We had that going for a short while years ago but it was just too much infrastructure for me to keep running.
+It would be nice to get Oracle and MySQL in that list as well.
+
+In an even more perfect world we'd test against not just different Server and Database combinations, but JVM versions as well.
+
+Server: Local, Database: Axion, JVM: 1.3   Server: Local, Database: Axion, JVM: 1.4   Server: Local, Database: Axion, JVM: 1.5   Server: Local, Database: Derby, JVM: 1.3   Server: Local, Database: Derby, JVM: 1.4   Server: Local, Database: Derby, JVM: 1.5   Server: Local, Database: PostgreSQL, JVM: 1.3   Server: Local, Database: PostgreSQL, JVM: 1.4   Server: Local, Database: PostgreSQL, JVM: 1.5   Server: Remote, Database: Axion, JVM: 1.3   Server: Remote, Database: Axion, JVM: 1.4   Server: Remote, Database: Axion, JVM: 1.5   Server: Remote, Database: Derby, JVM: 1.3   Server: Remote, Database: Derby, JVM: 1.4   Server: Remote, Database: Derby, JVM: 1.5   Server: Remote, Database: PostgreSQL, JVM: 1.3   Server: Remote, Database: PostgreSQL, JVM: 1.4   Server: Remote, Database: PostgreSQL, JVM: 1.5   Server: Corba, Database: Axion, JVM: 1.3   Server: Corba, Database: Axion, JVM: 1.4   Server: Corba, Database: Axion, JVM: 1.5   Server: Corba, Database: Derby, JVM: 1.3   Server: Corba, Database: Derby, JVM: 1.4   Server: Corba, Database: Derby, JVM: 1.5   Server: Corba, Database: PostgreSQL, JVM: 1.3   Server: Corba, Database: PostgreSQL, JVM: 1.4   Server: Corba, Database: PostgreSQL, JVM: 1.5
+
+If you add JVM vendors (Sun, IBM, Apple, BEA) to the list, the combinations goes up to like 109.
+Throw on OS implementations and you get an insane number of test runs to complete.
diff --git a/src/main/jbake/content/dev/itests-overview.md b/src/main/jbake/content/dev/itests-overview.md
deleted file mode 100644
index e72044c..0000000
--- a/src/main/jbake/content/dev/itests-overview.md
+++ /dev/null
@@ -1,151 +0,0 @@
-Title: iTests Overview
-<a name="iTestsOverview-Motivation"></a>
-#  Motivation
-
-The basic idea behind itests that makes them slightly different than plain
-junit tests ran by maven is that it's assumed that there are other systems
-(servers, databases, brokers, etc) that need to be started or connected to
-before the tests can run.  The tests themselves don't setup the other
-systems themselves so that the tests don't become coupled with them and you
-can actually swap out various aspects of those systems behind the back of
-the tests; server version, protocol implementation, java version, VM
-implementation, database provider, operating systems, even using embedded
-servers and embedded databases.
-
-The idea came from the tests in OpenEJB that do this.  It took a lot of
-work to get them to run as part of the maven build and the itest plugin was
-the result.
-
-Definitely give those a look at: 
-http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/
-
-<a name="iTestsOverview-Pluggingin"></a>
-#  Plugging in
-
-You can have systems started and stopped before and after the tests in a
-number of ways.
-
-<a name="iTestsOverview-Inmaven1"></a>
-##  In maven 1
-
-This series of articles established a basic technique for Container Driven
-Testing with Maven and OpenEJB using preGoals and postGoals to do server
-and databse setup and teardown before and after Maven runs the unit tests.  [http://www.theserverside.com/articles/article.tss?l=ContainerDrivenTestingSeries](http://www.theserverside.com/articles/article.tss?l=ContainerDrivenTestingSeries)
-
-This concept evolved from OpenEJB into a reusable maven plugin created by
-Dain Sundstrom that gave these integration tests (itests) their own source
-directory and added itest:setup and itest:teardown goals to your maven
-build rather than just using a preGoal on "test:test" for setup and a
-postGoal on "test:test" for teardown.  The advantage to the new goals is
-that maven does not call any postGoals on "test:test" if the tests failed;
-something the above series of articles hacked around with an odd bit of
-jelly code.
-
-The new itest plugin was checked into Geronimo with the expectation that
-Geronimo would also use it.  After some time of OpenEJB still being the
-only consumer of it, it was moved into the Maven repository where they keep
-it in the Maven sandbox. 
-
- [http://maven.apache.org/plugins-sandbox/itest/](http://maven.apache.org/plugins-sandbox/itest/)
-
-ActiveMQ later started using the itest plugin and now has a large suite of
-their own JMS specific integration tests.
-
-<a name="iTestsOverview-Inmaven2"></a>
-##  In maven 2
-
-The concept of integration tests (itests) has been built into the lifecycle
-of maven 2, so it is no longer required to have the itest plugin around to
-get the extra "itest:setup" and "itest:teardown" goals.  See this document
-for more info:  [http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html](http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html)
-
-<a name="iTestsOverview-Injunitsetupandteardown"></a>
-##  In junit setup and teardown
-
-The ejb tests in particular require you to plug in facades for the server
-and the database so the client (the tests) can say "give me an initial
-context" or "create these tables i need" in a generic way.  It's assumed
-that those systems were setup and guaranteed in working state in the itest
-setup phase.  It's also guaranteed that the server and database facades
-know how to contact the server or database to carry out the "give me an
-initial context" and "create these tables" calls.
-
-Here are some implementations of the database provider for reference:
-  -
-http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/AxionTestDatabase.java
-  -
-http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/DerbyTestDatabase.java
-  -
-http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/InstantDbTestDatabase.java
-  -
-http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/PostgreSqlTestDatabase.java
-
-Here are some implementations for the server facades:
-  -
-http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/CorbaTestServer.java
-  -
-http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/RemoteTestServer.java
-  -
-http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/IvmTestServer.java
-  -
-http://cvs.openejb.org/viewrep/openejb/openejb/modules/itests/src/itest/org/openejb/test/RiTestServer.java
-
-Using the itest concept you could setup any system you need before hand,
-then just provide an abstraction of that system to the actual tests.  So
-it's not limited to just a server or a database.  You could do queue,
-topic, clustering heartbeat agent, directory server, etc.
-
-<a name="iTestsOverview-Testingmatrix"></a>
-#  Testing matrix
-
-Even with just what we have we can get quite far.  In a perfect world, we
-would actually test against the full matrix:
-
-  Server: Local, Database: Axion
-  Server: Local, Database: Derby
-  Server: Local, Database: PostgreSQL
-  Server: Remote, Database: Axion
-  Server: Remote, Database: Derby
-  Server: Remote, Database: PostgreSQL
-  Server: Corba, Database: Axion
-  Server: Corba, Database: Derby
-  Server: Corba, Database: PostgreSQL
-
-We had that going for a short while years ago but it was just too much
-infrastructure for me to keep running.	It would be nice to get Oracle and
-MySQL in that list as well.
-
-In an even more perfect world we'd test against not just different Server
-and Database combinations, but JVM versions as well.
-
-  Server: Local, Database: Axion, JVM: 1.3
-  Server: Local, Database: Axion, JVM: 1.4
-  Server: Local, Database: Axion, JVM: 1.5
-  Server: Local, Database: Derby, JVM: 1.3
-  Server: Local, Database: Derby, JVM: 1.4
-  Server: Local, Database: Derby, JVM: 1.5
-  Server: Local, Database: PostgreSQL, JVM: 1.3
-  Server: Local, Database: PostgreSQL, JVM: 1.4
-  Server: Local, Database: PostgreSQL, JVM: 1.5
-  Server: Remote, Database: Axion, JVM: 1.3
-  Server: Remote, Database: Axion, JVM: 1.4
-  Server: Remote, Database: Axion, JVM: 1.5
-  Server: Remote, Database: Derby, JVM: 1.3
-  Server: Remote, Database: Derby, JVM: 1.4
-  Server: Remote, Database: Derby, JVM: 1.5
-  Server: Remote, Database: PostgreSQL, JVM: 1.3
-  Server: Remote, Database: PostgreSQL, JVM: 1.4
-  Server: Remote, Database: PostgreSQL, JVM: 1.5
-  Server: Corba, Database: Axion, JVM: 1.3
-  Server: Corba, Database: Axion, JVM: 1.4
-  Server: Corba, Database: Axion, JVM: 1.5
-  Server: Corba, Database: Derby, JVM: 1.3
-  Server: Corba, Database: Derby, JVM: 1.4
-  Server: Corba, Database: Derby, JVM: 1.5
-  Server: Corba, Database: PostgreSQL, JVM: 1.3
-  Server: Corba, Database: PostgreSQL, JVM: 1.4
-  Server: Corba, Database: PostgreSQL, JVM: 1.5
-
-If you add JVM vendors (Sun, IBM, Apple, BEA) to the list, the combinations
-goes up to like 109.  Throw on OS implementations and you get an insane
-number of test runs to complete.
diff --git a/src/main/jbake/content/dev/january2008.adoc b/src/main/jbake/content/dev/january2008.adoc
new file mode 100644
index 0000000..70c8c1b
--- /dev/null
+++ b/src/main/jbake/content/dev/january2008.adoc
@@ -0,0 +1,32 @@
+= January 2008
+:jbake-type: page
+:jbake-status: published
+
+ The release of OpenEJB 3.0 beta 1 at the end of September showed an mild but noticeable increase in user traffic which has continued since.
+Several usability improvements and related new features have been added, particularly around a returning user from years ago Alex St.
+Croix.
+Alex has already written some blog entries, created a couple video tutorials, and has a downloadable PDF of using OpenEJB embedded in Tomcat which is a dozen pages and growing.
+This is all very good for OpenEJB and we are very excited to see user activity of this nature again.
+
+Web Services support has been added to OpenEJB in both standalone and Tomcat embedded modes, and significant work has been contributed to the CXF project as a result to add new features required by OpenEJB but not already present, such as rpc/encoded web services.
+
+The ability to embed OpenEJB into Tomcat has been re-expanded from temporarily just supporting Tomcat 6.0 to now version 5.5 as well including annotation processing support which is usually a v6.0.x and higher feature.
+Support for older versions was lost when the integration was reworked and improved over the OpenEJB 1.0 approach, however post OpenEJB 3.0 beta 1 release, requests from users of older Tomcat versions began coming in showing that the ability to support pre Tomcat 6 users is still very important.
+
+The documentation has been reorganized significantly.
+A new confluence space as been created dedicated entirely to the OpenEJB 3.0.x codebase and reintegrated back into the main website.
+Several new examples have been created as well.
+A major issue with the documentation was that most of the new documents weren't linked into the main site, were just loose pages, and had no "center" to bind them all together.
+The creation of dedicated 3.0.x space with it's own index and new left navigation section has dramatically improved this.
+
+Jonathan Gallimore, a newer contributor, recently contributed another large patch to the Eclipse plugin he's been working on that takes an EJB 2.x application and adds the annotations to the source code required to turn it into an EJB 3.0 application, removing the equivalent xml as it goes.
+Jonathan has done great work, but we could be doing better as he is largely working alone and isn't getting the benefit of working closely with existing committers.
+It's always difficult to pull people in when there isn't a strong intersection with existing code/people.
+
+Release work on OpenEJB 3.0 beta 2 has begun.
+There was a perpetual state of "going to release" through late November and all December, however all the open issues have been cleared and the general mood is "it's over-ready."  We've branched and have begun helping other projects to release some of the things we have dependencies on such as the Geronimo Transaction Manager/Connector and the XBean libraries.
+All is going well and we should see  OpenEJB 3.0 beta 2 put up for vote this month.
+
+On a general note, OpenEJB celebrated it's eighth year of existence in December.
+As a personal comment from someone who's been on the project the entire time, I [David Blevins](david-blevins.html)  have never seen the project in such good shape.
+A major challenge going forward will be releasing the 3.0 final and getting OpenEJB back on people's radar.
diff --git a/src/main/jbake/content/dev/january2008.md b/src/main/jbake/content/dev/january2008.md
deleted file mode 100644
index 5709910..0000000
--- a/src/main/jbake/content/dev/january2008.md
+++ /dev/null
@@ -1,55 +0,0 @@
-Title: January2008
-The release of OpenEJB 3.0 beta 1 at the end of September showed an mild
-but noticeable increase in user traffic which has continued since.  Several
-usability improvements and related new features have been added,
-particularly around a returning user from years ago Alex St. Croix.  Alex
-has already written some blog entries, created a couple video tutorials,
-and has a downloadable PDF of using OpenEJB embedded in Tomcat which is a
-dozen pages and growing.  This is all very good for OpenEJB and we are very
-excited to see user activity of this nature again.
-
-Web Services support has been added to OpenEJB in both standalone and
-Tomcat embedded modes, and significant work has been contributed to the CXF
-project as a result to add new features required by OpenEJB but not already
-present, such as rpc/encoded web services.
-
-The ability to embed OpenEJB into Tomcat has been re-expanded from
-temporarily just supporting Tomcat 6.0 to now version 5.5 as well including
-annotation processing support which is usually a v6.0.x and higher feature.
- Support for older versions was lost when the integration was reworked and
-improved over the OpenEJB 1.0 approach, however post OpenEJB 3.0 beta 1
-release, requests from users of older Tomcat versions began coming in
-showing that the ability to support pre Tomcat 6 users is still very
-important.
-
-The documentation has been reorganized significantly.  A new confluence
-space as been created dedicated entirely to the OpenEJB 3.0.x codebase and
-reintegrated back into the main website.  Several new examples have been
-created as well.  A major issue with the documentation was that most of the
-new documents weren't linked into the main site, were just loose pages, and
-had no "center" to bind them all together.  The creation of dedicated 3.0.x
-space with it's own index and new left navigation section has dramatically
-improved this.
-
-Jonathan Gallimore, a newer contributor, recently contributed another large
-patch to the Eclipse plugin he's been working on that takes an EJB 2.x
-application and adds the annotations to the source code required to turn it
-into an EJB 3.0 application, removing the equivalent xml as it goes. 
-Jonathan has done great work, but we could be doing better as he is largely
-working alone and isn't getting the benefit of working closely with
-existing committers.  It's always difficult to pull people in when there
-isn't a strong intersection with existing code/people.
-
-Release work on OpenEJB 3.0 beta 2 has begun.  There was a perpetual state
-of "going to release" through late November and all December, however all
-the open issues have been cleared and the general mood is "it's
-over-ready."  We've branched and have begun helping other projects to
-release some of the things we have dependencies on such as the Geronimo
-Transaction Manager/Connector and the XBean libraries.	All is going well
-and we should see  OpenEJB 3.0 beta 2 put up for vote this month.
-
-On a general note, OpenEJB celebrated it's eighth year of existence in December.  As a personal comment from someone who's been on the project the entire time, I \[David Blevins\](david-blevins\.html)
- have never seen the project in such good shape.  A major challenge going
-forward will be releasing the 3.0 final and getting OpenEJB back on
-people's radar.
-
diff --git a/src/main/jbake/content/dev/january2010.adoc b/src/main/jbake/content/dev/january2010.adoc
new file mode 100644
index 0000000..071dbd9
--- /dev/null
+++ b/src/main/jbake/content/dev/january2010.adoc
@@ -0,0 +1,18 @@
+= January 2010
+:jbake-type: page
+:jbake-status: published
+
+Main areas of development activity include OSGi support, upgrading JAX-WS and potential support for JAX-RS, and Java EE 6 @ManagedBean support.
+More detailed planning has also begun for the remaining EJB 3.1 work.
+
+Overall user list activity continues to increase with October and November both being record months in terms of volume.
+Diversity in developers responding to user requests has also been greatly improved, quite stellar in fact, with more committers pitching in and resolving user issues.
+A wonderful trend.
+Holidays had their usual impact on December activity.
+
+OpenEJB Eclipse Plugin 1.0.0.alpha was released in late October and a screencast created which shows how to get started with it was put up in the project blog and website.
+
+An informal get together is planned in Milan, Italy for the last weekend of January.
+Information has been sent to the user list and anyone is welcome to come.
+Primary goal is just to meet each other and have a few beers, but there's certainly room for tech talk and some will likely occur.
+Anything substantial will reach the dev list as with any offline communication.
diff --git a/src/main/jbake/content/dev/january2010.md b/src/main/jbake/content/dev/january2010.md
deleted file mode 100644
index b8f1212..0000000
--- a/src/main/jbake/content/dev/january2010.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Title: January2010
-Main areas of development activity include OSGi support, upgrading JAX-WS
-and potential support for JAX-RS, and Java EE 6 @ManagedBean support.  More
-detailed planning has also begun for the remaining EJB 3.1 work.
-
-Overall user list activity continues to increase with October and November
-both being record months in terms of volume.  Diversity in developers
-responding to user requests has also been greatly improved, quite stellar
-in fact, with more committers pitching in and resolving user issues.  A
-wonderful trend.  Holidays had their usual impact on December activity.
-
-OpenEJB Eclipse Plugin 1.0.0.alpha was released in late October and a
-screencast created which shows how to get started with it was put up in the
-project blog and website.
-
-An informal get together is planned in Milan, Italy for the last weekend of
-January.  Information has been sent to the user list and anyone is welcome
-to come.  Primary goal is just to meet each other and have a few beers, but
-there's certainly room for tech talk and some will likely occur.  Anything
-substantial will reach the dev list as with any offline communication.
diff --git a/src/main/jbake/content/dev/july2007.adoc b/src/main/jbake/content/dev/july2007.adoc
new file mode 100644
index 0000000..a6ff116
--- /dev/null
+++ b/src/main/jbake/content/dev/july2007.adoc
@@ -0,0 +1,19 @@
+= July 2007
+:jbake-type: page
+:jbake-status: published
+
+ CURRENT FOCUS
+
+Primary activities in the project are around polishing up features, user-facing code, reducing dependencies, documentation, and taking care of legal in preparation for the coming 3.0 release.
+No real issues stand in the way at this point, builds and voting should start soon.
+
+CONTRIBUTIONS
+
+More wonderful documentation contributions have been made by contributor Karan Malhi who is actively scraping our list archives and creating documentation from old emails.
+
+EXTERNAL INVOLVEMENT
+
+Contributed managed connection support to commons-dbcp.
+This will eliminate our custom database pooling code, and adds an important new feature to DBCP.
+This feature should be useful to anyone using DBCP in a managed environment such at Tomcat.
+Also, OpenEJB has a large set of data base test case, and we have already found a few bugs to fix in DBCP for which we are working on fixes.
diff --git a/src/main/jbake/content/dev/july2007.md b/src/main/jbake/content/dev/july2007.md
deleted file mode 100644
index 298c5de..0000000
--- a/src/main/jbake/content/dev/july2007.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Title: July2007
-CURRENT FOCUS
-
-Primary activities in the project are around polishing up features,
-user-facing code, reducing dependencies, documentation, and taking care of
-legal in preparation for the coming 3.0 release. No real issues stand in
-the way at this point, builds and voting should start soon.
-
-CONTRIBUTIONS
-
-More wonderful documentation contributions have been made by contributor
-Karan Malhi who is actively scraping our list archives and creating
-documentation from old emails.
-
-EXTERNAL INVOLVEMENT
-
-Contributed managed connection support to commons-dbcp. This will eliminate
-our custom database pooling code, and adds an important new feature to
-DBCP. This feature should be useful to anyone using DBCP in a managed
-environment such at Tomcat. Also, OpenEJB has a large set of data base test
-case, and we have already found a few bugs to fix in DBCP for which we are
-working on fixes.
diff --git a/src/main/jbake/content/dev/july2008.adoc b/src/main/jbake/content/dev/july2008.adoc
new file mode 100644
index 0000000..2d99ee6
--- /dev/null
+++ b/src/main/jbake/content/dev/july2008.adoc
@@ -0,0 +1,17 @@
+= July 2008
+:jbake-type: page
+:jbake-status: published
+
+The OpenEJB 3.0 Final release in mid April brought some good attention to the project and more new users.
+User list traffic showed a small increase in April and May and a sharp spike in June.
+July looks to be a slow month so far.
+Many users are content and anxiously awaiting the next release.
+
+Planning for the next release has begun.
+The list of fixes and improvements is growing very large.
+If all goes well 3.1 it won't be too much longer before we start spinning binaries for 3.1.
+Major new features will include more EJB 3.1 support, jaxb performance increases through the SXC project, network performance increases in client/server communication, cmp and jpa conversion improvements, tomcat console improvements, and fixes in the jdbc connection pooling.
+
+Jonathan Gallimore was voted in as a committer with great support.
+Jonathan is not just a new committer to OpenEJB but to the ASF.
+A very warm welcome to Jonathan!
diff --git a/src/main/jbake/content/dev/july2008.md b/src/main/jbake/content/dev/july2008.md
deleted file mode 100644
index ceb3aee..0000000
--- a/src/main/jbake/content/dev/july2008.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Title: July2008
-The OpenEJB 3.0 Final release in mid April brought some good attention to
-the project and more new users.  User list traffic showed a small increase
-in April and May and a sharp spike in June.  July looks to be a slow month
-so far.  Many users are content and anxiously awaiting the next release.
-
-Planning for the next release has begun.  The list of fixes and
-improvements is growing very large.  If all goes well 3.1 it won't be too
-much longer before we start spinning binaries for 3.1.	Major new features
-will include more EJB 3.1 support, jaxb performance increases through the
-SXC project, network performance increases in client/server communication,
-cmp and jpa conversion improvements, tomcat console improvements, and fixes
-in the jdbc connection pooling.
-
-Jonathan Gallimore was voted in as a committer with great support. 
-Jonathan is not just a new committer to OpenEJB but to the ASF.  A very
-warm welcome to Jonathan!
-
-
diff --git a/src/main/jbake/content/dev/july2009.adoc b/src/main/jbake/content/dev/july2009.adoc
new file mode 100644
index 0000000..e2aacdf
--- /dev/null
+++ b/src/main/jbake/content/dev/july2009.adoc
@@ -0,0 +1,23 @@
+= July 2009
+:jbake-type: page
+:jbake-status: published
+
+OpenEJB 3.1.1 was released in June.
+The release contained a mix of improvements and fixes.
+Overall it was very well received and very anticipated as the last trunk release was in October 2008.
+More frequent dot releases are planned and a 3.1.2 will hopefully be not too far behind.
+
+Project participation in blogs.apache.org started up in April and has been fairly successful with about seven posts so far.
+Some effort has gone into creating a convenient way that blog posts can be staged for community review before being posted.
+The result has proven to be very easy and not cumbersome which directly contributes to the number of posts in the last two months or so.
+Two screencasts, the first of many hopefully, were also added and published through the blog.
+
+Jean-Louis Monteiro was voted in as a committer in June.
+The project is extremely happy to have him as a committer and very much enjoys his work and overall contributions in the community.
+Congratulations, Jean-Louis!
+
+Preparation has been underway to do a first release of the OpenEJB Eclipse Plugin.
+As part of the work in preparing the release files, discussion started at the beginning of the month on adding the release manager and majority contributor to the plugin, Jonathan Gallimore, to the project PMC for better oversight.
+The discussion was started on the dev list carefully and deliberately with so far very healthy and positive results.
+A vote for his addition to the PMC is now underway on the dev list, the first of hopefully many open PMC votes.
+A big compliment to the community to whose amazing openness, mutual respect, and overall friendliness makes this kind of thing possible.
diff --git a/src/main/jbake/content/dev/july2009.md b/src/main/jbake/content/dev/july2009.md
deleted file mode 100644
index 87074c3..0000000
--- a/src/main/jbake/content/dev/july2009.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: July2009
-OpenEJB 3.1.1 was released in June.  The release contained a mix of
-improvements and fixes.  Overall it was very well received and very
-anticipated as the last trunk release was in October 2008.  More frequent
-dot releases are planned and a 3.1.2 will hopefully be not too far behind.
-
-Project participation in blogs.apache.org started up in April and has been
-fairly successful with about seven posts so far.  Some effort has gone into
-creating a convenient way that blog posts can be staged for community
-review before being posted.  The result has proven to be very easy and not
-cumbersome which directly contributes to the number of posts in the last
-two months or so.  Two screencasts, the first of many hopefully, were also
-added and published through the blog.
-
-Jean-Louis Monteiro was voted in as a committer in June.  The project is
-extremely happy to have him as a committer and very much enjoys his work
-and overall contributions in the community.  Congratulations, Jean-Louis!
-
-Preparation has been underway to do a first release of the OpenEJB Eclipse
-Plugin.  As part of the work in preparing the release files, discussion
-started at the beginning of the month on adding the release manager and
-majority contributor to the plugin, Jonathan Gallimore, to the project PMC
-for better oversight.  The discussion was started on the dev list carefully
-and deliberately with so far very healthy and positive results.  A vote for
-his addition to the PMC is now underway on the dev list, the first of
-hopefully many open PMC votes.	A big compliment to the community to whose
-amazing openness, mutual respect, and overall friendliness makes this kind
-of thing possible.
diff --git a/src/main/jbake/content/dev/july2010.adoc b/src/main/jbake/content/dev/july2010.adoc
new file mode 100644
index 0000000..229739e
--- /dev/null
+++ b/src/main/jbake/content/dev/july2010.adoc
@@ -0,0 +1,16 @@
+= July 2010
+:jbake-type: page
+:jbake-status: published
+
+Work on the 3.1.next development has slowed and a release of that codebase (3.1.3) is likely to come out soon.
+
+Activity on the 3.2 codebase is going strong with significant progress on EJB 3.1 features, specifically;
+@AccessTimeout, @AfterBegin, @BeforeCompletion, @AfterCompletion and some support for the @Asynchronous method invocations.
+Most of this work is being done by contributors.
+New committers are sure to be right around the corner.
+Work has started on JCDI integration aided by the OpenWebBeans community.
+That work is somewhat revolutionary and a separate branch has been created temporarily to workout the overall architecture and design of the integration.
+Significant work is also being done to overhaul and test the application validation code and related i18n message keys.
+
+Dev list participation has increased due to greater contributor activity.
+User list traffic has slowed somewhat which is welcome as it provides a little breathing room for development.
diff --git a/src/main/jbake/content/dev/july2010.md b/src/main/jbake/content/dev/july2010.md
deleted file mode 100644
index 0273575..0000000
--- a/src/main/jbake/content/dev/july2010.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Title: July2010
-Work on the 3.1.next development has slowed and a release of that codebase
-(3.1.3) is likely to come out soon.
-
-Activity on the 3.2 codebase is going strong with significant progress on
-EJB 3.1 features, specifically; @AccessTimeout, @AfterBegin,
-@BeforeCompletion, @AfterCompletion and some support for the @Asynchronous
-method invocations.  Most of this work is being done by contributors.  New
-committers are sure to be right around the corner.  Work has started on
-JCDI integration aided by the OpenWebBeans community.  That work is
-somewhat revolutionary and a separate branch has been created temporarily
-to workout the overall architecture and design of the integration. 
-Significant work is also being done to overhaul and test the application
-validation code and related i18n message keys.
-
-Dev list participation has increased due to greater contributor activity. 
-User list traffic has slowed somewhat which is welcome as it provides a
-little breathing room for development.
diff --git a/src/main/jbake/content/dev/june2007.adoc b/src/main/jbake/content/dev/june2007.adoc
new file mode 100644
index 0000000..37f37eb
--- /dev/null
+++ b/src/main/jbake/content/dev/june2007.adoc
@@ -0,0 +1,12 @@
+= June 2007
+:jbake-type: page
+:jbake-status: published
+
+All Incubator Infrastructure has been migrated over to tomee.apache.org as well as removal of any miscellaneous Incubator related disclaimers in code and website.
+
+The project is excited to have implementation of EJB 3.0 complete and to see our sister project, Geronimo, announced JavaEE 5 Certification.
+Community short term goals are a release of OpenEJB 3.0 along with regular published snapshots.
+Early development discussions are underway on clustering, application validation as well as general items for code clean up.
+List activity post JavaEE 5 Certification is back up to normal.
+
+We still gain more contribution interests from new people like _Karan Malhi_ who is interested in fixing some issues with OpenEJB 3.0 assembly build process.
diff --git a/src/main/jbake/content/dev/june2007.md b/src/main/jbake/content/dev/june2007.md
deleted file mode 100644
index 517c5a8..0000000
--- a/src/main/jbake/content/dev/june2007.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Title: June2007
-All Incubator Infrastructure has been migrated over to tomee.apache.org
-as well as removal of any miscellaneous Incubator related disclaimers in
-code and website.  
-
-The project is excited to have implementation of EJB 3.0 complete and to
-see our sister project, Geronimo, announced JavaEE 5 Certification. 
-Community short term goals are a release of OpenEJB 3.0 along with regular
-published snapshots.  Early development discussions are underway on
-clustering, application validation as well as general items for code clean
-up.  List activity post JavaEE 5 Certification is back up to normal.
-
-We still gain more contribution interests from new people like *Karan
-Malhi* who is interested in fixing some issues with OpenEJB 3.0 assembly
-build process.
-
diff --git a/src/main/jbake/content/dev/logging.adoc b/src/main/jbake/content/dev/logging.adoc
new file mode 100644
index 0000000..1744ca9
--- /dev/null
+++ b/src/main/jbake/content/dev/logging.adoc
@@ -0,0 +1,197 @@
+= Logging
+:jbake-type: page
+:jbake-status: published
+
+== Logging for Users
+
+All logging in OpenEJB is done using the openejb.base/conf/logging.properties file.
+When you download and extract OpenEJB, you will not find this file under the openejb.base/conf directory.
+However, when you start the server, this file magically appears.
+So what does this give you as a user of OpenEJB?
+Here are some of the benefits:
+
+. You do not have to author a logging.properties from scratch.
+You get one with sensible defaults.
+. If you did modify the default file, and you wanted to revert back to the default file generated by OpenEJB, all you have to do is
+. {blank}
++
+= Delete or rename the file e.g. rename it to logging.properties.BAK .
+. {blank}
++
+= Restart the server
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OpenEJB will find that the logging.properties file is missing from the openejb.base/conf directory and it will automatically create a new one with the default configuration.
+The good thing is that if you modify the logging.properties file, OpenEJB will *NOT* over-write it.
+
+The default logging configuration created by OpenEJB uses RollingFileAppender's.
+The log files are located under the openejb.base/logs directory.
+By default it writes to just two files , openejb.log and transaction.log&nbsp;
+{info:title=Embedded Testing} When running tests using embedded OpenEJB, the logging.properties will be ignored.
+You need to use a file named embedded.logging.properties instead.
+Place this file under src/test/resources \{info}  +++<a name="Logging-Loggingforcontributors/committers">++++++</a>+++
+
+== Logging for contributors/committers
+
+The org.apache.openejb.util.Logger class is the one which is used for logging.
+This class is a wrapper around log4.&nbsp;
+
++++<a name="Logging-LogCategory">++++++</a>+++
+
+=== LogCategory
+
+Each Logger instance belongs to a category represented by a org.apache.openejb.util.LogCategory instance.
+Here is what the LogCategory class looks like
+
+....
+public final class LogCategory {
+  private final String name;
+  public static final LogCategory OPENEJB = new LogCategory( "OpenEJB");
+  public static final LogCategory OPENEJB_ADMIN = OPENEJB.createChild("admin");
+  public static final LogCategory OPENEJB_STARTUP = OPENEJB.createChild("startup");
+  public static final LogCategory OPENEJB_STARTUP_CONFIG = OPENEJB_STARTUP.createChild("config");
+  public static final LogCategory OPENEJB_STARTUP_VALIDATION = OPENEJB_STARTUP.createChild("validation");
+       // other categories removed for code brevity
+  private LogCategory(String name){
+    this.name = name;
+  }
+  public String getName() {
+    return name;
+  }
+  /**
+   * Creates a child category of this category. <B>Use this method sparingly</B>. This method is to be used in only those circumstances where the name of the
+   * category is not known upfront and is a derived name. If you know the name of the category, it is highly recommended to add a static final field
+   * of type LogCategory in this class
+   * @param child
+   * @return - LogCategory
+   */
+  public LogCategory createChild(String child){
+    return new LogCategory(this.name+"."+child);
+  }
+
+}
+....
+
+Notice carefully how each LogCategory instance is created.&nbsp;
+The objective here is that each LogCategory should be a child of the OPENEJB category.
+If you need to add a new category and you know the name of the category upfront, simply open the LogCategory class and add another category.
+For example, if you needed to add a category named SHUTDOWN, here is the recommended way to add it
+
+ public static final LogCategory OPENEJB_SHUTDOWN = LogCategory.OPENEJB.createChild("shutdown");
+
+Sometimes you may want to create a category whose name is "generated" at runtime.
+In that case you can use the "createChild" method of the LogCategory class to create this new category.&nbsp;
+For example, if you wanted to create a category of Logger for every deployed module, then assuming you have the moduleId information you could do something as follows to create a category:
+
+ String moduleId = "mymodule";
+ LogCategory generatedCategory = LogCategory.OPENEJB.createChild(moduleId);
+
++++<a name="Logging-&nbsp;Logger">++++++</a>+++
+
+=== &nbsp;Logger
+
+The preference is to externalize all logging messages in properties file.
+Typically each package should have a file called Messages.properties.&nbsp;
+This file should have all the keys and the corresponding messages.&nbsp;
+Here are the steps you would follow to log a message:
+
+* For each message you need to log, you would open the Messages.properties file in the corresponding package and add a key-value pair for the message.&nbsp;
+For example, if you were authoring a class called org.apache.openejb.util.Connect, then you would add a key-value pair to the Messages.properties file located in the org.apache.openejb.util package.
+* Obtain a Logger instance in one of the following ways:
+
+&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+_Using the package name_
+
+ Logger logger = Logger.getInstance (LogCategory.OPENEJB, "org.apache.openejb.util");
+
+&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;
+&nbsp;&nbsp;__&nbsp;
+Using the Class__
+
+ Logger logger = Logger.getInsance(LogCategory.OPENEJB, Connect.class);
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+_Get a child Logger for an existing Logger instance_
+
+ Logger logger = Logger.getInsance(LogCategory.OPENEJB, Connect.class);
+ Logger child = logger.getChildLogger("shutdown");
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+_Get a child Logger of an existing Logger using a LogCategory_
+
+ LogCategory childCategory = LogCategory.OPENEJB.createChild("shutdown");
+ Logger logger = Logger.getInstance(childCategory,Connect.class);
+
+* &nbsp;Call one of the following methods passing in the key as an argument ** debug ** error ** fatal ** info ** warning
++
+Logger logger = Logger.getInstance(LogCategory.OPENEJB,Connect.class);
+logger.info("error.file");
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+The Messages.properties file under org.apache.openejb.util must have the "error.file" key in it with the corresponding message.
+
++++<a name="Logging-LoggerInheritance&nbsp;">++++++</a>+++
+
+=== Logger Inheritance&nbsp;
+
+&nbsp;Another interesting feature of the Logging framework is inheritance.
+Here is how it works:
+
+Say you have the following Messages.properties files in the classpath.
+
+. &nbsp;
+org/apache/openejb/Messages.properties
+. &nbsp;
+org/apache/openejb/core/Messages.properties
+. &nbsp;
+org/apache/openejb/core/stateless/Messages.properties
+
+&nbsp;
+&nbsp;
+Then you have a class such as org.apache.openejb.core.stateless.StatelessContainer (+note the package+) If that class referenced a message key "classNotFound" for example, the Logger would look for the message first in Messages.properties 3, then 2, then 1 and so on until it found the required message.
+This would allow better reuse of messages, more flexibility in where we put the Message.properties&nbsp;
+files, as well as the added bonus in that we no longer need to pass in the location of where our Message.properties file is
+
++++<a name="Logging-Loggingforintegrators">++++++</a>+++
+
+=== Logging for integrators
+
+If you want to embed OpenEJB in your application and need to control the logging configuration of OpenEJB, simple set the openejb.logger.external system property to true.
+Now, its your applications' responsibility to configure logging, OpenEJB will simply use your configuration.
+
++++<a name="Logging-&nbsp;OriginationoftheLoggingIdea">++++++</a>+++
+
+=== &nbsp;Origination of the Logging Idea
+
+There has been a long discussion for this logging idea.
+Its going to be worth it to read the discussion at http://www.nabble.com/i18n-and-logging-tf3962134s2756.html[i18n and logging]
+
++Here is a extract from an email from David Blevins which talks about the existing logging framework.
+The current framework is more or less the same as this one, just some added features and a rewrite of the API+
+
+Each module has a file called default.logging.conf.
+This file contains the definition of all Loggers, their appenders and warning levels.
+However, we do not use default.logging.conf first.
+The basic idea is that first we look for say conf/logging.conf in the openejb.base directory.
+&nbsp;If we don't find it there, we look for default.logging.conf in the classpath.
+&nbsp;If we did find default.logging.conf (which we should) and there is an openejb.base/conf/ directory then expand the default.logging.conf to openejb.base/conf/logging.conf where we expected to find the file in the first place.
+&nbsp;If there was no openejb.base/conf/ directory, then it's safe to assume we're running embedded (in a test case perhaps) and just use the default.logging.conf and do no extra work.
+
+We have default.logging.conf which we use this way as well as default.openejb.conf and now more recently users.properties and groups.properties.
+&nbsp;We search on disk for the resource in openejb.base/conf/ if we don't find them we unpack the default one we stuffed in openejb-core jar and extract it to disk in the openejb.base/conf directory if there is one -- if there isn't one we just use the default file.
+
+The basic ideas behind the pattern are that:  &nbsp;1.
+If you've messed up your configuration, just delete or rename the respective files in your conf/ directory and new (working) ones will magically appear.
+&nbsp;2.
+When upgrading its nice that our zip file won't overwrite any existing files in conf/  &nbsp;3.
+If you're running embedded you don't have to setup any directories or have any config files, we can run on defaults.
+
+The _ConfUtils.getConfResource_ utility to do that pattern generically , but so far we're only using it for the users.properties and groups.properties files.
+&nbsp;We should be using it everywhere.
+&nbsp;Having the code in multiple places has lead to some inconsistencies such as we expand the default.openejb.conf file to conf/openejb.xml (not even the same file extension).
+&nbsp;We really don't need the "default" part in our file names and the lingering usage of the "conf" file extension is something that needs to go bye-bye -- we should use properties for properties files and xml for xml files, etc.
diff --git a/src/main/jbake/content/dev/logging.md b/src/main/jbake/content/dev/logging.md
deleted file mode 100644
index e8edabe..0000000
--- a/src/main/jbake/content/dev/logging.md
+++ /dev/null
@@ -1,222 +0,0 @@
-Title: Logging
-<a name="Logging-LoggingforUsers"></a>
-## Logging for Users
-All logging in OpenEJB is done using the
-openejb.base/conf/logging.properties file. When you download and extract
-OpenEJB, you will not find this file under the openejb.base/conf directory.
-However, when you start the server, this file magically appears. So what
-does this give you as a user of OpenEJB? Here are some of the benefits:
-1. You do not have to author a logging.properties from scratch. You get one
-with sensible defaults.
-1. If you did modify the default file, and you wanted to revert back to the
-default file generated by OpenEJB, all you have to do is
-1. # Delete or rename the file e.g. rename it to logging.properties.BAK .
-1. # Restart the server
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-OpenEJB will find that the logging.properties file is missing from the
-openejb.base/conf directory and it will automatically create a new one with
-the default configuration. The good thing is that if you modify the
-logging.properties file, OpenEJB will \*NOT\* over-write it.
-
-The default logging configuration created by OpenEJB uses
-RollingFileAppender's. The log files are located under the
-openejb.base/logs directory. By default it writes to just two files ,
-openejb.log and transaction.log&nbsp;
-{info:title=Embedded Testing}
-When running tests using embedded OpenEJB, the logging.properties will be
-ignored. You need to use a file named embedded.logging.properties instead.
-Place this file under src/test/resources
-{info} 
-<a name="Logging-Loggingforcontributors/committers"></a>
-## Logging for contributors/committers
-
-The org.apache.openejb.util.Logger class is the one which is used for
-logging. This class is a wrapper around log4.&nbsp;
-
-<a name="Logging-LogCategory"></a>
-### LogCategory
-
-Each Logger instance belongs to a category represented by a
-org.apache.openejb.util.LogCategory instance. Here is what the LogCategory
-class looks like
-
-    public final class LogCategory {
-      private final String name;
-      public static final LogCategory OPENEJB = new LogCategory( "OpenEJB");
-      public static final LogCategory OPENEJB_ADMIN = OPENEJB.createChild("admin");
-      public static final LogCategory OPENEJB_STARTUP = OPENEJB.createChild("startup");
-      public static final LogCategory OPENEJB_STARTUP_CONFIG = OPENEJB_STARTUP.createChild("config");
-      public static final LogCategory OPENEJB_STARTUP_VALIDATION = OPENEJB_STARTUP.createChild("validation");
-           // other categories removed for code brevity
-      private LogCategory(String name){
-        this.name = name;
-      }
-      public String getName() {
-        return name;
-      }
-      /**
-       * Creates a child category of this category. <B>Use this method sparingly</B>. This method is to be used in only those circumstances where the name of the
-       * category is not known upfront and is a derived name. If you know the name of the category, it is highly recommended to add a static final field
-       * of type LogCategory in this class
-       * @param child
-       * @return - LogCategory
-       */
-      public LogCategory createChild(String child){
-        return new LogCategory(this.name+"."+child);
-      }
-
-    }
-
-Notice carefully how each LogCategory instance is created.&nbsp; The
-objective here is that each LogCategory should be a child of the OPENEJB
-category. If you need to add a new category and you know the name of the
-category upfront, simply open the LogCategory class and add another
-category. For example, if you needed to add a category named SHUTDOWN, here
-is the recommended way to add it
-
-    public static final LogCategory OPENEJB_SHUTDOWN = LogCategory.OPENEJB.createChild("shutdown");
-
-Sometimes you may want to create a category whose name is "generated" at
-runtime. In that case you can use the "createChild" method of the
-LogCategory class to create this new category.&nbsp; For example, if you
-wanted to create a category of Logger for every deployed module, then
-assuming you have the moduleId information you could do something as
-follows to create a category:
-
-    String moduleId = "mymodule";
-    LogCategory generatedCategory = LogCategory.OPENEJB.createChild(moduleId);
-
-
-<a name="Logging-&nbsp;Logger"></a>
-### &nbsp;Logger
-
-The preference is to externalize all logging messages in properties file.
-Typically each package should have a file called Messages.properties.&nbsp;
-This file should have all the keys and the corresponding messages.&nbsp;
-Here are the steps you would follow to log a message:
-* For each message you need to log, you would open the Messages.properties
-file in the corresponding package and add a key-value pair for the
-message.&nbsp; For example, if you were authoring a class called
-org.apache.openejb.util.Connect, then you would add a key-value pair to the
-Messages.properties file located in the org.apache.openejb.util package.
-
-* Obtain a Logger instance in one of the following ways:
-
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
-*Using the package name*
-
-    Logger logger = Logger.getInstance (LogCategory.OPENEJB,
-"org.apache.openejb.util");
-
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;  &nbsp;&nbsp;  &nbsp;&nbsp;*&nbsp; 
-Using the Class*
-
-    Logger logger = Logger.getInsance(LogCategory.OPENEJB, Connect.class);
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-*Get a child Logger for an existing Logger instance*
-
-    Logger logger = Logger.getInsance(LogCategory.OPENEJB, Connect.class);
-    Logger child = logger.getChildLogger("shutdown");
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-*Get a child Logger of an existing Logger using a LogCategory*
-
-    LogCategory childCategory = LogCategory.OPENEJB.createChild("shutdown");
-    Logger logger = Logger.getInstance(childCategory,Connect.class);
-
-* &nbsp;Call one of the following methods passing in the key as an argument
-** debug
-** error
-** fatal
-** info
-** warning
-
-
-    Logger logger = Logger.getInstance(LogCategory.OPENEJB,Connect.class);
-    logger.info("error.file");
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; The
-Messages.properties file under org.apache.openejb.util must have the
-"error.file" key in it with the corresponding message.
-
-<a name="Logging-LoggerInheritance&nbsp;"></a>
-### Logger Inheritance&nbsp;
-
-&nbsp;Another interesting feature of the Logging framework is inheritance.
-Here is how it works:
-
-Say you have the following Messages.properties files in the classpath.
-1. &nbsp; org/apache/openejb/Messages.properties
-1. &nbsp; org/apache/openejb/core/Messages.properties
-1. &nbsp; org/apache/openejb/core/stateless/Messages.properties
-
-&nbsp;
-&nbsp;
-Then you have a class such as
-org.apache.openejb.core.stateless.StatelessContainer (+note the package+)
-If that class referenced a message key "classNotFound" for example, the
-Logger would look for the message first in Messages.properties 3, then 2,
-then 1 and so on until it found the required message.
-This would allow better reuse of messages, more flexibility in where we put
-the Message.properties&nbsp; files, as well as the added bonus in that we
-no longer need to pass in the location of where our
-Message.properties file is
-
-<a name="Logging-Loggingforintegrators"></a>
-### Logging for integrators
-
-If you want to embed OpenEJB in your application and need to control the
-logging configuration of OpenEJB, simple set the openejb.logger.external
-system property to true. Now, its your applications' responsibility to
-configure logging, OpenEJB will simply use your configuration.
-
-<a name="Logging-&nbsp;OriginationoftheLoggingIdea"></a>
-### &nbsp;Origination of the Logging Idea
-
-There has been a long discussion for this logging idea. Its going to be
-worth it to read the discussion at [i18n and logging](http://www.nabble.com/i18n-and-logging-tf3962134s2756.html)
-
-+Here is a extract from an email from David Blevins which talks about the
-existing logging framework. The current framework is more or less the same
-as this one, just some added features and a rewrite of the API+
-
-Each module has a file called default.logging.conf. This file contains the
-definition of all Loggers, their appenders and warning levels. However, we
-do not use default.logging.conf first. The basic idea is that first we look
-for say conf/logging.conf in the openejb.base directory. &nbsp;If we don't
-find it there, we look for default.logging.conf in the classpath. &nbsp;If
-we did find default.logging.conf (which we should) and there is an
-openejb.base/conf/ directory then expand the default.logging.conf to
-openejb.base/conf/logging.conf where we expected to find the file in the
-first place. &nbsp;If there was no openejb.base/conf/ directory, then it's
-safe to assume we're running embedded (in a test case perhaps) and just use
-the default.logging.conf and do no extra work.
-
-We have default.logging.conf which we use this way as well as
-default.openejb.conf and now more recently users.properties and
-groups.properties. &nbsp;We search on disk for the resource in
-openejb.base/conf/ if we don't find them we unpack the default one we
-stuffed in openejb-core jar and extract it to disk in the openejb.base/conf
-directory if there is one \-\- if there isn't one we just use the default
-file.
-
-The basic ideas behind the pattern are that:
- &nbsp;1. If you've messed up your configuration, just delete or rename the
-respective files in your conf/ directory and new (working) ones will
-magically appear.
- &nbsp;2. When upgrading its nice that our zip file won't overwrite any
-existing files in conf/
- &nbsp;3. If you're running embedded you don't have to setup any
-directories or have any config files, we can run on defaults.
-
-The *ConfUtils.getConfResource* utility to do that pattern generically ,
-but so far we're only using it for the users.properties and
-groups.properties files. &nbsp;We should be using it everywhere.
-&nbsp;Having the code in multiple places has lead to some inconsistencies
-such as we expand the default.openejb.conf file to conf/openejb.xml (not
-even the same file extension). &nbsp;We really don't need the "default"
-part in our file names and the lingering usage of the "conf" file extension
-is something that needs to go bye-bye \-\- we should use properties for
-properties files and xml for xml files, etc.
diff --git a/src/main/jbake/content/dev/mastering-the-command-line.adoc b/src/main/jbake/content/dev/mastering-the-command-line.adoc
new file mode 100644
index 0000000..52d3b75
--- /dev/null
+++ b/src/main/jbake/content/dev/mastering-the-command-line.adoc
@@ -0,0 +1,117 @@
+= Linux/OSX awesomeness
+:jbake-type: page
+:jbake-status: published
+
+
+Not specific to this projec, but can be incredibly useful ways to maximizes your time.
+Mastering the command line is the best way to get things done, quick and cheaply.
+
+Reapeat after me:
+
+* I will write a script for any tasks I do regularly
+
+== Core commands
+
+Some very big time-saving commands
+
+=== In shell scripts
+
+* *basename* - what is the file name again?
+not the path, just the file name
+* *dirname* - what directory is this in?
+* *readllink -f* - what is the absolute path of this file?
+* *cat* - spit out the contents of one or more files
+* *cp* - copy file or dir
+* *scp* - copy file or dir to another machine
+* *rsync* - both the above, but so much more awesome
+ ** rsync -av here there
+ ** rsync -e ssh -av here user@host:there
+* *cut* - wish I could i could chop out this column in the middle here
+* *date* - would be nice if I had some way to make this log file name a little more unique
+* *echo* - System.out.println()
+* *xargs* - can be useful but doesn't respect paths with spaces.
+I only use it sometimes
+* *find* - find some files and potentially execute a command against them
+* *egrep* - search for text in a file or from STDIN.
+better than grep
+* *mkdir* - makes a dir, with -p will make parent dirs too
+* *mv* - move a file
+* *head* - spit out the first N lines of a file
+* *tail* - spit out the last N lines of a file
+* *tee* - I want to see the output of this command, but I also want to write it to a file.
+Oh!
+tee is awesome!
+* *perl* - edit a stream:  cat file.txt
+ ** edit a file: perl -i -pe 's/this/that/'
+* *pwd* - where am I?
+* *rm* - delete
+* *read (bash)* - I dig this out for strings with spaces.
+paths have spaces in them sometimes
+ ** ls *.txt
+ ** find . -name "*.txt"
+* *export (bash)* - why can't my script find this command?
+i use this to debug scripts 'export > /tmp/script-env.txt'
+* *for (bash)* - my favorite bash construct
+ ** for n in one two three;
+do echo "$n";
+done
+ ** (side note, always quote your variables like "$n" vs $n, trust me it's a good habit)
+* *while  (bash)* - my second favorite bash construct
+ ** loop forever and do something: while true;
+do my_command;
+sleep 10;
+done
+* *sleep* - Thread.sleep().
+Only accepts seconds.
+I typically do the math with bash sytax
+ ** sleep for an hour:  sleep $(( 60 * 60 ))
+ ** sleep for a day:  sleep $(( 60 * 60 * 24 ))
+* *sort* - sort lines of text
+* *uniq* - trim out the duplicates
+ ** show me only things that had duplicates: uniq -d
+ ** ( I always 'sort
+* *ssh* - awesomeness.
+can execute commands remotely too
+ ** ssh people.apache.org pwd
+ ** ssh people.apache.org 'pwd
+* *sudo* - I wish I were a fish.
+I wish I were a fish.
+* *tar* - package up some stuff
+* *wget* - download this url
+ ** wget http://apache.org
+ ** wget -q -O - http://apache.org
+* *tr* - echo $PATH
+* *uname* - what system am I on?
+
+=== OSX commands
+
+* *pbpaste* - paste the contents of the clipboard to stdout
+* *pbcopy* - copy stdin to the clipbboard
+
+=== running shell scripts
+
+* *bash* - quick way to run a script if it isn't already executable
+* *chmod* - this file should be executable
+* *clear* - my terminal is messy
+* *diff/patch* - comparing or merging file contents
+* *ps/kill* - my script is running too long, i want to force it to stop
+* *less* - paging through command line output
+* *nohup* - I don't want this script to die if my connection is interrupted
+* *which* - where does this command live?
+* *crontab* - schedule something to run regularly (i use 'bash -l foo.sh' to run stuff in my crontab file)
+* *shutdown* - shutdown or restart a machine
+* *top* - what the heck is chewing up my cpu?
+* *uname* - what system am I on?
+
+== I never use
+
+Some people like it.
+sed -- i always use "perl -pe 's/find/replace/'")
+
+Getting used to using perl is better.
+This page was originally written thinking markdown had table support like confluence does.
+Soo all lines where using "| command | description |" formatting.
+Markdown doesn't have that, so I changed it to a list syntax with the following command on my mac:
+
+`+pbpaste | perl -ne '@f = split(" *\\| *", $_);
+print " - **$f[1]** - $f[2]\n"' | pbcopy+`
diff --git a/src/main/jbake/content/dev/mastering-the-command-line.md b/src/main/jbake/content/dev/mastering-the-command-line.md
deleted file mode 100644
index bed5666..0000000
--- a/src/main/jbake/content/dev/mastering-the-command-line.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Linux/OSX awesomeness
-
-Not specific to this projec, but can be incredibly useful ways to maximizes your time.  Mastering the command line is the best way to get things done, quick and cheaply.
-
-Reapeat after me:
-
- - I will write a script for any tasks I do regularly
-
-# Core commands
-
-Some very big time-saving commands
-
-## In shell scripts
-
- - **basename** - what is the file name again? not the path, just the file name
- - **dirname** - what directory is this in?
- - **readllink -f** - what is the absolute path of this file?
- - **cat** - spit out the contents of one or more files
- - **cp** - copy file or dir
- - **scp** - copy file or dir to another machine
- - **rsync** - both the above, but so much more awesome
-    - rsync -av here there
-    - rsync -e ssh -av here user@host:there
- - **cut** - wish I could i could chop out this column in the middle here
- - **date** - would be nice if I had some way to make this log file name a little more unique
- - **echo** - System.out.println()
- - **xargs** - can be useful but doesn't respect paths with spaces. I only use it sometimes
- - **find** - find some files and potentially execute a command against them
- - **egrep** - search for text in a file or from STDIN.  better than grep
- - **mkdir** - makes a dir, with -p will make parent dirs too
- - **mv** - move a file
- - **head** - spit out the first N lines of a file
- - **tail** - spit out the last N lines of a file
- - **tee** - I want to see the output of this command, but I also want to write it to a file.  Oh! tee is awesome!
- - **perl** - edit a stream:  cat file.txt
-    - edit a file: perl -i -pe 's/this/that/'
- - **pwd** - where am I?
- - **rm** - delete
- - **read (bash)** - I dig this out for strings with spaces. paths have spaces in them sometimes
-    - ls *.txt
-    - find . -name "*.txt"
- - **export (bash)** - why can't my script find this command? i use this to debug scripts 'export > /tmp/script-env.txt'
- - **for (bash)** - my favorite bash construct
-    - for n in one two three; do echo "$n"; done
-    - (side note, always quote your variables like "$n" vs $n, trust me it's a good habit)
- - **while  (bash)** - my second favorite bash construct
-    - loop forever and do something: while true; do my_command; sleep 10; done
- - **sleep** - Thread.sleep().  Only accepts seconds.  I typically do the math with bash sytax
-    - sleep for an hour:  sleep $(( 60 * 60 ))
-    - sleep for a day:  sleep $(( 60 * 60 * 24 ))
- - **sort** - sort lines of text
- - **uniq** - trim out the duplicates
-    - show me only things that had duplicates: uniq -d
-    - ( I always 'sort
- - **ssh** - awesomeness.  can execute commands remotely too
-    - ssh people.apache.org pwd
-    - ssh people.apache.org 'pwd
- - **sudo** - I wish I were a fish.  I wish I were a fish.
- - **tar** - package up some stuff
- - **wget** - download this url
-    - wget http://apache.org
-    - wget -q -O - http://apache.org
- - **tr** - echo $PATH
- - **uname** - what system am I on?
-
-## OSX commands
-
- - **pbpaste** - paste the contents of the clipboard to stdout
- - **pbcopy** - copy stdin to the clipbboard
-
-## running shell scripts
-
- - **bash** - quick way to run a script if it isn't already executable
- - **chmod** - this file should be executable
- - **clear** - my terminal is messy
- - **diff/patch** - comparing or merging file contents
- - **ps/kill** - my script is running too long, i want to force it to stop
- - **less** - paging through command line output
- - **nohup** - I don't want this script to die if my connection is interrupted
- - **which** - where does this command live?
- - **crontab** - schedule something to run regularly (i use 'bash -l foo.sh' to run stuff in my crontab file)
- - **shutdown** - shutdown or restart a machine
- - **top** - what the heck is chewing up my cpu?
- - **uname** - what system am I on?
-
-# I never use
-
-Some people like it.
-sed -- i always use "perl -pe 's/find/replace/'")
-
-Getting used to using perl is better.  This page was originally written thinking markdown had table support
-like confluence does.  Soo all lines where using "| command | description |" formatting.  Markdown doesn't
-have that, so I changed it to a list syntax with the following command on my mac:
-
-`pbpaste | perl -ne '@f = split(" *\\| *", $_); print " - **$f[1]** - $f[2]\n"' | pbcopy`
-
-
diff --git a/src/main/jbake/content/dev/october2007.adoc b/src/main/jbake/content/dev/october2007.adoc
new file mode 100644
index 0000000..8684877
--- /dev/null
+++ b/src/main/jbake/content/dev/october2007.adoc
@@ -0,0 +1,10 @@
+= October 2007
+:jbake-type: page
+:jbake-status: published
+
+OpenEJB 3.0 beta 1 released.
+First contribution from Jonathan Gallimore.
+(was anything checked in, if not yank this line) Completed Export Control (Cryptography) process.
+Completed integration with Tomcat 6.
+Expanded documentation and examples.
+Activity on the user list has increased slightly since the release.
diff --git a/src/main/jbake/content/dev/october2007.md b/src/main/jbake/content/dev/october2007.md
deleted file mode 100644
index e650b18..0000000
--- a/src/main/jbake/content/dev/october2007.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Title: October2007
-OpenEJB 3.0 beta 1 released.
-First contribution from Jonathan Gallimore. (was anything checked in, if
-not yank this line)
-Completed Export Control (Cryptography) process.
-Completed integration with Tomcat 6.
-Expanded documentation and examples.
-Activity on the user list has increased slightly since the release.
diff --git a/src/main/jbake/content/dev/october2008.adoc b/src/main/jbake/content/dev/october2008.adoc
new file mode 100644
index 0000000..8d9a552
--- /dev/null
+++ b/src/main/jbake/content/dev/october2008.adoc
@@ -0,0 +1,24 @@
+= October 2008
+:jbake-type: page
+:jbake-status: published
+
+ The user base has grown significantly.
+The primary areas seem to be people replacing the JBoss Embedded platform with OpenEJB as an embedded container for either testing or Swing/GUI work and people using OpenEJB in Tomcat for web work.
+There have also been some reports of very large applications getting ported to OpenEJB.
+External signs of adoption have increased as well with some OpenEJB users popping up in other communities such as Maven asking for OpenEJB focused improvements in their tools, a half dozen or so very favorable blog entries from people outside the project and a recent thread on TheServerSide where many users expressed they were considering leaving Spring for OpenEJB/Tomcat or Glassfish.
+
+Development on the OpenEJB Eclipse Plugin continues strong.
+The still-in-development Eclipse plugin is attracting some interest and has already received some contributions from at least two different individuals.
+Thanks goes out to Jonathan Gallimore for not succumbing to post-commit-status burnout as so many people do when first getting commit.
+The dedication is noted.
+Other larger areas of development have been a total overhaul of the client/server aspect of OpenEJB, first in the request speed and throughput and secondly in request failover and retry.
+This had been a weak area for the project and these improvements will likely increase the number of people using the standalone version of OpenEJB (current major areas of use are embedded and Tomcat).
+Some experimental work on integrating OpenEJB with Spring has been done which when completed should prove to be a compelling feature.
+
+Support for EJB 3.1 is underway.
+Full support for the proposed Singleton bean type has been added, which to our knowledge is the only implementation in the market currently.
+This should drive some EJB 3.1 early adopters to the project and serve as a good tool for getting feedback for the EJB 3.1 spec.
+
+The OpenEJB 3.1 release is up for a vote and if all goes well will be final in a few days.
+It's been a bit too long since our last release in April.
+Hopefully after 3.1 is released we can get back into the frequent release rhythm we had throughout the betas and up until 3.0 final.
diff --git a/src/main/jbake/content/dev/october2008.md b/src/main/jbake/content/dev/october2008.md
deleted file mode 100644
index 7d383f0..0000000
--- a/src/main/jbake/content/dev/october2008.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Title: October2008
-The user base has grown significantly. The primary areas seem to be people
-replacing the JBoss Embedded platform with OpenEJB as an embedded container
-for either testing or Swing/GUI work and people using OpenEJB in Tomcat for
-web work. There have also been some reports of very large applications
-getting ported to OpenEJB. External signs of adoption have increased as
-well with some OpenEJB users popping up in other communities such as Maven
-asking for OpenEJB focused improvements in their tools, a half dozen or so
-very favorable blog entries from people outside the project and a recent
-thread on TheServerSide where many users expressed they were considering
-leaving Spring for OpenEJB/Tomcat or Glassfish.
-
-Development on the OpenEJB Eclipse Plugin continues strong. The
-still-in-development Eclipse plugin is attracting some interest and has
-already received some contributions from at least two different
-individuals. Thanks goes out to Jonathan Gallimore for not succumbing to
-post-commit-status burnout as so many people do when first getting commit.
-The dedication is noted. Other larger areas of development have been a
-total overhaul of the client/server aspect of OpenEJB, first in the request
-speed and throughput and secondly in request failover and retry. This had
-been a weak area for the project and these improvements will likely
-increase the number of people using the standalone version of OpenEJB
-(current major areas of use are embedded and Tomcat). Some experimental
-work on integrating OpenEJB with Spring has been done which when completed
-should prove to be a compelling feature.
-
-Support for EJB 3.1 is underway. Full support for the proposed Singleton
-bean type has been added, which to our knowledge is the only implementation
-in the market currently. This should drive some EJB 3.1 early adopters to
-the project and serve as a good tool for getting feedback for the EJB 3.1
-spec.
-
-The OpenEJB 3.1 release is up for a vote and if all goes well will be final
-in a few days.	It's been a bit too long since our last release in April. 
-Hopefully after 3.1 is released we can get back into the frequent release
-rhythm we had throughout the betas and up until 3.0 final.
diff --git a/src/main/jbake/content/dev/october2009.adoc b/src/main/jbake/content/dev/october2009.adoc
new file mode 100644
index 0000000..d76acce
--- /dev/null
+++ b/src/main/jbake/content/dev/october2009.adoc
@@ -0,0 +1,5 @@
+= October 2009
+:jbake-type: page
+:jbake-status: published
+
+Release 3.1.2 Eclipse Plugin 1.0.0 alpha release More EJB 3.1 activity
diff --git a/src/main/jbake/content/dev/october2009.md b/src/main/jbake/content/dev/october2009.md
deleted file mode 100644
index 0169b0d..0000000
--- a/src/main/jbake/content/dev/october2009.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Title: October2009
-Release 3.1.2
-Eclipse Plugin 1.0.0 alpha release
-More EJB 3.1 activity
diff --git a/src/main/jbake/content/dev/openejb-release-process.adoc b/src/main/jbake/content/dev/openejb-release-process.adoc
new file mode 100644
index 0000000..4f8b77b
--- /dev/null
+++ b/src/main/jbake/content/dev/openejb-release-process.adoc
@@ -0,0 +1,167 @@
+= OpenEJB Release Process
+:jbake-type: page
+:jbake-status: published
+
+ Note: This information is largely obsolete and remains here for reference only.
+
+{code:none} mvn release:prepare -Dusername=dblevins -Dassemble
+
+....
+{code:none}
+mvn release:perform -Dassemble -Dusername=dblevins -DaltDeploymentRepository=dblevins::default::scp://people.apache.org/x1/home/dblevins/public_html/stage -Dgpg.passphrase=xxxxx
+
+
+
+mvn clean deploy -Prelease -Dassemble -Dusername=dblevins -DaltDeploymentRepository=dblevins::default::scp://people.apache.org/x1/home/dblevins/public_html/stage/repo -Dgpg.passphrase=xxxxx
+....
+
+. Create a copy of the trunk the branch will be based on.
+
+{code:none} svn copy -m "TomEE 1.5.1 branch" \   https://svn.apache.org/repos/asf/tomee/tomee/trunk \   https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.5.1
+
+== Merging things from trunk to the branch
+
+....
+While fixing issues in the branch and trunk in parallel it may happen that some changes in trunk have not been applied to the branch. Provided you're in the branch's directory the following command applies a change from the trunk  to the branch (`{-c 575845`} is the commit number with the fix and the url points to a repo the change is in).
+
+{code:none}
+svn merge -c 575845 https://svn.apache.org/repos/asf/tomee/tomee/trunk
+....
+
+Here's a little script that can make merging easier
+
+....
+#!/bin/bash
+
+for n in $@; do
+  m=$(($n -1))
+  LOG=/tmp/svn-commit-r$n.log
+
+  cat /dev/null > $LOG
+
+  echo "Merging r$n - http://svn.apache.org/viewvc?rev=$n&view=rev" >> $LOG
+  echo "" >> $LOG
+  echo "svn merge -r $m:$n https://svn.apache.org/repos/asf/tomee/tomee/trunk ." >> $LOG
+  echo "" >> $LOG
+  svn log -r$n https://svn.apache.org/repos/asf/tomee/tomee/trunk >> $LOG
+
+  svn merge -r $m:$n https://svn.apache.org/repos/asf/tomee/tomee/trunk .  &&
+  svn ci -F $LOG
+  echo "$n merged"
+done
+....
+
+== Aggregation into a stage/3.x directory
+
+....
+#!/bin/bash
+
+VER=3.0
+
+function package () {
+    SOURCE=$1; DEST=${2:-$SOURCE}
+    tar czf $DEST.tar.gz $SOURCE
+    zip -9rq $DEST.zip $SOURCE
+}
+function shash {
+    openssl $1 < $2 > $2.$1 ;
+}
+function sign {
+    archive=$1
+    gpg --armor --output $archive.asc --detach-sig $archive
+    gpg --verify $archive.asc $archive
+}
+
+function fail () { echo $1 >&2; exit 1;}
+
+
+mkdir $VER
+(cd $VER
+
+svn export http://svn.apache.org/repos/asf/openejb/tags/openejb-$VER/examples openejb-examples-$VER
+package openejb-examples-$VER && rm -r openejb-examples-$VER
+
+svn export http://svn.apache.org/repos/asf/openejb/tags/openejb-$VER openejb-$VER-src
+package openejb-$VER-src && rm -r openejb-$VER-src
+
+for archive in *.{zip,tar.gz}; do
+    echo $archive
+    shash md5 $archive
+    sign $archive
+done || fail "Unable to sign or hash release archives"
+)
+
+scp -r $VER  people.apache.org:public_html/stage/
+
+# Copy standalone assembly in
+
+ssh people.apache.org "cp ~/public_html/stage/repo/org/apache/openejb/openejb-standalone/$VER/openejb-standalone-$VER.{zip,tar.gz}{,.asc,.md5} ~/public_html/stage/$VER/"
+
+
+echo $VER | ssh people.apache.org 'read VER && for n in ~/public_html/stage/repo/org/apache/openejb/openejb-standalone/$VER/openejb-standalone-$VER.{zip,tar.gz}{,.asc,.md5}; do cp $n ~/public_html/stage/$VER/$(basename ${n/openejb-standalone-$VER/openejb-$VER}); done'
+
+# Copy tomcat webapp assembly in
+
+echo $VER | ssh people.apache.org 'read VER && for n in ~/public_html/stage/repo/org/apache/openejb/openejb-tomcat-webapp/$VER/openejb-tomcat-webapp-$VER.war{,.asc,.md5}; do cp $n ~/public_html/stage/$VER/$(basename ${n/-tomcat-webapp-$VER/}); done'
+....
+
+== Release notes
+
+....
+#set( $rpc = $xmlrpc.connect("dblevins:xxxxx","http://issues.apache.org/jira/rpc/xmlrpc") )
+#set( $version = $rpc.getVersion("OPENEJB", "3.0") )
+#set ( $versionId = $version.id )
+#set ( $jira = $rss.fetch("http://issues.apache.org/jira/secure/IssueNavigator.jspa?view=rss&&pid=12310530&status=5&status=6&fixfor=${versionId}&tempMax=1000&reset=true&decorator=none") )
+#set( $issues = $jira.issues )
+
+Apache OpenEJB $version
+
+$date
+
+New Features:
+
+#foreach ( $issue in $issues.equals("type", "New Feature").descending("id") )
+  * [$issue.key]  $issue.summary
+#end
+
+Improvements:
+
+#foreach ( $issue in $issues.equals("type", "Improvement") )
+  * [$issue.key]  $issue.summary
+#end
+
+Bugs:
+
+#foreach ( $issue in $issues.equals("type", "Bug").sort("priority") )
+  * [$issue.key]  $issue.summary
+#end
+
+Tasks & Sub-Tasks:
+
+#foreach ( $issue in $issues.equals("type", "Task").sort("summary") )
+  * [$issue.key]  $issue.summary
+#end
+#foreach ( $issue in $issues.equals("type", "Sub-task").sort("summary") )
+  * [$issue.key]  $issue.summary
+#end
+
+
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+Unimplemented Features, bugs, limitations
+
+#set ( $jira = $rss.fetch("http://issues.apache.org/jira/secure/IssueNavigator.jspa?view=rss&&pid=12310530&status=1&status=3&status=4&version=${versionId}&tempMax=1000&reset=true&decorator=none") )
+#set( $issues = $jira.issues )
+
+#foreach ( $issue in $issues.sort("priority") )
+  * [$issue.key]  $issue.summary
+#end
+....
+
+== README.html file
+
+some way to dynamically update this would be great.
+
+{code:html} <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">+++<html>++++++<head>++++++<TITLE>+++Apache OpenEJB 3.0+++</TITLE>++++++</head>++++++<body>+++[discrete] === Apache OpenEJB 3.0   {blank}   Packaging Details (or "What Should I Download?")   * OpenEJB Standlone Server:  ** link:openejb-3.0.zip[openejb-3.0.zip]  ** link:openejb-3.0.tar.gz[openejb-3.0.tar.gz] * OpenEJB for Tomcat 6 or Tomcat 5.5:  ** link:openejb.war[openejb.war] * EJB 3.0 and other examples:  ** link:openejb-examples-3.0.zip[openejb-examples-3.0.zip]  ** link:openejb-examples-3.0.tar.gz[openejb-examples-3.0.tar.gz] * Source:  ** link:openejb-3.0-src.zip[openejb-3.0-src.zip]  ** link:openejb-3.0-src.tar.gz[openejb-3.0-src.tar.gz]   Thank you for using http://tomee.apache.org/[OpenEJB]!.
+*The Apache OpenEJB Project* + http://tomee.apache.org/   {blank}</BODY></HTML> # Publishing When all voting is done {code:none} mvn stage:copy -Dsource="http://people.apache.org/~dblevins/stage/repo/" \ -Dtarget="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository" \ -DsourceRepositoryId=apache.staging \ -DtargetRepositoryId=apache.releases \ -Dversion=3.0 {code:none} $ mv 3.0 /www/www.apache.org/dist/openejb/+++</body>++++++</html>+++
diff --git a/src/main/jbake/content/dev/openejb-release-process.md b/src/main/jbake/content/dev/openejb-release-process.md
deleted file mode 100644
index 2934d99..0000000
--- a/src/main/jbake/content/dev/openejb-release-process.md
+++ /dev/null
@@ -1,278 +0,0 @@
-Title: OpenEJB Release Process
-
-	Note: This information is largely obsolete and remains here for reference only.
-
-{code:none}
-mvn release:prepare -Dusername=dblevins -Dassemble
-
-    
-    {code:none}
-    mvn release:perform -Dassemble -Dusername=dblevins
--DaltDeploymentRepository=dblevins::default::scp://people.apache.org/x1/home/dblevins/public_html/stage
--Dgpg.passphrase=xxxxx
-
-
-
-    mvn clean deploy -Prelease -Dassemble -Dusername=dblevins
--DaltDeploymentRepository=dblevins::default::scp://people.apache.org/x1/home/dblevins/public_html/stage/repo
--Dgpg.passphrase=xxxxx
-
-
-1. Create a copy of the trunk the branch will be based on.
-
-{code:none}
-svn copy -m "TomEE 1.5.1 branch" \
-  https://svn.apache.org/repos/asf/tomee/tomee/trunk \
-  https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.5.1
-
-    
-#  Merging things from trunk to the branch
-    
-    While fixing issues in the branch and trunk in parallel it may happen that
-some changes in trunk have not been applied to the branch. Provided you're
-in the branch's directory the following command applies a change from the
-trunk  to the branch (`{-c 575845`} is the commit number with the fix and
-the url points to a repo the change is in).
-    
-    {code:none}
-    svn merge -c 575845 https://svn.apache.org/repos/asf/tomee/tomee/trunk
-
-
-Here's a little script that can make merging easier
-
-
-    #!/bin/bash
-    
-    for n in $@; do
-      m=$(($n -1))
-      LOG=/tmp/svn-commit-r$n.log
-    
-      cat /dev/null > $LOG
-    
-      echo "Merging r$n - http://svn.apache.org/viewvc?rev=$n&view=rev" >> $LOG
-      echo "" >> $LOG
-      echo "svn merge -r $m:$n
-https://svn.apache.org/repos/asf/tomee/tomee/trunk ." >> $LOG
-      echo "" >> $LOG
-      svn log -r$n https://svn.apache.org/repos/asf/tomee/tomee/trunk >>
-$LOG
-    
-      svn merge -r $m:$n
-https://svn.apache.org/repos/asf/tomee/tomee/trunk .  &&
-      svn ci -F $LOG
-      echo "$n merged"
-    done
-
-
-<a name="OpenEJBReleaseProcess-Aggregationintoastage/3.xdirectory"></a>
-#  Aggregation into a stage/3.x directory
-
-
-    #!/bin/bash
-    
-    VER=3.0
-    
-    function package () {
-        SOURCE=$1; DEST=${2:-$SOURCE}
-        tar czf $DEST.tar.gz $SOURCE
-        zip -9rq $DEST.zip $SOURCE
-    }
-    function shash {
-        openssl $1 < $2 > $2.$1 ;
-    }
-    function sign {
-        archive=$1
-        gpg --armor --output $archive.asc --detach-sig $archive
-        gpg --verify $archive.asc $archive
-    }
-    
-    function fail () { echo $1 >&2; exit 1;}
-    
-    
-    mkdir $VER
-    (cd $VER
-    
-    svn export
-http://svn.apache.org/repos/asf/openejb/tags/openejb-$VER/examples
-openejb-examples-$VER
-    package openejb-examples-$VER && rm -r openejb-examples-$VER
-    
-    svn export http://svn.apache.org/repos/asf/openejb/tags/openejb-$VER
-openejb-$VER-src
-    package openejb-$VER-src && rm -r openejb-$VER-src
-    
-    for archive in *.{zip,tar.gz}; do
-        echo $archive
-        shash md5 $archive
-        sign $archive
-    done || fail "Unable to sign or hash release archives"
-    )
-    
-    scp -r $VER  people.apache.org:public_html/stage/
-    
-    # Copy standalone assembly in
-    
-    ssh people.apache.org "cp
-~/public_html/stage/repo/org/apache/openejb/openejb-standalone/$VER/openejb-standalone-$VER.{zip,tar.gz}{,.asc,.md5}
-~/public_html/stage/$VER/"
-    
-    
-    echo $VER | ssh people.apache.org 'read VER && for n in
-~/public_html/stage/repo/org/apache/openejb/openejb-standalone/$VER/openejb-standalone-$VER.{zip,tar.gz}{,.asc,.md5};
-do cp $n ~/public_html/stage/$VER/$(basename
-${n/openejb-standalone-$VER/openejb-$VER}); done'
-    
-    # Copy tomcat webapp assembly in
-    
-    echo $VER | ssh people.apache.org 'read VER && for n in
-~/public_html/stage/repo/org/apache/openejb/openejb-tomcat-webapp/$VER/openejb-tomcat-webapp-$VER.war{,.asc,.md5};
-do cp $n ~/public_html/stage/$VER/$(basename ${n/-tomcat-webapp-$VER/});
-done'
-
-
-<a name="OpenEJBReleaseProcess-Releasenotes"></a>
-#  Release notes
-
-
-    #set( $rpc =
-$xmlrpc.connect("dblevins:xxxxx","http://issues.apache.org/jira/rpc/xmlrpc")
-)
-    #set( $version = $rpc.getVersion("OPENEJB", "3.0") )
-    #set ( $versionId = $version.id )
-    #set ( $jira =
-$rss.fetch("http://issues.apache.org/jira/secure/IssueNavigator.jspa?view=rss&&pid=12310530&status=5&status=6&fixfor=${versionId}&tempMax=1000&reset=true&decorator=none")
-)
-    #set( $issues = $jira.issues )
-    
-    Apache OpenEJB $version
-    
-    $date
-    
-    New Features:
-    
-    #foreach ( $issue in $issues.equals("type", "New Feature").descending("id")
-)
-      * [$issue.key]
- $issue.summary
-    #end
-    
-    Improvements:
-    
-    #foreach ( $issue in $issues.equals("type", "Improvement") )
-      * [$issue.key]
- $issue.summary
-    #end
-    
-    Bugs:
-    
-    #foreach ( $issue in $issues.equals("type", "Bug").sort("priority") )
-      * [$issue.key]
- $issue.summary
-    #end
-    
-    Tasks & Sub-Tasks:
-    
-    #foreach ( $issue in $issues.equals("type", "Task").sort("summary") )
-      * [$issue.key]
- $issue.summary
-    #end
-    #foreach ( $issue in $issues.equals("type", "Sub-task").sort("summary") )
-      * [$issue.key]
- $issue.summary
-    #end
-    
-    
-    
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    
-    Unimplemented Features, bugs, limitations
-    
-    #set ( $jira =
-$rss.fetch("http://issues.apache.org/jira/secure/IssueNavigator.jspa?view=rss&&pid=12310530&status=1&status=3&status=4&version=${versionId}&tempMax=1000&reset=true&decorator=none")
-)
-    #set( $issues = $jira.issues )
-    
-    #foreach ( $issue in $issues.sort("priority") )
-      * [$issue.key]
- $issue.summary
-    #end
-
-
-
-<a name="OpenEJBReleaseProcess-README.htmlfile"></a>
-#  README.html file
-
-some way to dynamically update this would be great.
-
-{code:html}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE>Apache OpenEJB 3.0</TITLE>
-<META http-equiv=Content-Type content="text/html">
-</HEAD>
-<BODY>
-<P>
-<H3>Apache OpenEJB 3.0</H3>
-<P></P>
-
-<p>Packaging Details (or "What Should I Download?")
-  <ul>
-      <li>
-	  OpenEJB Standlone Server:
-	  <ul>
-	      <li><a href="openejb-3.0.zip">openejb-3.0.zip</a></li>
-	      <li><a href="openejb-3.0.tar.gz">openejb-3.0.tar.gz</a></li>
-	  </ul>
-      </li>
-      <li>
-	  OpenEJB for Tomcat 6 or Tomcat 5.5:
-	  <ul>
-	      <li><a href="openejb.war">openejb.war</a></li>
-	  </ul>
-      </li>
-      <li>
-	  EJB 3.0 and other examples:
-	  <ul>
-	      <li><a
-href="openejb-examples-3.0.zip">openejb-examples-3.0.zip</a></li>
-	      <li><a
-href="openejb-examples-3.0.tar.gz">openejb-examples-3.0.tar.gz</a></li>
-	  </ul>
-      </li>
-      <li>
-	  Source:
-	  <ul>
-	      <li><a
-href="openejb-3.0-src.zip">openejb-3.0-src.zip</a></li>
-	      <li><a
-href="openejb-3.0-src.tar.gz">openejb-3.0-src.tar.gz</a></li>
-	  </ul>
-      </li>
-  </ul>
-</p>
-
-<P>Thank you for using <A href="http://tomee.apache.org/">OpenEJB</A>!.
-</P>
-<P><B>The Apache OpenEJB Project</B> <BR><A
-href="http://tomee.apache.org/">http://tomee.apache.org/</A> </P>
-<P>
-<P></P></BODY></HTML>
-
-    
-#  Publishing
-    
-    When all voting is done
-    
-    {code:none}
-    mvn stage:copy -Dsource="http://people.apache.org/~dblevins/stage/repo/" \
-     
--Dtarget="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"
-\
-      -DsourceRepositoryId=apache.staging \
-      -DtargetRepositoryId=apache.releases \
-      -Dversion=3.0
-
-
-{code:none}
-
-$ mv 3.0 /www/www.apache.org/dist/openejb/
-
diff --git a/src/main/jbake/content/dev/proxies.adoc b/src/main/jbake/content/dev/proxies.adoc
new file mode 100644
index 0000000..f2d23e2
--- /dev/null
+++ b/src/main/jbake/content/dev/proxies.adoc
@@ -0,0 +1,19 @@
+= Proxies
+:jbake-type: page
+:jbake-status: published
+
+== Where's the Java source for the proxies?
+
+The short answer is we do not generate java code containing any ejb logic at all as other platforms like WebSphere and WebLogic do.
+We use dynamic proxy generation via java.lang.reflect.Proxy.
+
+Most of the commercial platforms predate dynamic proxy generation and not only statically generate java files which are then compiled and included in the app but decided as long as they were generating java files that they would jam-pack them with as many optimizations as they could.
+The result was that significant portions of your application data such as transaction attributes and database queries were stuck in generated vendor code.
+We don't have any equivalent to that.
+
+Dynamic proxies such as java.lang.reflect.Proxy or cglib byte code in memory, not java source, which is immediately turned into a class definition and used.
+The basic paradigm is that you give the library the interfaces you want implemented and some sort of Handler object.
+The library will give you back a proxy instance that does nothing more than call your handler every time a method is called.
+Now it's possible with some trickery to pull the byte code for any java.lang.Class instance out of the classloader and then use some sort of java decompiler library to turn that into some sort of java source file, however there's no real motivation to do so as the VM generated proxies are quite dumb and the code that does all the work is not generated and available for download or svn checkout.
+
+If you are coming from a commercial vendor and simply looking for a good place to begin your debugging, look for implementations java.lang.reflect.InvocationHandler and slap a breakpoint in the "invoke" method and you'll be all set.
diff --git a/src/main/jbake/content/dev/proxies.md b/src/main/jbake/content/dev/proxies.md
deleted file mode 100644
index f08659d..0000000
--- a/src/main/jbake/content/dev/proxies.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Title: Proxies
-<a name="Proxies-Where'stheJavasourcefortheproxies?"></a>
-#  Where's the Java source for the proxies?
-
-The short answer is we do not generate java code containing any ejb logic
-at all as other platforms like WebSphere and WebLogic do.  We use dynamic
-proxy generation via java.lang.reflect.Proxy.
-
-Most of the commercial platforms predate dynamic proxy generation and not
-only statically generate java files which are then compiled and included in
-the app but decided as long as they were generating java files that they
-would jam-pack them with as many optimizations as they could.  The result
-was that significant portions of your application data such as transaction
-attributes and database queries were stuck in generated vendor code.  We
-don't have any equivalent to that.
-
-Dynamic proxies such as java.lang.reflect.Proxy or cglib byte code in
-memory, not java source, which is immediately turned into a class
-definition and used.  The basic paradigm is that you give the library the
-interfaces you want implemented and some sort of Handler object.  The
-library will give you back a proxy instance that does nothing more than
-call your handler every time a method is called.  Now it's possible with
-some trickery to pull the byte code for any java.lang.Class instance out of
-the classloader and then use some sort of java decompiler library to turn
-that into some sort of java source file, however there's no real motivation
-to do so as the VM generated proxies are quite dumb and the code that does
-all the work is not generated and available for download or svn checkout.
-
-If you are coming from a commercial vendor and simply looking for a good
-place to begin your debugging, look for implementations
-java.lang.reflect.InvocationHandler and slap a breakpoint in the "invoke"
-method and you'll be all set.
-
-
diff --git a/src/main/jbake/content/dev/release-tomee.adoc b/src/main/jbake/content/dev/release-tomee.adoc
new file mode 100644
index 0000000..a211513
--- /dev/null
+++ b/src/main/jbake/content/dev/release-tomee.adoc
@@ -0,0 +1,290 @@
+= Releasing TomEE
+:jbake-type: page
+:jbake-status: published
+
+ This document is aimed at guiding a release manager through the general release process. You will need either a Linux, Mac, or failing that a Linux Virtual (with at least a 50GB Drive) on Win.
+
+== Preparation of The Branch
+
+Run menu:ant -f rat.xml[report.txt] on trunk to ensure all licences are in place.
+
+* Review the report.txt and update/add missing headers until clean.
+* _Tip_, search for *Unapproved licenses:* at the beginning of the report for a list.
+
+Branch the version to release and ensure it builds and passes all tests.
+
+Add a buildbot CI setup for branch here:
+
+https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/tomee.conf
+
+Basically search for the following line and it should be obvious how to add a new builder:
+
+ c['builders'].append(tomee_hemera_builder("tomee-trunk-ubuntu", "tomee/tomee/trunk"))
+
+An SVN trigger must be added afterwards.
+This can only be done by someone with admin permissions, such as any PMC chair or an Infra team member.
+Just drop an email to _infrastructure@apache.org_
+
+== Create a TCK Branch
+
+Branch the TCK using the same version as the release branch from here:
+
+https://svn.apache.org/repos/tck/tomee-tck/trunk
+
+Update the TCK branch files to point to the version branch.
+
+ \tckbranch\plus.properties
+ \tckbranch\pom.xml
+ \tckbranch\webprofile-plus.properties
+ \tckbranch\webprofile.properties
+
+Run menu:ant -f rat.xml[report.txt] on the branch.
+
+* Review the report.txt and update/add missing headers until clean.
+* _Tip_, search for *Unapproved licenses:*.
+
+== Check SVN Authentication
+
+Pre-authenticate svn repositories to ensure your credentials are cached before using any tools.
+
+ svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://svn.apache.org/repos/asf/tomee/tomee/branches/testdir1
+ svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://svn.apache.org/repos/asf/tomee/tomee/branches/testdir1
+ svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://repository.apache.org/content/repositories/testdir2
+ svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://repository.apache.org/content/repositories/testdir2
+ svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir3
+ svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir3
+
+== Prepare Maven Authentication
+
+Ensure your maven .m2/settings.xml correct, and be aware that the tools currently require a clear text password:
+
+....
+<server>
+  <id>apache.snapshots.https</id>
+  <username>un</username>
+  <password>pw.in.clear</password>
+</server>
+
+<server>
+  <id>apache.releases.https</id>
+  <username>un</username>
+  <password>pw.in.clear</password>
+</server>
+
+<server>
+  <id>apache.dist.https</id>
+  <username>un</username>
+  <password>pw.in.clear</password>
+</server>
+
+<profiles>
+	<profile>
+	...
+		<repositories>
+			<repository>
+			  <id>apache.dist.https</id>
+			  <url>https://dist.apache.org/repos/dist</url>
+			</repository>
+		  </repositories>
+....
+
+== Code Signing Setup
+
+If this is your first release then you will have to ensure that you have a code signing key prepared on the machine from which you perform the release.
+The process is quite intense.
+You can find information here:
+
+* http://www.apache.org/dev/release-signing.html
+* http://maven.apache.org/developers/release/pmc-gpg-keys.html
+
+However, the basic steps are:
+
+* Create a key using *gpg --gen-key*, using size 4096 and answering the questions that command issues.
+* During the process you will have to generate random entropy, this is best achieved in another console and issuing the command *find / > /dev/null* and waiting a minute.
+* List the keys using *gpg --list-keys* and take note of the name
+
+Once you have your key then you will need to append it to the key file here:
+
+* http://www.apache.org/dist/tomee/KEYS
+
+That is best done as the file itself explains, once you open and view it in a UTF-8 safe text editor you will see the description at the top.
++ Just follow the instructions there on how to append your key.
+The basic steps are also here, please read both before you proceed:
+
+* Save the KEYS file on your local machine and import it using *gpg --import KEYS*
+* Then create the new KEYS file using **(gpg --list-sigs +++<your name="">+++&& gpg --armor --export +++<your name="">+++) >> KEYS**+++</your>++++++</your>+++
+* Check that the new KEYS file contains your key.
+* Log in to people.apache.org and locate /dist/tomee/KEYS
+* Make a backup of the remote KEYS file just in case
+* Overwrite the old /dist/tomee/KEYS file with your new one that now also contains your key.
+* Go to http://pgp.mit.edu/ and add your ascii armoured key
+* Take note of your key fingerprint using **gpg --fingerprint +++<your name="">+++**+++</your>+++
+* Go to https://id.apache.org, log in and fill OpenPGP Public Key Primary Fingerprint: with the value of your fingerprint.
+
+== Build the Release Tools
+
+Checkout the release tools using SVN from here https://svn.apache.org/repos/asf/tomee/sandbox/release-tools
+
+Really read the README.mdtext and follow the instructions for building the 3rd party libraries.
++ Basically SVN checkout and compile https://svn.codehaus.org/swizzle/trunk[Swizzle] and https://svn.apache.org/repos/asf/creadur/tentacles/trunk[Tentacles]
+
+Build the release tools, _mvn clean install -DskipTests -DfailIfNoTests=false_
+
+Have a look at *run.sh* to see the entry point.
+
+Understand that the release tools are not polished, and you currently may have to edit source and re-compile.
+
+== Site Staging <<staging,>> For some of the release steps you will need to provide documentation on the site.
+Checkout the site here:
+
+https://svn.apache.org/repos/asf/tomee/site/trunk
+
+Most of the content can be found under 'content' and subdirectories.
+
+When you commit changes the site should be built automatically by the buildbot, but you can force a build on IRC using:
+
+ **tomee-bot: force build tomee-site-staging**
+
+The buildbot staging result can be seen here:
+
+http://ci.apache.org/builders/tomee-site-staging
+
+And the actual staging site, where you can review your changes, is here:
+
+http://tomee.staging.apache.org/
+
+Once you are happy with the staging you can publish to the real site using:
+
+https://cms.apache.org/tomee/publish
+
+== Begin The Release Process
+
+Ensure TCK is passing all tests, and if so create an SVN tag from the branch.
+
+....
+Note: It is a future goal to either separate OpenEJB from TomEE or unify the versions so the
+[maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/) can be used.
+
+Because we cannot use the Maven release tools we currently have to create a an SVN tag manually. The best way to do this is to:
+
+ - Copy the branch to a staging branch using:
+   > svn copy https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]  https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging -m "Staging [version]"
+ - Checkout the staging branch using:
+   > svn co https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging tomee-[version]-staging
+ - Update all SNAPSHOT versions to the release versions in the local tomee-[version]-staging and commit.
+ - Create the tag from the staging:
+   > svn copy https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging https://svn.apache.org/repos/asf/tomee/tomee/tags/tomee-[version] -m "Tag [version]"
+ - Delete the staging branch using:
+   > svn rm https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging -m "Delete staging"
+....
+
+Open a console on the release-tools directory.
+
+NOTE: Before running any *./run.sh* activity always check the release tools code for the command tomee-release-tools/src/main/java/org/apache/openejb/tools/release/cmd.
+At the moment some of the commands need manually editing to work.
+Eventually the commands should be re-written.
+
+All JIRA actions should be performed on the ASF JIRA here:
+
+https://issues.apache.org/jira/browse/TOMEE
+
+Ensure JIRAs have been filed for commits using *./run.sh reviewcommits*
+
+Update fixVersions for JIRAs used in SVN commits using *./run.sh updatejiras* - _Untested, requires investigation_
+
+Review and bulk Close all JIRAs for the version to be released.
+
+Publish the changed binaries report (if any) using *./run.sh comparelibraries*
+
+Write and publish the release notes preview on the staging site.
+
+Publish a summary of the RAT report preview on the staging site.
+
+Using the RAT report as a guide update LICENSE and NOTICE files for any changed binaries, and add new ones if required.
+
+Update branch versions.
+How you do this is up to you at this point in time.
+
+Update trunk versions.
+How you do this is up to you at this point in time.
+
+Create the next version iterations in JIRA.
+
+== Rolling Out The Preview
+
+....
+Note: Before running anything below ensure you either have:
+
+ - A valid tomee-release.properties from the last release in your home directory (Speak to the last release manager).
+ - Or have modified **tomee-release-tools/src/main/java/org/apache/openejb/tools/release/Release.java** with current versions and **mvn clean install**.
+....
+
+Ensure the TCK passes with preview repositories by editing and ensuring paths are correct in the following files:
+
+ \tckbranch\plus.properties
+ \tckbranch\pom.xml
+ \tckbranch\webprofile-plus.properties
+ \tckbranch\webprofile.properties
+
+Publish the preview using *./run.sh roll binaries legal releasenotes preview* - You can run these tasks like so, or individually in order.
+It will be likely that this will have to be repeated several times before a successful vote.
+
+The _legal_ step will create the legal report files in the /tmp/download/staging-[revision]/legal directory.
+These need to be added to the staging repo.
+
+* Delete the [legal]/repo and [legal]/content directories, as these are no longer required  rm -R /tmp/download/staging-[revision]/legal/content  rm -R /tmp/download/staging-[revision]/legal/repo
+* Perform a non-recursive checkout of the staging repo and add the legal:  svn co -N https://dist.apache.org/repos/dist/dev/tomee/staging-[revision] /tmp/download/staging  mv /tmp/download/staging-[revision]/legal /tmp/download/staging  cd /tmp/download/staging-[revision]  svn add legal
+
+Once the binaries are in place add the staging repository to the corresponding TCK project and fire off a build.
+To fire off a build on EC2 from the TCK directory speak to the last release manager for the *curl* command to use
+
+If the TCK fails then discuss, fix and re-roll.
+
+Publish a https://www.apache.org/foundation/voting.html[Vote] if, and only if, the TCK passes.
+
+Votes are generally managed and identified using keywords such as [VOTE], [CANCELLED] and [RESULT]
+
+If the vote fails then discuss, fix and re-roll.
+
+== Voted Binaries
+
+Once the vote has passed then release the binaries on Nexus: https://repository.apache.org/index.html#welcome
+
+Update both OpenEJB and TomEE JIRA versions as released (Set the release date).
+
+Copy the binaries to the release location (User rights require a PMC to do this)
+
+ From: https://dist.apache.org/repos/dist/dev/tomee/staging-[stagingId]/tomee-[version]
+ To: https://dist.apache.org/repos/dist/release/tomee/tomee-[version]
+
+Wait for the binaries to replicate to mirrors.
+Here is a neat script from David to check the status:
+
+....
+#!/bin/bash
+
+RELEASE=${1?Specify a release, such as './mirror_check.sh tomee-1.7.1'}
+
+function list_mirrors {
+    DYN=http://www.apache.org/dyn/closer.cgi/tomee/$RELEASE/
+    wget -q -O - $DYN | tr '">< ' '\n' | grep "^http.*$RELEASE/" | sort | uniq
+}
+
+function status_code {
+    wget -v "$1" 2>&1| grep 'awaiting response' | tr ' ' '\n' | grep "[0-9]"
+}
+
+list_mirrors | while read n; do
+    echo "$(status_code $n) $n"
+done | sort | grep 'http'
+....
+
+Commit and publish changes to the site, see xref:release-tomee.adoc#staging[Site Staging]
+
+ https://cms.apache.org/tomee/publish
+
+== Blog
+
+Announce to the world that TomEE has new bells and whistles!
+
+https://blogs.apache.org/roller-ui/login.rol + http://twitter.com/ApacheTomEE + http://facebook.com/ApacheTomEE
diff --git a/src/main/jbake/content/dev/release-tomee.md b/src/main/jbake/content/dev/release-tomee.md
deleted file mode 100644
index a125e4a..0000000
--- a/src/main/jbake/content/dev/release-tomee.md
+++ /dev/null
@@ -1,283 +0,0 @@
-#Releasing TomEE
-
-	This document is aimed at guiding a release manager through the general release process. You will need either a Linux, Mac, or failing that a Linux Virtual (with at least a 50GB Drive) on Win. 
-
-###Preparation of The Branch
-	
-Run **ant -f rat.xml > report.txt** on trunk to ensure all licences are in place.
-
- - Review the report.txt and update/add missing headers until clean.
- - *Tip*, search for **Unapproved licenses:** at the beginning of the report for a list.
-
-Branch the version to release and ensure it builds and passes all tests.
-
-Add a buildbot CI setup for branch here:
-
-[https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/tomee.conf](https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/tomee.conf)
-
-Basically search for the following line and it should be obvious how to add a new builder:
-
-	c['builders'].append(tomee_hemera_builder("tomee-trunk-ubuntu", "tomee/tomee/trunk"))
-	
-An SVN trigger must be added afterwards. This can only be done by someone with admin permissions, such as any PMC chair or an Infra team member.
-Just drop an email to *infrastructure@apache.org*
-
-###Create a TCK Branch
-
-Branch the TCK using the same version as the release branch from here:
-
-[https://svn.apache.org/repos/tck/tomee-tck/trunk](https://svn.apache.org/repos/tck/tomee-tck/trunk)
-
-Update the TCK branch files to point to the version branch.
-
-	\tckbranch\plus.properties
-	\tckbranch\pom.xml
-	\tckbranch\webprofile-plus.properties
-	\tckbranch\webprofile.properties
-
-Run **ant -f rat.xml > report.txt** on the branch.
-
- - Review the report.txt and update/add missing headers until clean.
- - *Tip*, search for **Unapproved licenses:**.
-
-###Check SVN Authentication
- 
-Pre-authenticate svn repositories to ensure your credentials are cached before using any tools.
-
-	svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://svn.apache.org/repos/asf/tomee/tomee/branches/testdir1
-	svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://svn.apache.org/repos/asf/tomee/tomee/branches/testdir1
-	svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://repository.apache.org/content/repositories/testdir2
-	svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://repository.apache.org/content/repositories/testdir2
-	svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir3
-	svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir3
-
-###Prepare Maven Authentication
-
-Ensure your maven .m2/settings.xml correct, and be aware that the tools currently require a clear text password:
-
-	<server>
-	  <id>apache.snapshots.https</id>
-	  <username>un</username>
-	  <password>pw.in.clear</password>
-	</server>
-
-	<server>
-	  <id>apache.releases.https</id>
-	  <username>un</username>
-	  <password>pw.in.clear</password>
-	</server>
-
-	<server>
-	  <id>apache.dist.https</id>
-	  <username>un</username>
-	  <password>pw.in.clear</password>
-	</server>
-
-	<profiles>
-		<profile>
-		...
-			<repositories>
-				<repository>
-				  <id>apache.dist.https</id>
-				  <url>https://dist.apache.org/repos/dist</url>
-				</repository>
-			  </repositories>
-
-###Code Signing Setup
-
-If this is your first release then you will have to ensure that you have a code signing key prepared on the machine from which you perform the release. The process is quite intense. You can find information here:
-
- - [http://www.apache.org/dev/release-signing.html](http://www.apache.org/dev/release-signing.html)
- - [http://maven.apache.org/developers/release/pmc-gpg-keys.html](http://maven.apache.org/developers/release/pmc-gpg-keys.html)
- 
-However, the basic steps are:
-
- - Create a key using **gpg --gen-key**, using size 4096 and answering the questions that command issues.
- - During the process you will have to generate random entropy, this is best achieved in another console and issuing the command **find / > /dev/null** and waiting a minute.
- - List the keys using **gpg --list-keys** and take note of the name
-
-Once you have your key then you will need to append it to the key file here:
-
- - [http://www.apache.org/dist/tomee/KEYS](http://www.apache.org/dist/tomee/KEYS)
-
-That is best done as the file itself explains, once you open and view it in a UTF-8 safe text editor you will see the description at the top.  
-Just follow the instructions there on how to append your key. The basic steps are also here, please read both before you proceed:
-
- - Save the KEYS file on your local machine and import it using **gpg --import KEYS**
- - Then create the new KEYS file using **(gpg --list-sigs <your name> && gpg --armor --export <your name>) >> KEYS**
- - Check that the new KEYS file contains your key.
- - Log in to people.apache.org and locate /dist/tomee/KEYS
- - Make a backup of the remote KEYS file just in case
- - Overwrite the old /dist/tomee/KEYS file with your new one that now also contains your key.
- - Go to [http://pgp.mit.edu/](http://pgp.mit.edu/) and add your ascii armoured key
- - Take note of your key fingerprint using **gpg --fingerprint <your name>**
- - Go to [https://id.apache.org](https://id.apache.org), log in and fill OpenPGP Public Key Primary Fingerprint: with the value of your fingerprint.
- 
-###Build the Release Tools
-
-Checkout the release tools using SVN from here [https://svn.apache.org/repos/asf/tomee/sandbox/release-tools](https://svn.apache.org/repos/asf/tomee/sandbox/release-tools)
-
-Really read the README.mdtext and follow the instructions for building the 3rd party libraries.  
-Basically SVN checkout and compile [Swizzle](https://svn.codehaus.org/swizzle/trunk) and [Tentacles](https://svn.apache.org/repos/asf/creadur/tentacles/trunk)
-
-Build the release tools, *mvn clean install -DskipTests -DfailIfNoTests=false*
-
-Have a look at **run.sh** to see the entry point.
-
-Understand that the release tools are not polished, and you currently may have to edit source and re-compile.
-
-###Site Staging
-<a href="#staging"/>
-For some of the release steps you will need to provide documentation on the site. Checkout the site here:
-
-[https://svn.apache.org/repos/asf/tomee/site/trunk](https://svn.apache.org/repos/asf/tomee/site/trunk)
-
-Most of the content can be found under 'content' and subdirectories.
-
-When you commit changes the site should be built automatically by the buildbot, but you can force a build on IRC using:
-
-    **tomee-bot: force build tomee-site-staging**
-
-The buildbot staging result can be seen here:
-
-[http://ci.apache.org/builders/tomee-site-staging](http://ci.apache.org/builders/tomee-site-staging)
-
-And the actual staging site, where you can review your changes, is here:
-
-[http://tomee.staging.apache.org/](http://tomee.staging.apache.org/)
-
-Once you are happy with the staging you can publish to the real site using:
-
-[https://cms.apache.org/tomee/publish](https://cms.apache.org/tomee/publish)
-
-###Begin The Release Process
-
-Ensure TCK is passing all tests, and if so create an SVN tag from the branch.
-
-	Note: It is a future goal to either separate OpenEJB from TomEE or unify the versions so the
-	[maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/) can be used.
-
-	Because we cannot use the Maven release tools we currently have to create a an SVN tag manually. The best way to do this is to:
-	
-	 - Copy the branch to a staging branch using:  
-	   > svn copy https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]  https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging -m "Staging [version]"
-	 - Checkout the staging branch using:  
-	   > svn co https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging tomee-[version]-staging
-	 - Update all SNAPSHOT versions to the release versions in the local tomee-[version]-staging and commit.
-	 - Create the tag from the staging:  
-	   > svn copy https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging https://svn.apache.org/repos/asf/tomee/tomee/tags/tomee-[version] -m "Tag [version]"
-	 - Delete the staging branch using:  
-	   > svn rm https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging -m "Delete staging"
-
-Open a console on the release-tools directory.
-
-Note: Before running any **./run.sh** activity always check the release tools code for the command tomee-release-tools/src/main/java/org/apache/openejb/tools/release/cmd.
-At the moment some of the commands need manually editing to work. Eventually the commands should be re-written.
-
-All JIRA actions should be performed on the ASF JIRA here:
-
-[https://issues.apache.org/jira/browse/TOMEE](https://issues.apache.org/jira/browse/TOMEE)
-
-Ensure JIRAs have been filed for commits using **./run.sh reviewcommits**
-
-Update fixVersions for JIRAs used in SVN commits using **./run.sh updatejiras** - *Untested, requires investigation*
-
-Review and bulk Close all JIRAs for the version to be released.
-
-Publish the changed binaries report (if any) using **./run.sh comparelibraries**
-
-Write and publish the release notes preview on the staging site. 
-
-Publish a summary of the RAT report preview on the staging site.
-
-Using the RAT report as a guide update LICENSE and NOTICE files for any changed binaries, and add new ones if required.
-
-Update branch versions. How you do this is up to you at this point in time.
-
-Update trunk versions. How you do this is up to you at this point in time.
-
-Create the next version iterations in JIRA.
-
-###Rolling Out The Preview
-
-	Note: Before running anything below ensure you either have:
-
-	 - A valid tomee-release.properties from the last release in your home directory (Speak to the last release manager).
-	 - Or have modified **tomee-release-tools/src/main/java/org/apache/openejb/tools/release/Release.java** with current versions and **mvn clean install**.
-	 	 
-Ensure the TCK passes with preview repositories by editing and ensuring paths are correct in the following files:
-
-	\tckbranch\plus.properties
-	\tckbranch\pom.xml
-	\tckbranch\webprofile-plus.properties
-	\tckbranch\webprofile.properties
-
-Publish the preview using **./run.sh roll binaries legal releasenotes preview** - You can run these tasks like so, or individually in order.
-It will be likely that this will have to be repeated several times before a successful vote.
-
-The *legal* step will create the legal report files in the /tmp/download/staging-[revision]/legal directory. These need to be added to the staging repo.
- - Delete the [legal]/repo and [legal]/content directories, as these are no longer required
-    rm -R /tmp/download/staging-[revision]/legal/content
-    rm -R /tmp/download/staging-[revision]/legal/repo
-
- - Perform a non-recursive checkout of the staging repo and add the legal:
-	svn co -N https://dist.apache.org/repos/dist/dev/tomee/staging-[revision] /tmp/download/staging
-	mv /tmp/download/staging-[revision]/legal /tmp/download/staging
-	cd /tmp/download/staging-[revision]
-	svn add legal
-
-Once the binaries are in place add the staging repository to the corresponding TCK project and fire off a build.
-To fire off a build on EC2 from the TCK directory speak to the last release manager for the **curl** command to use
-
-If the TCK fails then discuss, fix and re-roll.
-
-Publish a [Vote](https://www.apache.org/foundation/voting.html) if, and only if, the TCK passes.
-
-Votes are generally managed and identified using keywords such as [VOTE], [CANCELLED] and [RESULT]
-
-If the vote fails then discuss, fix and re-roll.
-
-###Voted Binaries
-
-Once the vote has passed then release the binaries on Nexus: [https://repository.apache.org/index.html#welcome](https://repository.apache.org/index.html#welcome)
-
-Update both OpenEJB and TomEE JIRA versions as released (Set the release date).
-
-Copy the binaries to the release location (User rights require a PMC to do this)
-
-	From: https://dist.apache.org/repos/dist/dev/tomee/staging-[stagingId]/tomee-[version]
-	To: https://dist.apache.org/repos/dist/release/tomee/tomee-[version] 
-    
-
-Wait for the binaries to replicate to mirrors. Here is a neat script from David to check the status:
-
-    #!/bin/bash
-
-    RELEASE=${1?Specify a release, such as './mirror_check.sh tomee-1.7.1'}
-
-    function list_mirrors {
-        DYN=http://www.apache.org/dyn/closer.cgi/tomee/$RELEASE/
-        wget -q -O - $DYN | tr '">< ' '\n' | grep "^http.*$RELEASE/" | sort | uniq
-    }
-
-    function status_code {
-        wget -v "$1" 2>&1| grep 'awaiting response' | tr ' ' '\n' | grep "[0-9]"
-    }
-
-    list_mirrors | while read n; do
-        echo "$(status_code $n) $n"
-    done | sort | grep 'http'
-
-Commit and publish changes to the site, see [Site Staging](release-tomee.html#staging)
-
-    https://cms.apache.org/tomee/publish
-
-
-###Blog
-
-Announce to the world that TomEE has new bells and whistles!
-
-[https://blogs.apache.org/roller-ui/login.rol](https://blogs.apache.org/roller-ui/login.rol)  
-[http://twitter.com/ApacheTomEE](http://twitter.com/ApacheTomEE)  
-[http://facebook.com/ApacheTomEE](http://facebook.com/ApacheTomEE)  
-[https://plus.google.com/118203123063829126066](https://plus.google.com/118203123063829126066)  
diff --git a/src/main/jbake/content/dev/roadmap.adoc b/src/main/jbake/content/dev/roadmap.adoc
new file mode 100644
index 0000000..29c1e52
--- /dev/null
+++ b/src/main/jbake/content/dev/roadmap.adoc
@@ -0,0 +1,23 @@
+= High level goals
+:jbake-type: page
+:jbake-status: published
+
+* Pre Certification
+ ** pass the tcks
+ ** push a beta and get the certification mark
+* Post Certification
+ ** fill out features, performance tune and polish
+ ** release final
+
+== Post Certification requirements
+
+Aside from passing the tcks, the
+
+== Post Certification goals
+
+Unordered list:
+
+* Restore Tomcat 6 support (possibly also Tomcat 5.5)
+* Make webapps/ dir deployment work properly again
+* Fix undeploy memory leak
+* Flush out TomEE embedded API
diff --git a/src/main/jbake/content/dev/roadmap.md b/src/main/jbake/content/dev/roadmap.md
deleted file mode 100644
index 411e585..0000000
--- a/src/main/jbake/content/dev/roadmap.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# High level goals
-
- - Pre Certification
-    - pass the tcks
-    - push a beta and get the certification mark
- - Post Certification
-    - fill out features, performance tune and polish
-    - release final
-
-# Post Certification requirements
-
-Aside from passing the tcks, the
-
-# Post Certification goals
-
-Unordered list:
-
- - Restore Tomcat 6 support (possibly also Tomcat 5.5)
- - Make webapps/ dir deployment work properly again
- - Fix undeploy memory leak
- - Flush out TomEE embedded API
-
-
diff --git a/src/main/jbake/content/dev/rsync.adoc b/src/main/jbake/content/dev/rsync.adoc
new file mode 100644
index 0000000..d5faa94
--- /dev/null
+++ b/src/main/jbake/content/dev/rsync.adoc
@@ -0,0 +1,106 @@
+= rsync
+:jbake-type: page
+:jbake-status: published
+
+`rsync` is basically the only copy command you'll ever need on a linux/unix system.
+It can copy in the same machine or across machines.
+It can retain file permissions and owners.
+You can run it over and over again say if the first execution failed or if there are new files to be copied over.
+
+== same machine copy
+
+`rsync -av fromdir/ todir/`
+
+Will copy the contents of `fromdir/` to the directory `todir/`
+
+To make a little example, some fancy bash syntax for creating a directory structure.
+
+ $ mkdir -p one/{green,blue}/{square,circle}{1..3}
+ $ find .
+ .
+ ./one
+ ./one/blue
+ ./one/blue/circle1
+ ./one/blue/circle2
+ ./one/blue/circle3
+ ./one/blue/square1
+ ./one/blue/square2
+ ./one/blue/square3
+ ./one/green
+ ./one/green/circle1
+ ./one/green/circle2
+ ./one/green/circle3
+ ./one/green/square1
+ ./one/green/square2
+ ./one/green/square3
+
+So to copy `one` to a new directory `two` we just do this
+
+`rsync -av one/ two/`
+
+Which gives us this as output
+
+[source,console]
+----
+$ rsync -av one/ two/
+building file list ... done
+created directory two
+./
+blue/
+blue/circle1/
+blue/circle2/
+blue/circle3/
+blue/square1/
+blue/square2/
+blue/square3/
+green/
+green/circle1/
+green/circle2/
+green/circle3/
+green/square1/
+green/square2/
+green/square3/
+
+sent 301 bytes  received 110 bytes  822.00 bytes/sec
+total size is 0  speedup is 0.00
+----
+
+Now we have the following directory structure:
+
+ $ find .
+ .
+ ./one
+ ./one/blue
+ ./one/blue/circle1
+ ./one/blue/circle2
+ ./one/blue/circle3
+ ./one/blue/square1
+ ./one/blue/square2
+ ./one/blue/square3
+ ./one/green
+ ./one/green/circle1
+ ./one/green/circle2
+ ./one/green/circle3
+ ./one/green/square1
+ ./one/green/square2
+ ./one/green/square3
+ ./two
+ ./two/blue
+ ./two/blue/circle1
+ ./two/blue/circle2
+ ./two/blue/circle3
+ ./two/blue/square1
+ ./two/blue/square2
+ ./two/blue/square3
+ ./two/green
+ ./two/green/circle1
+ ./two/green/circle2
+ ./two/green/circle3
+ ./two/green/square1
+ ./two/green/square2
+ ./two/green/square3
+
+== beware the slashes
+
+There's a strange thing when not using the slashes at the end.
+To keep things sane, just always use the slashes at the end of the two file paths and things will always be easy to remember.
diff --git a/src/main/jbake/content/dev/rsync.md b/src/main/jbake/content/dev/rsync.md
deleted file mode 100644
index 81dd002..0000000
--- a/src/main/jbake/content/dev/rsync.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# rsync
-
-`rsync` is basically the only copy command you'll ever need on a linux/unix system.  It can copy in the same machine or across machines.  It can retain file permissions and owners.  You can run it over and over again say if the first execution failed or if there are new files to be copied over.
-
-## same machine copy
-
-`rsync -av fromdir/ todir/`
-
-Will copy the contents of `fromdir/` to the directory `todir/`
-
-To make a little example, some fancy bash syntax for creating a directory structure.
-
-    $ mkdir -p one/{green,blue}/{square,circle}{1..3}
-    $ find .
-    .
-    ./one
-    ./one/blue
-    ./one/blue/circle1
-    ./one/blue/circle2
-    ./one/blue/circle3
-    ./one/blue/square1
-    ./one/blue/square2
-    ./one/blue/square3
-    ./one/green
-    ./one/green/circle1
-    ./one/green/circle2
-    ./one/green/circle3
-    ./one/green/square1
-    ./one/green/square2
-    ./one/green/square3
-
-So to copy `one` to a new directory `two` we just do this
-
-`rsync -av one/ two/`
-
-Which gives us this as output
-
-    $ rsync -av one/ two/
-    building file list ... done
-    created directory two
-    ./
-    blue/
-    blue/circle1/
-    blue/circle2/
-    blue/circle3/
-    blue/square1/
-    blue/square2/
-    blue/square3/
-    green/
-    green/circle1/
-    green/circle2/
-    green/circle3/
-    green/square1/
-    green/square2/
-    green/square3/
-
-    sent 301 bytes  received 110 bytes  822.00 bytes/sec
-    total size is 0  speedup is 0.00
-
-Now we have the following directory structure:
-
-    $ find .
-    .
-    ./one
-    ./one/blue
-    ./one/blue/circle1
-    ./one/blue/circle2
-    ./one/blue/circle3
-    ./one/blue/square1
-    ./one/blue/square2
-    ./one/blue/square3
-    ./one/green
-    ./one/green/circle1
-    ./one/green/circle2
-    ./one/green/circle3
-    ./one/green/square1
-    ./one/green/square2
-    ./one/green/square3
-    ./two
-    ./two/blue
-    ./two/blue/circle1
-    ./two/blue/circle2
-    ./two/blue/circle3
-    ./two/blue/square1
-    ./two/blue/square2
-    ./two/blue/square3
-    ./two/green
-    ./two/green/circle1
-    ./two/green/circle2
-    ./two/green/circle3
-    ./two/green/square1
-    ./two/green/square2
-    ./two/green/square3
-
-## beware the slashes
-
-There's a strange thing when not using the slashes at the end.  To keep things sane, just always use the slashes at the end of the two file paths and things will always be easy to remember.
-
diff --git a/src/main/jbake/content/dev/rules-of-thumb.adoc b/src/main/jbake/content/dev/rules-of-thumb.adoc
new file mode 100644
index 0000000..90137fb
--- /dev/null
+++ b/src/main/jbake/content/dev/rules-of-thumb.adoc
@@ -0,0 +1,16 @@
+= Rules of Thumb
+:jbake-type: page
+:jbake-status: published
+
+== Configuration
+
+* Configuration settings should have configurable defaults at the module, ear, server and cluster level (when clustering is added).
+For example, security settings should be configurable on a per ejb, ejb jar, ear and server levels.
+* Settings should have a smooth increase in complexity from very simple to complex.
+For example, a cache setting could start with a simple max-size, and over time the user could increase the complexity by adding configuration for disk paging up to specification of complex flushing rules.
+
+== Validation
+
+* Applications should be fully validated before handing it off to the deployment system.
+This vastly simplifies the deployment system because it assumes that an application is valid.
+As a corollary, the deployment system should not be complicated with code that tests for invalid deployments or with code to print graceful error messages to a user.
diff --git a/src/main/jbake/content/dev/rules-of-thumb.md b/src/main/jbake/content/dev/rules-of-thumb.md
deleted file mode 100644
index 54a8130..0000000
--- a/src/main/jbake/content/dev/rules-of-thumb.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Title: Rules of Thumb
-
-<a name="RulesofThumb-Configuration"></a>
-### Configuration
-
-* Configuration settings should have configurable defaults at the module,
-ear, server and cluster level (when clustering is added).  For example,
-security settings should be configurable on a per ejb, ejb jar, ear and
-server levels.	
-
-* Settings should have a smooth increase in complexity from very simple to
-complex.  For example, a cache setting could start with a simple max-size,
-and over time the user could increase the complexity by adding
-configuration for disk paging up to specification of complex flushing
-rules.
-
-<a name="RulesofThumb-Validation"></a>
-### Validation
-
-* Applications should be fully validated before handing it off to the
-deployment system.  This vastly simplifies the deployment system because it
-assumes that an application is valid.  As a corollary, the deployment
-system should not be complicated with code that tests for invalid
-deployments or with code to print graceful error messages to a user.
diff --git a/src/main/jbake/content/dev/source-code.adoc b/src/main/jbake/content/dev/source-code.adoc
new file mode 100644
index 0000000..5eaf882
--- /dev/null
+++ b/src/main/jbake/content/dev/source-code.adoc
@@ -0,0 +1,129 @@
+= Source Code
+:jbake-type: page
+:jbake-status: published
+
+*We have moved to GIT.
+This means that anything you may find elsewhere on the site about SVN is no longer valid!*
+
+The documentation will be updated over the next few days and weeks but if you find anything that is *really* misleading then please send a message to the developer list at: link:mailto:dev@tomee.apache.org[dev@tomee.apache.org]
+
+Probably the best GIT tutorial on the planet can be found here: https://www.atlassian.com/git/ - This is a great reference for both existing and new GIT users.
+Please take a look.
+
+== GIT Information for Everyone
+
+You can browse the source code via the http://gitbox.apache.org/repos/asf/tomee.git[web interface].
+
+If you intend to hack on TomEE then it is recommended that you create a https://github.com[GitHub Account] and https://help.github.com/articles/fork-a-repo/[fork] the TomEE repository so that you can submit pull requests (See below).
+
+If you just want to build the source version then you can download (aka clone) the sources of Apache TomEE with a GIT client from the following URL https://gitbox.apache.org/repos/asf/tomee.git - The 'master' branch is the current development branch.
+
+Performing the checkout from a command line using the GIT client (recommended) is as easy as executing the following command:
+
+----
+git clone https://gitbox.apache.org/repos/asf/tomee.git tomee
+----
+
+If you want to checkout a specific branch then you can just change that in the command:
+
+----
+git clone -b tomee-1.7.x https://gitbox.apache.org/repos/asf/tomee.git tomee-1.7.x
+----
+
+Or alternatively with Apache Maven 3.0.5 or later:
+
+----
+mvn scm:checkout -DconnectionUrl=scm:git:https://gitbox.apache.org/repos/asf/tomee.git -DcheckoutDirectory=tomee
+----
+
+NOTE: This method does not require the GIT client.
+
+== GIT Information for TomEE Contributors
+
+*Please read our own detailed GitFlow workflow information xref:git.adoc[here]*
+
+We will be using the https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow[Gitflow Workflow] from day one.
+Please read and understand how this works.
+
+See https://help.github.com/articles/using-pull-requests/[here] for information on pull requests.
+
+The official Apache Committer documentation can be found https://gitbox.apache.org/#committers-getting-started[here]
+
+== Continuous integration
+
+Apache TomEE continuous integration relies on http://ci.apache.org/[Apache Buildbot].
+All builders are available http://ci.apache.org/builders[from the page].
+
+* http://ci.apache.org/builders/tomee-1.7.x-ubuntu[Apache TomEE 1.7.x under Ubuntu]
+* http://ci.apache.org/builders/tomee-trunk-ubuntu[Apache TomEE 2.x under Ubuntu]
+* http://ci.apache.org/builders/tomee-trunk-win-sunjdk[Apache TomEE 2.x under Windows using a Sun/Oracle JDK]
+* http://ci.apache.org/builders/tomee-trunk-win-ibmjdk6[Apache TomEE 2.x under Windows using an IBM JDK]
+
+== Maven
+
+To build the code, you'll need to grab a copy of http://maven.apache.org[Apache Maven], version 3.0.5 or later.
+
+== Memory Settings
+
+It is pretty much guaranteed that you will need to give Maven an increase on the available memory.
++ Depending on the OS you are working on the fix can be as easy as (Note: _-XX:MaxPermSize=256M_ is ignored by Java 8):
+
+----
+export MAVEN_OPTS="-Xmx768m -XX:MaxPermSize=256M -XX:ReservedCodeCacheSize=64m -Xss2048k"
+----
+
+on MacOS and Unices or
+
+----
+set "MAVEN_OPTS=-Xmx768m -XX:MaxPermSize=256M -XX:ReservedCodeCacheSize=64m -Xss2048k"
+----
+
+on MS Windows.
+
+== Full Build
+
+A fast build that skips all tests, generates no reports and creates full distribution archives is as follows:
+
+----
+mvn -Dsurefire.useFile=false -DdisableXmlReport=true -DuniqueVersion=false -ff -Dassemble -DskipTests -DfailIfNoTests=false clean install
+----
+
+The full build with tests takes around 2 hours:
+
+----
+mvn -Dassemble clean install
+----
+
+The output of those commands should end with "BUILD SUCCESSFUL"
+
+It is of course possible to just compile and test individual modules.
+Just change to the module directory and run the same commands as above.
+
+== Quick Build
+
+If you are in real a hurry (and let's face it most of us are) you can run a quick build without the examples using the _quick_ profile:
+
+----
+mvn -Pquick -Dsurefire.useFile=false -DdisableXmlReport=true -DuniqueVersion=false -ff -Dassemble -DskipTests -DfailIfNoTests=false clean install
+----
+
+== Binary locations
+
+Once built, the TomEE binaries will be located at:
+
+....
+ls [project]/tomee/apache-tomee/target/*.zip
+
+tomee/apache-tomee/target/apache-tomee-jaxrs-[version]-SNAPSHOT.zip
+tomee/apache-tomee/target/apache-tomee-plus-[version]-SNAPSHOT.zip
+tomee/apache-tomee/target/apache-tomee-webprofile-[version]-SNAPSHOT.zip
+tomee/apache-tomee/target/apache-tomee-plume-[version]-SNAPSHOT.tar.gz
+....
+
+The OpenEJB standalone binaries will be located at:
+
+....
+ls [project]/assembly/openejb-standalone/target/*.zip
+
+assembly/openejb-standalone/target/apache-openejb-[version]-SNAPSHOT.zip
+....
diff --git a/src/main/jbake/content/dev/source-code.md b/src/main/jbake/content/dev/source-code.md
deleted file mode 100644
index 2708283..0000000
--- a/src/main/jbake/content/dev/source-code.md
+++ /dev/null
@@ -1,101 +0,0 @@
-Title: Source Code
-
-**<span style="color: rgb(128,0,0);">We have moved to GIT</span>. This means that anything you may find elsewhere on the site about SVN is no longer valid!**
-  
-The documentation will be updated over the next few days and weeks but if you find anything that is **really** misleading then please send a message to the developer list at: [dev@tomee.apache.org](mailto:dev@tomee.apache.org)
-
-Probably the best GIT tutorial on the planet can be found here: [https://www.atlassian.com/git/](https://www.atlassian.com/git/) - This is a great reference for both existing and new GIT users. Please take a look.
-
-###GIT Information for Everyone
-
-You can browse the source code via the [web interface](http://gitbox.apache.org/repos/asf/tomee.git).
-
-If you intend to hack on TomEE then it is recommended that you create a [GitHub Account](https://github.com) and [fork](https://help.github.com/articles/fork-a-repo/) the TomEE repository so that you can submit pull requests (See below).
-
-If you just want to build the source version then you can download (aka clone) the sources of Apache TomEE with a GIT client from the following URL [https://gitbox.apache.org/repos/asf/tomee.git](https://gitbox.apache.org/repos/asf/tomee.git) - The 'master' branch is the current development branch.
-
-Performing the checkout from a command line using the GIT client (recommended) is as easy as executing the following command:
-> git clone [https://gitbox.apache.org/repos/asf/tomee.git](https://gitbox.apache.org/repos/asf/tomee.git) tomee
-
-If you want to checkout a specific branch then you can just change that in the command:
-
-> git clone -b tomee-1.7.x [https://gitbox.apache.org/repos/asf/tomee.git](https://gitbox.apache.org/repos/asf/tomee.git) tomee-1.7.x
-
-Or alternatively with Apache Maven 3.0.5 or later:
-
-> mvn scm:checkout
-> -DconnectionUrl=scm:git:[https://gitbox.apache.org/repos/asf/tomee.git](https://gitbox.apache.org/repos/asf/tomee.git)
-> -DcheckoutDirectory=tomee
-
-Note: This method does not require the GIT client.
-
-<a name="SourceCode-Contributors"></a>
-###GIT Information for TomEE Contributors
-
-**Please read our own detailed GitFlow workflow information [here](git.html)**
-
-We will be using the [Gitflow Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) from day one. Please read and understand how this works.
-
-See [here](https://help.github.com/articles/using-pull-requests/) for information on pull requests. 
-
-The official Apache Committer documentation can be found [here](https://gitbox.apache.org/#committers-getting-started)
-
-<a name="SourceCode-Continuousintegration"></a>
-###Continuous integration
-
-Apache TomEE continuous integration relies on [Apache Buildbot](http://ci.apache.org/).
-All builders are available [from the page](http://ci.apache.org/builders).
-
-* [Apache TomEE 1.7.x under Ubuntu](http://ci.apache.org/builders/tomee-1.7.x-ubuntu)
-* [Apache TomEE 2.x under Ubuntu](http://ci.apache.org/builders/tomee-trunk-ubuntu)
-* [Apache TomEE 2.x under Windows using a Sun/Oracle JDK](http://ci.apache.org/builders/tomee-trunk-win-sunjdk)
-* [Apache TomEE 2.x under Windows using an IBM JDK](http://ci.apache.org/builders/tomee-trunk-win-ibmjdk6)
-
-<a name="SourceCode-Building"></a>
-###Maven
-To build the code, you'll need to grab a copy of [Apache Maven](http://maven.apache.org), version 3.0.5 or later.
- 
-###Memory Settings
-
-It is pretty much guaranteed that you will need to give Maven an increase on the available memory.  
-Depending on the OS you are working on the fix can be as easy as (Note: *-XX:MaxPermSize=256M* is ignored by Java 8):  
->export MAVEN_OPTS="-Xmx768m -XX:MaxPermSize=256M -XX:ReservedCodeCacheSize=64m -Xss2048k"
-
-on MacOS and Unices or 
->set "MAVEN_OPTS=-Xmx768m -XX:MaxPermSize=256M -XX:ReservedCodeCacheSize=64m -Xss2048k"
-  
-on MS Windows.
-
-###Full Build
-
-A fast build that skips all tests, generates no reports and creates full distribution archives is as follows:
->mvn -Dsurefire.useFile=false -DdisableXmlReport=true -DuniqueVersion=false -ff -Dassemble -DskipTests -DfailIfNoTests=false clean install
-
-The full build with tests takes around 2 hours:
->mvn -Dassemble clean install
-
-The output of those commands should end with "BUILD SUCCESSFUL"
-
-It is of course possible to just compile and test individual modules. Just change to the module directory and run the same commands as above.
-
-###Quick Build
-
-If you are in real a hurry (and let's face it most of us are) you can run a quick build without the examples using the *quick* profile:
->mvn -Pquick -Dsurefire.useFile=false -DdisableXmlReport=true -DuniqueVersion=false -ff -Dassemble -DskipTests -DfailIfNoTests=false clean install
-
-###Binary locations
-
-Once built, the TomEE binaries will be located at:
-
-    ls [project]/tomee/apache-tomee/target/*.zip
-	
-    tomee/apache-tomee/target/apache-tomee-jaxrs-[version]-SNAPSHOT.zip
-    tomee/apache-tomee/target/apache-tomee-plus-[version]-SNAPSHOT.zip
-    tomee/apache-tomee/target/apache-tomee-webprofile-[version]-SNAPSHOT.zip
-    tomee/apache-tomee/target/apache-tomee-plume-[version]-SNAPSHOT.tar.gz
-
-The OpenEJB standalone binaries will be located at:
-
-    ls [project]/assembly/openejb-standalone/target/*.zip
-	
-    assembly/openejb-standalone/target/apache-openejb-[version]-SNAPSHOT.zip
diff --git a/src/main/jbake/content/dev/take-my-code.adoc b/src/main/jbake/content/dev/take-my-code.adoc
new file mode 100644
index 0000000..867cdd2
--- /dev/null
+++ b/src/main/jbake/content/dev/take-my-code.adoc
@@ -0,0 +1,14 @@
+= Take My Code Gladly!
+:jbake-type: page
+:jbake-status: published
+
+We (the individuals who makeup the community) will happily take your code.
+
+The easiest way for us to take code both legally and practically is by:
+
+. Create a patch and attach it in a https://issues.apache.org/jira/browse/OPENEJB[new JIRA issue]
+. Send a note to the dev list
+
+Anyone who is a committer has already signed a http://apache.org/licenses/#clas[Contributor License Agreement]  (CLA) stating that the code they contribute is intended to be licensed under the Apache Public License.
+If you intend to contribute a lot, consider sending one in as it will make things go faster.
+The next best thing to having a CLA on file.
diff --git a/src/main/jbake/content/dev/take-my-code.md b/src/main/jbake/content/dev/take-my-code.md
deleted file mode 100644
index 42967e0..0000000
--- a/src/main/jbake/content/dev/take-my-code.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Title: Take My Code
-Gladly!  We (the individuals who makeup the community) will happily take
-your code.
-
-The easiest way for us to take code both legally and practically is by:
-
-1. Create a patch and attach it in a [new JIRA issue](https://issues.apache.org/jira/browse/OPENEJB)
-1. Send a note to the dev list
-
-Anyone who is a committer has already signed a [Contributor License Agreement](http://apache.org/licenses/#clas)
- (CLA) stating that the code they contribute is intended to be licensed
-under the Apache Public License.  If you intend to contribute a lot,
-consider sending one in as it will make things go faster.  The next best
-thing to having a CLA on file.
diff --git a/src/main/jbake/content/dev/thread-dumps.adoc b/src/main/jbake/content/dev/thread-dumps.adoc
new file mode 100644
index 0000000..e152521
--- /dev/null
+++ b/src/main/jbake/content/dev/thread-dumps.adoc
@@ -0,0 +1,34 @@
+= Thread Dumps
+:jbake-type: page
+:jbake-status: published
+
+== Java 5 tools
+
+This should work on any Java 5 or newer platform.
+
+[source,console]
+----
+$ jps
+3392 Jps
+3387 JConsole
+
+
+
+$ jstack 3387
+Attaching to process ID 3387, please wait...
+Debugger attached successfully.
+Client compiler detected.
+JVM version is 1.5.0_16-133
+Thread t@59139: (state = BLOCKED)
+- java.lang.Object.wait(long) @bci=0 (Interpreted frame)
+- javax.swing.TimerQueue.run() @bci=14, line=236 (Interpreted frame)
+- java.lang.Thread.run() @bci=11, line=613 (Interpreted frame)
+----
+
+== OS signals
+
+In the case of an OS signal the thread dump is printed to the console window that started the java process.
+If you use javaw to start the process, the dump is lost.
+
+On Windows, typing _ctrl-break_ in the console window that started the Java process.
+On Unix, the command *kill -QUIT <pid>* or typing *ctrl-&#92;* in the console window that started the Java process.
diff --git a/src/main/jbake/content/dev/thread-dumps.md b/src/main/jbake/content/dev/thread-dumps.md
deleted file mode 100644
index fb5b5bc..0000000
--- a/src/main/jbake/content/dev/thread-dumps.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Title: Thread Dumps
-<a name="ThreadDumps-Java5tools"></a>
-# Java 5 tools
-
-This should work on any Java 5 or newer platform.
-
-
-    $ jps
-    3392 Jps
-    3387 JConsole
-
-
-
-    $ jstack 3387
-    Attaching to process ID 3387, please wait...
-    Debugger attached successfully.
-    Client compiler detected.
-    JVM version is 1.5.0_16-133
-    Thread t@59139: (state = BLOCKED)
-    - java.lang.Object.wait(long) @bci=0 (Interpreted frame)
-    - javax.swing.TimerQueue.run() @bci=14, line=236 (Interpreted frame)
-    - java.lang.Thread.run() @bci=11, line=613 (Interpreted frame)
-
-
-
-<a name="ThreadDumps-OSsignals"></a>
-# OS signals
-
-In the case of an OS signal the thread dump is printed to the console
-window that started the java process.  If you use javaw to start the
-process, the dump is lost.
-
-On Windows, typing *ctrl-break* in the console window that started the Java
-process.
-On Unix, the command *kill \-QUIT <pid>* or typing *ctrl-&#92;* in the
-console window that started the Java process.
-
diff --git a/src/main/jbake/content/dev/tips-and-suggestions.md b/src/main/jbake/content/dev/tips-and-suggestions.adoc
similarity index 93%
rename from src/main/jbake/content/dev/tips-and-suggestions.md
rename to src/main/jbake/content/dev/tips-and-suggestions.adoc
index 70cc5ff..15f72e7 100644
--- a/src/main/jbake/content/dev/tips-and-suggestions.md
+++ b/src/main/jbake/content/dev/tips-and-suggestions.adoc
@@ -1,11 +1,11 @@
-Title: Tips and Suggestions
-> 
+= Tips and Suggestions
+:jbake-type: page
+:jbake-status: published
 
-<a name="TipsandSuggestions-Usefulinformationforcontributors"></a>
-## Useful information for contributors
 
-<a name="TipsandSuggestions-JIRAusage"></a>
-### JIRA usage
+== Useful information for contributors
+
+=== JIRA usage
 It's good to leverage JIRA, but everything that happens there should be
 considered invisible for the most part and only reviewed on a random and
 infrequent basis.
@@ -52,8 +52,7 @@
 {+}If you'd like to get added to the openejb-contributors JIRA group, just
 ping the list with your JIRA id and someone will add you.{+}
 
-<a name="TipsandSuggestions-Commits"></a>
-### Commits
+=== Commits
 
 *Contributed by*: David Blevins
 +Here is an email from David Blevins explaining the things he keeps in mind
@@ -86,12 +85,10 @@
 As far as jira titles, I always *try and make them short and succinct* for
 the future release notes.
 
-<a name="TipsandSuggestions-SVN+JIRA"></a>
-### SVN + JIRA
+=== SVN + JIRA
 
 
-<a name="TipsandSuggestions-*Contributedby*:Vamsi"></a>
-#### *Contributed by*: Vamsi
+==== *Contributed by*: Vamsi
 
 I had trouble figuring out if a revision is related to a JIRA and what all
 revisions corresponded to a particular JIRA.  So, I always include the JIRA
@@ -107,16 +104,14 @@
 $Rev$ $Date$ and add those so that the file will have them from my next
 commit onwards.
 
-<a name="TipsandSuggestions-*Contributedby*:DavidBlevins"></a>
-#### *Contributed by*: David Blevins
+==== *Contributed by*: David Blevins
 
 > If you put "\[jira\](jira\.html)
 >  OPENEJB-XXX" anywhere in your subject line and cc jira@apache.org our
 > email gets added as a comment with all '> quoted' text stripped out.
 PS: XXX is the JIRA issue number
 
-<a name="TipsandSuggestions-Details"></a>
-#### Details
+==== Details
 
 The following subject lines did work:
 - Subject: \[jira\](jira\.html)
@@ -184,43 +179,54 @@
 
 </three>
 
-### scp, ssh, and rsync examples for working with files and directories on
-people.apache.org
+=== scp, ssh, and rsync examples for working with files and directories on people.apache.org
 
 *Contributed by*: David Blevins
 
 *copying a file to apache from locahost*
+----
 scp topsecret.tar.gz kmalhi@people.apache.org:
 scp index.html kmalhi@people.apache.org:public_html/
+----
 
 *copying a file from apache to localhost -- reverse of the above*
+----
 scp kmalhi@people.apache.org:topsecret.tar.gz ./
 scp kmalhi@people.apache.org:public_html/index.html ./
+----
 
 *copying directories*
+----
 scp \-r kmalhi@people.apache.org:public_html ./
 scp \-r public_html kmalhi@people.apache.org:
+----
 
 *When the directory exists, better to rsync*
 
 *pull a dir from apache*
+----
 rsync \-v \-e ssh \-lzrptog kmalhi@people.apache.org:public_html ./
 rsync \-v \-e ssh \-lzrptog
 kmalhi@people.apache.org:/home/kmalhi/public_html ./
+----
 
 *the two above commands do the exact same thing*
 
 *push the same dir to apache*
+----
 rsync \-v \-e ssh \-lzrptog ./public_html kmalhi@people.apache.org:
 rsync \-v \-e ssh \-lzrptog ./public_html
 kmalhi@people.apache.org:/home/kmalhi/
+----
 
 *the two above commands do the exact same thing*
 
 *sometimes useful to execute commands over ssh (piping works too)*
+----
 ssh people.apache.org ls /home \| tee home-dirs-on-apache.txt
 echo \-e 'Hello, me\n\nHow am I doing today?' \| ssh
 kmalhi@people.apache.org mail \-s 'Greetings' kmalhi@apache.org
+----
 
 *For Putty users*
 *Contributed by:* Mohammad
@@ -228,15 +234,16 @@
 Windows version too, I issue this command to upload a file to my home dir
 on people.apache.org
 
+----
     pscp [[file-name]
  | [dir]
 ] mnour@people.apache.org:~/
+----
 
 and if you want to access your home page, you should create a dir with the
 name public_html, and then upload files to it.
 
-<a name="TipsandSuggestions-Acoolsubversiontip"></a>
-### A cool subversion tip
+=== A cool subversion tip
 
 *Contributed by*: Jacek Laskowski.
 
@@ -244,6 +251,7 @@
 otherwise have to type in on the command line.*
 Edit/Add the following configurations to \~/.subversion/config:
 
+----
     [miscellany]
     global-ignores = *.log *.save *.o *.lo *.la #*# .*~ *~ .#* .DS_Store
     build dist target *.ipr *.iml *.iws .project .classpath .settings
@@ -314,10 +322,9 @@
     Revision
     *.sql = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
 Revision
+----
 
-
-<a name="TipsandSuggestions-Maventips"></a>
-### Maven tips
+=== Maven tips
 
 *Contributed by:* Jacek and David
 *I want to make a small change in a module , for example openejb-core and
@@ -325,11 +332,15 @@
 test my change. What is the easiest and fastest way of doing it?*
 Run the following from within openejb-core
 
+----
     mvn -Dtest=none install
+----
 
 Now run the following from within openejb-standalone
 
+----
     mvn -Dtest=none clean package
+----
 
 *So what if I wanted to do the above in a single command?*
 It's possible with $\{module\} and $\{assemble\} properties and *create a
@@ -337,9 +348,11 @@
 
 Another option is and *if you're in bash*, here's what could be done
 
+----
     # camping out in assembly/openejb-standalone/
     $ (cd ../../container/openejb-core && mvn clean install -Dtest=skip) && mvn
 clean install && ./try.sh
+----
 
 That's one command, parens and all. The first "$" is the prompt,don't type
 that.  Then just edit ./try.sh to do what you're looking for on the
@@ -351,6 +364,7 @@
 
 For example
 
+----
     $ export FOO=hello && (export FOO=byebye) && echo $FOO
     hello
     
@@ -358,12 +372,14 @@
     /Users/dblevins
     /tmp
     /Users/dblevins
+----
 
 As well, several commands can be combined with '&&'.  Far better than just
 separating commands with ';' as if one of the commands fail, the remaining
 commands will not be executed.
 
 *Suggestion from Dain*
+----
 > &nbsp;I suggest that you always do a full build (with tests) before
 > committing.  I do this even if the change is small because I have been
 > burned too many times by trivial changes. At the very least I suggest you
@@ -375,10 +391,11 @@
 > compile the test classes so you know that your change doesn't have compile
 > errors.
 > If you want to be thorough, run with \-Dassemble.
+----
 
-<a name="TipsandSuggestions-JAXBUsage"></a>
-### JAXB Usage
-{note:title=TODO}
+=== JAXB Usage
+
+TODO:
 Create a write up from here
 http://www.nabble.com/jaxb-question-td18023648.html
-{note}
+
diff --git a/src/main/jbake/content/dev/validation-keys-audit-report.adoc b/src/main/jbake/content/dev/validation-keys-audit-report.adoc
new file mode 100644
index 0000000..1bc3c79
--- /dev/null
+++ b/src/main/jbake/content/dev/validation-keys-audit-report.adoc
@@ -0,0 +1,265 @@
+= Validation Keys Audit Report
+:jbake-type: page
+:jbake-status: published
+
+Warning: This page is auto-generated.
+Any manual changes would be over-written the next time this page is regenerated
+
+TODO: figure out if this page is still relevant, it certainly isn't being generated any more.
+
+== Out of a total of 144 keys, 123 have been tested.
+
+Test coverage for keys is 85.41666666666666 %.\{info} {table-plus:autoNumber=true}
+
+| abstractAnnotatedAsBean |   | ann.ejb.beanClass |   | ann.ejb.notInterface |   | ann.localRemote.generalconflict |   | asynchronous.badExceptionType |   | asynchronous.badReturnType |   | asynchronous.methodignored |   | asynchronous.missing |   | callback.missing.possibleTypo |   | cannot.validate |   | client.missingMainClass |   | ignoredClassAnnotation |   | interfaceAnnotatedAsBean |   | missing.dependent.class |   | misslocated.class |   | multiplyAnnotatedAsBean |   | timeout.badReturnType |   | timeout.invalidArguments |   | timeout.missing.possibleTypo |   | timeout.tooManyMethods |   | xml.noEjbClass |  \{table-plus} +++<a name="ValidationKeysAuditReport-Listofkeyswhichhavebeentested.">++++++</a>+++
+
+== List of keys which have been tested.
+
+{table-plus:autoNumber=true}+++<table>++++++<tr>++++++<th>+++Key </td>+++<td>+++Method which tests the key </th></tr>
++++<tr>++++++<td>+++ann.ejb.ejbLocalObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidEjbRefTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidejbreftest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.ejb.ejbObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidEjbRefTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidejbreftest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.invalidConcurrencyAttribute+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidConcurrencyAttributeTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidconcurrencyattributetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.invalidTransactionAttribute+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidTransactionAttributeTest.annotation() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidtransactionattributetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.local.noAttributes+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.noAttributes() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidannotatedinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.localRemote.ambiguous+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.ambiguous() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidannotatedinterfacestest.java?revision=head&view=markup-.html)
+</tr>
+
+
++++<tr>++++++<td>+++ann.notAnInterface+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.remote.noAttributes+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.noAttributes() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidannotatedinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.remoteOrLocal.converse.parent+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.test2() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.remoteOrLocal.ejbHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.remoteOrLocal.ejbLocalHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.remoteOrLocal.ejbLocalObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ann.remoteOrLocal.ejbObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
+
+
+
+
+
+
++++<tr>++++++<td>+++aroundInvoke.missing.possibleTypo+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++aroundInvoke.mustThrowException+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidAroundTimeoutTest.testInvalidAroundTimeoutReturnValue() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidaroundtimeouttest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++callback.badModifier+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++callback.badReturnType+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++callback.invalidArguments+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++callback.missing+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++callback.sessionSynchronization.invalidUse+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++callback.sessionbean.invalidusage+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test2() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++conflictingSecurityAnnotations+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidSecurityAnnotationsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidsecurityannotationstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++containerTransaction.ejbNameRequired+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidContainerTransactionTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcontainertransactiontest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++containerTransaction.noSuchEjbName+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidContainerTransactionTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcontainertransactiontest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++dependsOn.circuit+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckDependsOnTest.dependsOn() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkdependsontest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++dependsOn.noSuchEjb+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckDependsOnTest.dependsOn() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkdependsontest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ejbAnnotation.onClassWithNoBeanInterface+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidEjbRefTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidejbreftest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++ejbAnnotation.onClassWithNoName+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidEjbRefTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidejbreftest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++entity.no.ejb.create+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
+</tr>
+
+
++++<tr>++++++<td>+++injectionTarget.nameContainsSet+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInjectionTargetsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinjectiontargetstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++interceptor.callback.badReturnType+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++interceptor.callback.invalidArguments+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++interceptor.callback.missing+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++interceptor.callback.missing.possibleTypo+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++interceptor.unused+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++interceptorBinding.ejbNameRequiredWithMethod+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++interceptorBinding.noSuchEjbName+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++interface.beanOnlyAnnotation+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++interfaceMethod.beanOnlyAnnotation+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++methodPermission.ejbNameRequired+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidMethodPermissionsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidmethodpermissionstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++methodPermission.noSuchEjbName+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidMethodPermissionsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidmethodpermissionstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++missing.class+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckMissingClassTest.wrongClassType() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkmissingclasstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++no.busines.method+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckNoBusinessMethodTest.noBusinessMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknobusinessmethodtest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++no.busines.method.args+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckNoBusinessMethodTest.noBusinessMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknobusinessmethodtest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++no.busines.method.case+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckNoBusinessMethodTest.noBusinessMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknobusinessmethodtest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++no.home.create+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++noInterfaceDeclared.entity+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckWrongClassTypeTest.wrongClassType() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkwrongclasstypetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++permitAllAndRolesAllowedOnClass+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidSecurityAnnotationsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidsecurityannotationstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceContextAnnotation.onClassWithNoName+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceContextAnnotation.onEntityManagerFactory+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceContextAnnotation.onNonEntityManager+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceContextExtented.nonStateful+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceContextRef.noMatches+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.noUnitName() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceContextRef.noPersistenceUnits+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceContextRef.noUnitName+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.noUnitName() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceContextRef.vagueMatches+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.vagueMatches() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceUnitAnnotation.onClassWithNoName+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceUnitAnnotation.onEntityManager+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceUnitAnnotation.onNonEntityManagerFactory+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceUnitRef.noMatches+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.noUnitName() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceUnitRef.noPersistenceUnits+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceUnitRef.noUnitName+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.noUnitName() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++persistenceUnitRef.vagueMatches+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.vagueMatches() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++resourceAnnotation.onClassWithNoName+++</td>++++++<td>+++[org/apache/openejb/config/rules/MistakenResourceRefUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/mistakenresourcerefusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++resourceAnnotation.onClassWithNoType+++</td>++++++<td>+++[org/apache/openejb/config/rules/MistakenResourceRefUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/mistakenresourcerefusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++resourceRef.onEntityManager+++</td>++++++<td>+++[org/apache/openejb/config/rules/MistakenResourceRefUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/mistakenresourcerefusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++resourceRef.onEntityManagerFactory+++</td>++++++<td>+++[org/apache/openejb/config/rules/MistakenResourceRefUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/mistakenresourcerefusagetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++session.no.ejb.create+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++unused.ejb.create+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++unused.ejbPostCreate+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++userTransactionRef.forbiddenForCmtdBeans+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckUserTransactionRefsTest.testSLSBwithUserTransaction() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkusertransactionrefstest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++wrong.class.type+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckWrongClassTypeTest.wrongClassType() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkwrongclasstypetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.businessLocal.beanClass+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.businessLocal.ejbHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
+
+
+
+
++++<tr>++++++<td>+++xml.businessLocal.ejbObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
+
+
++++<tr>++++++<td>+++xml.businessRemote.beanClass+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
+
+
++++<tr>++++++<td>+++xml.businessRemote.ejbLocalHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.businessRemote.ejbLocalObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
+
+
++++<tr>++++++<td>+++xml.businessRemote.notInterface+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.home.beanClass+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.home.businessLocal+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessLocal() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.home.businessRemote+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessRemote() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.home.ejbLocalHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.home.ejbLocalObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.home.ejbObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.home.notInterface+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.home.unknown+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.invalidTransactionAttribute+++</td>++++++<td>+++[org/apache/openejb/config/rules/CheckInvalidTransactionAttributeTest.xml() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidtransactionattributetest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.local.beanClass+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.local.businessLocal+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessLocal() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.local.businessRemote+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessRemote() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.local.ejbHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.local.ejbLocalHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.local.ejbObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.local.notInterface+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.local.unknown+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.localHome.beanClass+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.localHome.businessLocal+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessLocal() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.localHome.businessRemote+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessRemote() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.localHome.ejbHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.localHome.ejbLocalObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.localHome.ejbObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.localHome.notInterface+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.localHome.unknown+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.localRemote.conflict+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.remote.beanClass+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.remote.businessLocal+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessLocal() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.remote.businessRemote+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessRemote() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.remote.ejbHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.remote.ejbLocalHome+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.remote.ejbLocalObject+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.remote.notInterface+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
++++<tr>++++++<td>+++xml.remote.unknown+++</td>++++++<td>+++[org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
+</tr>
+\{table-plus}+++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</tr>++++++</td>++++++</th>++++++</tr>++++++</table>+++
diff --git a/src/main/jbake/content/dev/validation-keys-audit-report.md b/src/main/jbake/content/dev/validation-keys-audit-report.md
deleted file mode 100644
index c0e9fbf..0000000
--- a/src/main/jbake/content/dev/validation-keys-audit-report.md
+++ /dev/null
@@ -1,282 +0,0 @@
-Title: Validation Keys Audit Report
-{warning:title=Warning}This page is auto-generated. Any manual changes
-would be over-written the next time this page is regenerated{warning}
-{info:title=Audit Result}h2.Out of a total of 144 keys, 123 have been
-tested. Test coverage for keys is 85.41666666666666 %.{info}
-{table-plus:autoNumber=true}
-  
-  
- | abstractAnnotatedAsBean | 
- | ann.ejb.beanClass | 
- | ann.ejb.notInterface | 
- | ann.localRemote.generalconflict | 
- | asynchronous.badExceptionType | 
- | asynchronous.badReturnType | 
- | asynchronous.methodignored | 
- | asynchronous.missing | 
- | callback.missing.possibleTypo | 
- | cannot.validate | 
- | client.missingMainClass | 
- | ignoredClassAnnotation | 
- | interfaceAnnotatedAsBean | 
- | missing.dependent.class | 
- | misslocated.class | 
- | multiplyAnnotatedAsBean | 
- | timeout.badReturnType | 
- | timeout.invalidArguments | 
- | timeout.missing.possibleTypo | 
- | timeout.tooManyMethods | 
- | xml.noEjbClass | 
-{table-plus}
-<a name="ValidationKeysAuditReport-Listofkeyswhichhavebeentested."></a>
-## List of keys which have been tested.
-{table-plus:autoNumber=true}
-<table>
-<tr><th> Key </td><td> Method which tests the key </th></tr>
-<tr><td> ann.ejb.ejbLocalObject </td><td> [org/apache/openejb/config/rules/InvalidEjbRefTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidejbreftest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.ejb.ejbObject </td><td> [org/apache/openejb/config/rules/InvalidEjbRefTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidejbreftest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.invalidConcurrencyAttribute </td><td> [org/apache/openejb/config/rules/CheckInvalidConcurrencyAttributeTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidconcurrencyattributetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.invalidTransactionAttribute </td><td> [org/apache/openejb/config/rules/CheckInvalidTransactionAttributeTest.annotation() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidtransactionattributetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.local.noAttributes </td><td> [org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.noAttributes() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidannotatedinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.localRemote.ambiguous </td><td> [org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.ambiguous() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidannotatedinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-  
-  
-<tr><td> ann.notAnInterface </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.remote.noAttributes </td><td> [org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.noAttributes() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidannotatedinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.remoteOrLocal.converse.parent </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.test2() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.remoteOrLocal.ejbHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.remoteOrLocal.ejbLocalHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.remoteOrLocal.ejbLocalObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ann.remoteOrLocal.ejbObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-  
-  
-  
-  
-  
-  
-<tr><td> aroundInvoke.missing.possibleTypo </td><td> [org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> aroundInvoke.mustThrowException </td><td> [org/apache/openejb/config/rules/CheckInvalidAroundTimeoutTest.testInvalidAroundTimeoutReturnValue() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidaroundtimeouttest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> callback.badModifier </td><td> [org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> callback.badReturnType </td><td> [org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> callback.invalidArguments </td><td> [org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> callback.missing </td><td> [org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> callback.sessionSynchronization.invalidUse </td><td> [org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> callback.sessionbean.invalidusage </td><td> [org/apache/openejb/config/rules/CheckInvalidCallbacksTest.test2() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcallbackstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> conflictingSecurityAnnotations </td><td> [org/apache/openejb/config/rules/CheckInvalidSecurityAnnotationsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidsecurityannotationstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> containerTransaction.ejbNameRequired </td><td> [org/apache/openejb/config/rules/CheckInvalidContainerTransactionTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcontainertransactiontest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> containerTransaction.noSuchEjbName </td><td> [org/apache/openejb/config/rules/CheckInvalidContainerTransactionTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidcontainertransactiontest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> dependsOn.circuit </td><td> [org/apache/openejb/config/rules/CheckDependsOnTest.dependsOn() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkdependsontest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> dependsOn.noSuchEjb </td><td> [org/apache/openejb/config/rules/CheckDependsOnTest.dependsOn() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkdependsontest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ejbAnnotation.onClassWithNoBeanInterface </td><td> [org/apache/openejb/config/rules/InvalidEjbRefTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidejbreftest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> ejbAnnotation.onClassWithNoName </td><td> [org/apache/openejb/config/rules/InvalidEjbRefTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidejbreftest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> entity.no.ejb.create </td><td> [org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
-</tr>
-  
-  
-<tr><td> injectionTarget.nameContainsSet </td><td> [org/apache/openejb/config/rules/CheckInjectionTargetsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinjectiontargetstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> interceptor.callback.badReturnType </td><td> [org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> interceptor.callback.invalidArguments </td><td> [org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> interceptor.callback.missing </td><td> [org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> interceptor.callback.missing.possibleTypo </td><td> [org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> interceptor.unused </td><td> [org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> interceptorBinding.ejbNameRequiredWithMethod </td><td> [org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> interceptorBinding.noSuchEjbName </td><td> [org/apache/openejb/config/rules/CheckInvalidInterceptorTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidinterceptortest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> interface.beanOnlyAnnotation </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> interfaceMethod.beanOnlyAnnotation </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.test1() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> methodPermission.ejbNameRequired </td><td> [org/apache/openejb/config/rules/CheckInvalidMethodPermissionsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidmethodpermissionstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> methodPermission.noSuchEjbName </td><td> [org/apache/openejb/config/rules/CheckInvalidMethodPermissionsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidmethodpermissionstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> missing.class </td><td> [org/apache/openejb/config/rules/CheckMissingClassTest.wrongClassType() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkmissingclasstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> no.busines.method </td><td> [org/apache/openejb/config/rules/CheckNoBusinessMethodTest.noBusinessMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknobusinessmethodtest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> no.busines.method.args </td><td> [org/apache/openejb/config/rules/CheckNoBusinessMethodTest.noBusinessMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknobusinessmethodtest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> no.busines.method.case </td><td> [org/apache/openejb/config/rules/CheckNoBusinessMethodTest.noBusinessMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknobusinessmethodtest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> no.home.create </td><td> [org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> noInterfaceDeclared.entity </td><td> [org/apache/openejb/config/rules/CheckWrongClassTypeTest.wrongClassType() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkwrongclasstypetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> permitAllAndRolesAllowedOnClass </td><td> [org/apache/openejb/config/rules/CheckInvalidSecurityAnnotationsTest.test() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidsecurityannotationstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceContextAnnotation.onClassWithNoName </td><td> [org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceContextAnnotation.onEntityManagerFactory </td><td> [org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceContextAnnotation.onNonEntityManager </td><td> [org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceContextExtented.nonStateful </td><td> [org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceContextRef.noMatches </td><td> [org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.noUnitName() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceContextRef.noPersistenceUnits </td><td> [org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceContextRef.noUnitName </td><td> [org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.noUnitName() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceContextRef.vagueMatches </td><td> [org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.vagueMatches() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistencecontextusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceUnitAnnotation.onClassWithNoName </td><td> [org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceUnitAnnotation.onEntityManager </td><td> [org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceUnitAnnotation.onNonEntityManagerFactory </td><td> [org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceUnitRef.noMatches </td><td> [org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.noUnitName() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceUnitRef.noPersistenceUnits </td><td> [org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceUnitRef.noUnitName </td><td> [org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.noUnitName() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> persistenceUnitRef.vagueMatches </td><td> [org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.vagueMatches() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkpersistenceunitusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> resourceAnnotation.onClassWithNoName </td><td> [org/apache/openejb/config/rules/MistakenResourceRefUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/mistakenresourcerefusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> resourceAnnotation.onClassWithNoType </td><td> [org/apache/openejb/config/rules/MistakenResourceRefUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/mistakenresourcerefusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> resourceRef.onEntityManager </td><td> [org/apache/openejb/config/rules/MistakenResourceRefUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/mistakenresourcerefusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> resourceRef.onEntityManagerFactory </td><td> [org/apache/openejb/config/rules/MistakenResourceRefUsageTest.wrongUsage() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/mistakenresourcerefusagetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> session.no.ejb.create </td><td> [org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> unused.ejb.create </td><td> [org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> unused.ejbPostCreate </td><td> [org/apache/openejb/config/rules/CheckNoCreateMethodsTest.noCreateMethod() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checknocreatemethodstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> userTransactionRef.forbiddenForCmtdBeans </td><td> [org/apache/openejb/config/rules/CheckUserTransactionRefsTest.testSLSBwithUserTransaction() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkusertransactionrefstest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> wrong.class.type </td><td> [org/apache/openejb/config/rules/CheckWrongClassTypeTest.wrongClassType() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkwrongclasstypetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.businessLocal.beanClass </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.businessLocal.ejbHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-  
-  
-  
-  
-<tr><td> xml.businessLocal.ejbObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-  
-  
-<tr><td> xml.businessRemote.beanClass </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-  
-  
-<tr><td> xml.businessRemote.ejbLocalHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.businessRemote.ejbLocalObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-  
-  
-<tr><td> xml.businessRemote.notInterface </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.home.beanClass </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.home.businessLocal </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessLocal() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.home.businessRemote </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessRemote() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.home.ejbLocalHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.home.ejbLocalObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.home.ejbObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.home.notInterface </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.home.unknown </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.invalidTransactionAttribute </td><td> [org/apache/openejb/config/rules/CheckInvalidTransactionAttributeTest.xml() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/checkinvalidtransactionattributetest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.local.beanClass </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.local.businessLocal </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessLocal() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.local.businessRemote </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessRemote() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.local.ejbHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.local.ejbLocalHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.local.ejbObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.local.notInterface </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.local.unknown </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.localHome.beanClass </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.localHome.businessLocal </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessLocal() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.localHome.businessRemote </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessRemote() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.localHome.ejbHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.localHome.ejbLocalObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.localHome.ejbObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.localHome.notInterface </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.localHome.unknown </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.localRemote.conflict </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.remote.beanClass </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBeanClass() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.remote.businessLocal </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessLocal() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.remote.businessRemote </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testBusinessRemote() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.remote.ejbHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.remote.ejbLocalHome </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalHome() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.remote.ejbLocalObject </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testEJBLocalObject() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.remote.notInterface </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testNotInterface() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-<tr><td> xml.remote.unknown </td><td> [org/apache/openejb/config/rules/InvalidInterfacesTest.testUnkown() ](-https://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/invalidinterfacestest.java?revision=head&view=markup-.html)
-</tr>
-{table-plus}
diff --git a/src/main/jbake/content/dev/website-dev.adoc b/src/main/jbake/content/dev/website-dev.adoc
new file mode 100644
index 0000000..0d946a7
--- /dev/null
+++ b/src/main/jbake/content/dev/website-dev.adoc
@@ -0,0 +1,52 @@
+= Working on the Website
+:jbake-type: page
+:jbake-status: published
+
+The easiest way to edit is to simply click the blue pencil icon in the upper right.
+Have fun!
+
+== Offline Editing
+
+Editing offline can be fantastic for making big changes or documenting while coding.
+You simply need to  check out the site source from svn:
+
+ svn co https://svn.apache.org/repos/asf/tomee/site/trunk website-source
+
+All the important source is in the `content` directory.
+Just edit and check in the `.mdtext` files and they will appear in the staging site within seconds.
+
+For example, `documentation.mdtext` shows up as:
+
+[http://tomee.staging.apache.org/documentation.html]
+
+== Publishing
+
+Simply visit https://cms.apache.org/tomee/publish
+
+It will prompt you for user/pass information and make you review the changes.
+Enter the optional log message and click "sumbit", then done!
+
+The login information is cached for a while, so you won't have to enter user/pass information each time.
+
+== Building Locally
+
+Should you want to build the site locally, you can do so pretty easily with the right perl modules installed.
+
+First check out the CMS source:
+
+ svn co https://svn.apache.org/repos/infra/websites/cms/build apache-cms-source
+
+The cpan modules you have to install may vary.
+Here are the ones I installed:
+
+ sudo cpan XML::RSS::Parser::Lite
+ sudo cpan XML::RSS::Parser
+ sudo cpan XML::Parser::Lite
+ sudo cpan XML::Atom::Feed
+
+What you need to install may be different, so perhaps just skip to the part where we attempt to run the build locally and see what shows up missing and install just those things.
+
+ cd apache-cms-source
+ ./build_site.pl  --source-base ~/path/to/website-source --target-base /tmp/site
+
+All the generated html content will be under `/tmp/site/content`
diff --git a/src/main/jbake/content/dev/website-dev.md b/src/main/jbake/content/dev/website-dev.md
deleted file mode 100644
index c929652..0000000
--- a/src/main/jbake/content/dev/website-dev.md
+++ /dev/null
@@ -1,51 +0,0 @@
-Title: Working on the Website
-
-The easiest way to edit is to simply click the blue pencil icon in the upper right.  Have fun!
-
-## Offline Editing
-
-Editing offline can be fantastic for making big changes or documenting while coding.  You simply need to
- check out the site source from svn:
-
-    svn co https://svn.apache.org/repos/asf/tomee/site/trunk website-source
-
-All the important source is in the `content` directory.  Just edit
-and check in the `.mdtext` files and they will appear in the staging
-site within seconds.
-
-For example, `documentation.mdtext` shows up as:
-
-[http://tomee.staging.apache.org/documentation.html]
-
-## Publishing
-
-Simply visit [https://cms.apache.org/tomee/publish](https://cms.apache.org/tomee/publish)
-
-It will prompt you for user/pass information and make you review the changes.  Enter the optional log message and click "sumbit", then done!
-
-The login information is cached for a while, so you won't have to enter user/pass information each time.
-
-
-## Building Locally <small>optional</small>
-
-Should you want to build the site locally, you can do so pretty easily with the right perl modules installed.
-
-First check out the CMS source:
-
-    svn co https://svn.apache.org/repos/infra/websites/cms/build apache-cms-source
-
-The cpan modules you have to install may vary.  Here are the ones I installed:
-
-    sudo cpan XML::RSS::Parser::Lite
-    sudo cpan XML::RSS::Parser
-    sudo cpan XML::Parser::Lite
-    sudo cpan XML::Atom::Feed
-
-What you need to install may be different, so perhaps just skip to the part
-where we attempt to run the build locally and see what shows up missing and
-install just those things.
-
-    cd apache-cms-source
-    ./build_site.pl  --source-base ~/path/to/website-source --target-base /tmp/site
-
-All the generated html content will be under `/tmp/site/content`
diff --git a/src/main/jbake/content/dev/writing-examples.adoc b/src/main/jbake/content/dev/writing-examples.adoc
new file mode 100644
index 0000000..61554f8
--- /dev/null
+++ b/src/main/jbake/content/dev/writing-examples.adoc
@@ -0,0 +1,106 @@
+= Writing Presentable Examples
+:jbake-type: page
+:jbake-status: published
+
+Writing an example is easy.
+Any example is a good one.
+The more the better.
+
+Writing examples that can be used in a presentations is hard.
+
+Some basic guidelines of writing examples:
+
+* focus on one idea per example
+* keep examples short
+ ** one test case
+ ** minimal code to make the point
+* avoid showing an entire API in one example, if possible
+* be conscious of the cost of "setting the stage"
+* if examples get too big, split it
+
+== Noise vs signal
+
+It takes time to learn the example scenario (noise).
+You need to learn the scenario before you can start to see the important parts (signal).
+
+Be very mindful of your noise to signal ratio.
+
+Example scenarios do not need to be believable and should not be elaborate.
+Get to the point in as few classes as possible.
+
+You should be able to explain the entire example in two minutes.
+
+== Five ways to do the same thing
+
+If there are five ways to do the same thing, avoid making five different scenarios.
+Copy the example to a new directory, and tweak it to show the variation.
+
+So say you used objects `Green`, `Square` and `Checkers` to show the basic concept and you wish to show the next variation of that same concept.
+It is tempting to add to the same example objects `Yellow`, `Triangle` and `PolkaDots`.
+
+Avoid that.
+Copy `Green`, `Square` and `Checkers` to a new example, change the package name, and update the few lines needed to show the difference.
+
+Where does your eye focus?
+
+* 934 + 55 = 989
+* 513 - 19 = 494
+* 468 * 44 = 20592
+* 708 / 89 = 7
+* 401 % 63 = 23
+
+How about now?
+
+* 102 + 35 = 137
+* 102 - 35 = 67
+* 102 * 35 = 3570
+* 102 / 35 = 2
+* 102 % 35 = 32
+
+The intent of the second set of numbers can be easily guessed.
+An explanation that it is about the math operators confirms that and locks it in your brain.
+
+When presenting, you only get so much time to show people ideas.
+If they have to learn a new set of names and understand their relationship on each tiny variation, it severely impacts their ability to see what is supposed to be the same and what is supposed to be different.
+As a presenter this means you must show less and what you do show will be shown less clearly.
+
+When names and scenarios are consistent, the variations jump out quickly and with impact.
+
+If there are five ways to do the same thing, show the same thing five different ways.
+
+== Short Class Names
+
+You don't need to document the example with the class name.
+Class names that are a mouthful cannot be effectively used in presentations or screencasts.
+
+Try to stick with one or two word class names.
+Three tops.
+
+Avoid:
+
+* `BeanWithTwoDecoratorsAndOneProducerMethod`
+
+Try instead:
+
+* `BlueBean`
+
+Shorter names can be easier for all sorts of reasons.
+Less words to keep "floating in the head" when trying to truly see an example.
+
+Using the numbers from the previous section, which is easier?
+
+* 102 + 35 = 137
+* 102 - 35 = 67
+* 102 * 35 = 3570
+* 102 / 35 = 2
+* 102 % 35 = 32
+
+Or:
+
+* 12 + 3 = 15
+* 12 - 3 = 9
+* 12 * 3 = 36
+* 12 / 3 = 4
+* 12 % 3 = 0
+
+There's a finite amount people can keep in their head, save space for the important stuff.
diff --git a/src/main/jbake/content/dev/writing-examples.md b/src/main/jbake/content/dev/writing-examples.md
deleted file mode 100644
index 4aebc06..0000000
--- a/src/main/jbake/content/dev/writing-examples.md
+++ /dev/null
@@ -1,95 +0,0 @@
-Title: Writing Presentable Examples
-
-Writing an example is easy.  Any example is a good one.  The more the better.
-
-Writing examples that can be used in a presentations is hard.
-
-Some basic guidelines of writing examples:
-
- - focus on one idea per example
- - keep examples short
-    - one test case
-    - minimal code to make the point
- - avoid showing an entire API in one example, if possible
- - be conscious of the cost of "setting the stage"
- - if examples get too big, split it
-
-# Noise vs signal
-
-It takes time to learn the example scenario (noise).  You need to learn the scenario before you can start to see the important parts (signal).
-
-Be very mindful of your noise to signal ratio.
-
-Example scenarios do not need to be believable and should not be elaborate.  Get to the point in as few classes as possible.
-
-You should be able to explain the entire example in two minutes.
-
-# Five ways to do the same thing
-
-If there are five ways to do the same thing, avoid making five different scenarios.  Copy the example to a new directory, and tweak it to show the variation.
-
-So say you used objects `Green`, `Square` and `Checkers` to show the basic concept and you wish to show the next variation of that same concept.  It is tempting to add to the same
-example objects `Yellow`, `Triangle` and `PolkaDots`.
-
-Avoid that.  Copy `Green`, `Square` and `Checkers` to a new example, change the package name, and update the few lines needed to show the difference.
-
-Where does your eye focus?
-
- - 934 + 55 = 989
- - 513 - 19 = 494
- - 468 * 44 = 20592
- - 708 / 89 = 7
- - 401 % 63 = 23
-
-How about now?
-
- - 102 + 35 = 137
- - 102 - 35 = 67
- - 102 * 35 = 3570
- - 102 / 35 = 2
- - 102 % 35 = 32
-
-The intent of the second set of numbers can be easily guessed.  An explanation that it is about the math operators confirms that and locks it in your brain.
-
-When presenting, you only get so much time to show people ideas.  If they have to learn a new set of names and understand their relationship on each tiny variation, it severely
-impacts their ability to see what is supposed to be the same and what is supposed to be different.  As a presenter this means you must show less and what you do show will be shown
-less clearly.
-
-When names and scenarios are consistent, the variations jump out quickly and with impact.
-
-If there are five ways to do the same thing, show the same thing five different ways.
-
-# Short Class Names
-
-You don't need to document the example with the class name.  Class names that are a mouthful cannot be effectively used in presentations or screencasts.
-
-Try to stick with one or two word class names.  Three tops.
-
-Avoid:
-
- - `BeanWithTwoDecoratorsAndOneProducerMethod`
-
-Try instead:
-
- - `BlueBean`
-
-Shorter names can be easier for all sorts of reasons.  Less words to keep "floating in the head" when trying to truly see an example.
-
-Using the numbers from the previous section, which is easier?
-
- - 102 + 35 = 137
- - 102 - 35 = 67
- - 102 * 35 = 3570
- - 102 / 35 = 2
- - 102 % 35 = 32
-
-Or:
-
- - 12 + 3 = 15
- - 12 - 3 = 9
- - 12 * 3 = 36
- - 12 / 3 = 4
- - 12 % 3 = 0
-
-There's a finite amount people can keep in their head, save space for the important stuff.
-
diff --git a/src/main/jbake/content/dev/writing-validation-tests.adoc b/src/main/jbake/content/dev/writing-validation-tests.adoc
new file mode 100644
index 0000000..06c5eff
--- /dev/null
+++ b/src/main/jbake/content/dev/writing-validation-tests.adoc
@@ -0,0 +1,128 @@
+= Writing Validation Tests
+:jbake-type: page
+:jbake-status: published
+
+
+== Summary
+
+Validation is a critical and integral part of the project.
+If you are writing some code which validates some rules, you should definitely write a test for it.
+A little validation test framework is available to write tests specifically for Validation.
+This page explains the details of writing such tests using example snippets.
+
+
+== The Validation Framework
+
+. `org.apache.openejb.config.ConfigurationFactory` uses a chain of `org.apache.openejb.config.DynamicDeployer` implementations.
+One of the implementations in the chain is `org.apache.openejb.config.ValidateModules`.
+`ValidateModules` is conditionally added to the _chain_ if the property `openejb.validation.skip=true|false`.
+If this property is false, then `ValidateModules` is used to kick off the Validation Framework
+
+link:https://github.com/apache/openejb/tree/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java[Configuration Factory]
+
+[start=2]
+. Internally ValidateModules uses the link:https://github.com/apache/openejb/tree/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ValidateModules.java[_AppValidator.validate()_ method]
+. This method then performs validation using a number of rules.
+A validation rule/s is represented by a class implementing ValidationRule.
+In fact, all the classes checking the validation rules, extend ValidationBase, which further implements ValidationRule.
+
+image::ClassDiagram.png[]
+
+The _list of rules_ being executed can actually be found in the following method of link:https://github.com/apache/openejb/tree/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java[AppValidator]
+
+[start=4]
+. The above rules are then executed one by one
+. Each module has an attached ValidationContext, which maintains a list of failures, warnings and errors.
+As the above rules are being invoked, the failure/errors/warnings for a module are being added to its ValidationContext.
+Every Validation failure has an associated message which can be found in `org/apache/openejb/config/rules/messages.properties`.
+A message has three levels as explained below:
+
+Format for the different levels follows this spirit:
+
+ .. Should be short and fixed such that someone could search/grep for it  without having to know/use regular expressions.
+These tend to be similar  to the message key.
+ .. Intended to contain the issue expressed in 1 with only the essential  details, should not line wrap if possible.
+Be terse.
+ .. Teacher's assistant.
+A much more conversational and possibly more detailed  explanation of the issue, should tell the user what to do to fix the problem.
+I.e.
+don't just point out what is wrong, also point out what is right.
+Use  several lines if needed.
+
+Here is an _example validation message_
+
+[source,console]
+----
+ # 0 - method name
+ # 1 - full method
+ # 2 - remote|home
+ # 3 - interface name
+ # 4 - EJB Class name
+ 1.no.busines.method	  No such business method
+ 2.no.busines.method	  Business method {0} not implemented.
+ 3.no.busines.method	  Business method {1} not implemented. The method was declared in the {2} interface {3}, but not implemented in the ejb class {4}
+----
+
+[start=6]
+. The validation framework does not stop processing on the first validation failure, but keeps going and checking for other validation errors and reports them all to the user.
+This allows the user to fix all errors in one go and re-attempt deploying the application.
+
+== The Validation Test Framework
+
+The test framework is specifically written with the following goals in mind:
+
+. It should be easy to write the test, and the framework should do the boiler-plate work, the test author just needs to provide the relevant info
+. It should report the test coverage i.e.
+the framework should generate a report regarding which keys in messages.properties have tests written for them and what is the corresponding Test class/es which test for the validation rule associated with that key
+. It should ensure that if a test is being written for a specific message key, then that key should exist in the messages.properties file
+. Lets break down the framework by using an https://github.com/apache/openejb/tree/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInjectionTargetsTest.java[example]
+ .. The first thing to note is that we are running the test using our own custom runner i.e.
+`@RunWith(ValidationRunner.class)`.
+This runner ensures that the keys we are testing, actually exist in the messages.properties file.
+It does a lot more, as we shall see later
+ .. The test method
+ .. Can be given any name
+ .. Must be annotated with @Keys and CANNOT be annotated with @Test.
+The rest of the JUnit annotations can be used
+ .. Must return one of EjbJar / EjbModule / AppModule.
+The returned EjbJar/EjbModule/AppModule will be specifically created to cause one or more validation errors/warnings/failures.
+ .. Following annotations are provided by the framework
+ .. @Keys : is a collection of zero or more @Key
+ .. @Key : represents a key for which this test is being written.
+A @Key can be of type FAILURE or WARNING or ERROR.
+Default value is FAILURE.
+As seen in the example above, the test() method is expecting two warnings for the key injectionTarget.nameContainsSet.
+If count is not equal to 2 or some other Validation Failure/Warning/Error was also thrown from the method, then the test fails.
+
+NOTE: Be Careful The test must cause a Validation Failure otherwise the test framework does not get invoked.
+For example, in the above code, a Key of type WARNING is being tested, however the test is purposely being failed by putting an `@AroundInvoke` around the method with zero arguments
+
+[start=5]
+. Once you have written the test and successfully run it, you now need to generate the report.
+Simply invoke the following maven command
+
+[source,console]
+----
+mvn test -Dtest=ValidationKeysAuditorTest -DconfluenceUsername=YourConfluenceUsername -DconfluencePassword=YourConfluencePassword
+----
+
+The above command will create a complete test coverage report and post it to this location xref:validation-keys-audit-report.adoc[Validation Keys Audit Report]
+
+=== Quick facts about ValidationRunner and things to keep in mind while writing tests
+
+This class is created specifically to write tests which test OpenEjb validation code.
+Specifically, it is used to check the usage of keys defined in `org.apache.openejb.config.rules.Messages.properties`.
+To use this runner, simply annotate your test case with `@RunWith(ValidationRunner.class`).
+Here are some things to keep in mind when writing tests:
+
+. A test method needs to be annotated with `org.apache.openejb.config.rules.Keys` instead of the `org.junit.Test`
+. Any usage of the @Test annotation will be ignored.
+. If the @Keys and @Test annotation are used together on a test method, then the TestCase will error out.
+. Every test method should create a EjbJar or EjbModule or AppModule and return it from the method.
+It should list the keys being tested in the @Keys annotation
+. The runner will invoke the test method and use the Assembler and ConfigurationFactory to create the application.
+. This will kick off validation and this Runner will catch ValidationFailureException and make sure that all the keys specified in the @Keys annotation show up in the ValidationFailureException.
+. If the keys listed in the @Keys annotation match the keys found in the ValidationFailureException, the test passes, else the test fails.
+. This Runner also validates that the keys specified in the @Keys annotation are also available in the org.apache.openejb.config.rules.Messages.properties file.
+If the key is not found, then the Runner throws and exception resulting in your test case not being allowed to run.
+. Sometimes you want to write a test where you do not want any ValidationFailureException to be thrown, in those scenarios, simply annotate your test with @Keys and do not specify any @Key in it.
diff --git a/src/main/jbake/content/dev/writing-validation-tests.md b/src/main/jbake/content/dev/writing-validation-tests.md
deleted file mode 100644
index 3c70370..0000000
--- a/src/main/jbake/content/dev/writing-validation-tests.md
+++ /dev/null
@@ -1,163 +0,0 @@
-Title: Writing Validation Tests
-
-<a name="WritingValidationTests-Summary"></a>
-## Summary
-
-Validation is a critical and integral part of the project. If you are
-writing some code which validates some rules, you should definitely write a
-test for it. A little validation test framework is available to write tests
-specifically for Validation. This page explains the details of writing such
-tests using example snippets.
-
-<a name="WritingValidationTests-TheValidationFramework"></a>
-## The Validation Framework
-
-1. `org.apache.openejb.config.ConfigurationFactory` uses a chain of
-`org.apache.openejb.config.DynamicDeployer` implementations. One of the
-implementations in the chain is
-`org.apache.openejb.config.ValidateModules`. `ValidateModules` is
-conditionally added to the _chain_ if the property
-`openejb.validation.skip=true|false`. If this property is false, then
-`ValidateModules` is used to kick off the Validation Framework
-
-[Configuration Factory](https://github.com/apache/openejb/tree/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java)
-
-1. Internally ValidateModules uses the [*AppValidator.validate()* method](https://github.com/apache/openejb/tree/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ValidateModules.java)
-
-1. This method then performs validation using a number of rules. _A
-validation rule/s is represented by a class implementing ValidationRule.
-In fact, all the classes checking the validation rules , extend
-ValidationBase, which further implements ValidationRule.
-
-    <img src="../images/ClassDiagram.png" alt="" align="center">
-
-The _list of rules_ being executed can actually be found in the following
-method of [AppValidator](https://github.com/apache/openejb/tree/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java)
-1. The above rules are then executed one by one
-
-1. Each module has an attached ValidationContext , which maintains a list of
-failures, warnings and errors. As the above rules are being invoked, the
-failure/errors/warnings for a module are being added to its
-ValidationContext. Every Validation failure has an associated message which
-can be found in `org/apache/openejb/config/rules/messages.properties`. A
-message has three levels as explained below:
-
-    Format for the different levels follows this spirit:
-    
-    1. Should be short and fixed such that someone could search/grep for it
-    without having to know/use regular expressions.  These tend to be similar
-    to the message key.
-    
-    2. Intended to contain the issue expressed in 1 with only the essential
-    details, should not line wrap if possible.  Be terse.
-    
-    3. Teacher's assistant.  A much more conversational and possibly more
-detailed
-    explanation of the issue, should tell the user what to do to fix the
-problem.
-    I.e. don't just point out what is wrong, also point out what is right.	Use
-    several lines if needed.
-
-Here is an *example validation message*
-
-    # 0 - method name
-    # 1 - full method
-    # 2 - remote|home
-    # 3 - interface name
-    # 4 - EJB Class name
-    1.no.busines.method	  No such business method
-    2.no.busines.method	  Business method {0} not implemented.
-    3.no.busines.method	  Business method {1} not implemented. The method was declared in the {2} interface {3}, but not implemented in the ejb class {4}
-
-1. The validation framework does not stop processing on the first validation
-failure, but keeps going and checking for other validation errors and
-reports them all to the user. This allows the user to fix all errors in one
-go and re-attempt deploying the application.
-
-<a name="WritingValidationTests-TheValidationTestFramework"></a>
-## The Validation Test Framework
-
-
-
-1. The test framework is specifically written with the following goals in
-mind:
-1.    It should be easy to write the test, and the framework should do
-the boiler-plate work, the test author just needs to provide the relevant
-info
-1.    It should report the test coverage i.e. the framework should
-generate a report regarding which keys in messages.properties have tests
-written for them and what is the corresponding Test class/es which test for
-the validation rule associated with that key
-1.    It should ensure that if a test is being written for a specific
-message key, then that key should exist in the messages.properties file
-1. Lets break down the framework by using an [example](https://github.com/apache/openejb/tree/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInjectionTargetsTest.java)
-
-    
-   1.    The first thing to note is that we are running the test using our
-own custom runner i.e. `@RunWith(ValidationRunner.class)`. This runner
-ensures that the keys we are testing, actually exist in the
-messages.properties file. It does a lot more, as we shall see later    
-    2.    The test method
-    3.    Can be given any name
-    4.    Must be annotated with @Keys and CANNOT be annotated with @Test.
-The rest of the JUnit annotations can be used
-    5.   Must return one of EjbJar / EjbModule / AppModule. The returned
-EjbJar/EjbModule/AppModule will be specifically created to cause one or
-more validation errors/warnings/failures.
-    1.    Following annotations are provided by the framework
-    1.    @Keys : is a collection of zero or more @Key
-    1.    @Key : represents a key for which this test is being written. A @Key
-can be of type FAILURE or WARNING or ERROR. Default value is FAILURE. As
-seen in the example above, the test() method is expecting two warnings for
-the key injectionTarget.nameContainsSet. If count is not equal to 2 or some
-other Validation Failure/Warning/Error was also thrown from the method,
-then the test fails.
-###Be Careful
-The test must cause a Validation Failure otherwise the test framework does
-not get invoked. For example, in the above code, a Key of type WARNING is
-being tested, however the test is purposely being failed by putting an
-`@AroundInvoke` around the method with zero arguments
-
-
-1. Once you have written the test and successfully run it, you now need to
-generate the report. Simply invoke the following maven command
-
-    mvn test -Dtest=ValidationKeysAuditorTest
--DconfluenceUsername=YourConfluenceUsername
--DconfluencePassword=YourConfluencePassword
-
-The above command will create a complete test coverage report and post it
-to this location [OPENEJB:Validation Keys Audit Report](openejb:validation-keys-audit-report.html)
-
-###Quick facts about ValidationRunner and things to keep in mind while writing tests
-
-This class is created specifically to write tests which test OpenEjb
-validation code. Specifically, it is used to check the usage of keys
-defined in `org.apache.openejb.config.rules.Messages.properties`. To use this
-runner, simply annotate your test case with
-`@RunWith(ValidationRunner.class`). Here are some things to keep in mind when writing tests:    
-    1.    A test method needs to be annotated with    
-`org.apache.openejb.config.rules.Keys` instead of the `org.junit.Test`    
-    2.    Any usage of the @Test annotation will be ignored    
-    3.    If the @Keys and @Test annotation are used together on a test     method,
-then the TestCase will error out    
-    4.    Every test method should create a EjbJar or EjbModule or AppModule and
-return it from the method. It should list the keys being tested in the
-@Keys annotation
-
-1.    The runner will invoke the test method and use the Assembler and
-ConfigurationFactory to create the application
-1.This will kick off validation and this Runner will catch
-ValidationFailureException and make sure that all the keys specified in the
-@Keys annotation show up
-in the ValidationFailureException
-1. If the keys listed in the @Keys annotation match the keys found in the
-ValidationFailureException, the test passes, else the test fails.
-1. This Runner also validates that the keys specified in the @Keys
-annotation are also available in the
-org.apache.openejb.config.rules.Messages.properties file. If the key is not
-found, then the Runner throws and exception resulting in your test case not
-being allowed to run.
-1. Sometimes you want to write a test where you do not want any
-ValidationFailureException to be thrown, in those scenarios, simply
-annotate your test with @Keys and do not specify any @Key in it
diff --git a/src/main/jbake/content/dev/xbean-finder.adoc b/src/main/jbake/content/dev/xbean-finder.adoc
new file mode 100644
index 0000000..147cd0c
--- /dev/null
+++ b/src/main/jbake/content/dev/xbean-finder.adoc
@@ -0,0 +1,266 @@
+= xbean-finder
+:jbake-type: page
+:jbake-status: published
+
+== AnnotationFinder
+
+It uses ASM create an index of annotations and classes in a specific archive.
+Reason for using ASM are:
+
+* Security: Loading classes involves executing static initializers.
+Imagine doing this for every class in every jar.
+* Speed: Loading all those classes is slow
+* Memory: Chews up permgen space quickly and needlessly.
+Additional note, see above, some static initializers may hook themselves into the system and make the entire classloader (and the thousands of classes loaded) impossible to GC.
+
+=== Usage
+
+Say you had an `@Plugin` annotation you used, you could do as follows and skip the whole `META-INF` business:
+
+ AnnotationFinder finder = new AnnotationFinder(new JarArchive(classloader, jarUrl));
+ List<Class<?>> plugins = finder.findAnnotatedClasses(Plugin.class);
+
+That's the basics.
+
+....
+public class AnnotationFinder {
+    boolean isAnnotationPresent(Class<? extends Annotation> annotation);
+
+    List<String> getClassesNotLoaded();
+
+    List<Package> findAnnotatedPackages(Class<? extends Annotation> annotation);
+
+    List<Class<?>> findAnnotatedClasses(Class<? extends Annotation> annotation);
+
+    List<Class<?>> findInheritedAnnotatedClasses(Class<? extends Annotation> annotation);
+
+    List<Method> findAnnotatedMethods(Class<? extends Annotation> annotation);
+
+    List<Constructor> findAnnotatedConstructors(Class<? extends Annotation> annotation);
+
+    List<Field> findAnnotatedFields(Class<? extends Annotation> annotation);
+
+    List<Class<?>> findClassesInPackage(String packageName, boolean recursive);
+
+    <T> List<Class<? extends T>> findSubclasses(Class<T> clazz);
+
+    <T> List<Class<? extends T>> findImplementations(Class<T> clazz);
+
+    List<Annotated<Method>> findMetaAnnotatedMethods(Class<? extends Annotation> annotation);
+
+    List<Annotated<Field>> findMetaAnnotatedFields(Class<? extends Annotation> annotation);
+
+    List<Annotated<Class<?>>> findMetaAnnotatedClasses(Class<? extends Annotation> annotation);
+
+    List<String> getAnnotatedClassNames();
+}
+....
+
+== Archive
+
+So what we have now is a composable system.
+You create your finder and feed it an archive, like so:
+
+ Archive archive = new JarArchive(classloader, jarURL);
+ AnnotationFinder finder = new AnnotationFinder( archive );
+ List<Class<?>> plugins = finder.findAnnotatedClasses(PluginAnnotation.class)
+
+If you want some filtering, you add that in:
+
+....
+Archive archive = new JarArchive(classloader, jarURL);
+
+archive = new FilteredArchive(archive, new Filter {
+
+    @Override
+    public boolean accept(String name) {
+        return name.startsWith("org.foo.");
+    }
+});
+
+AnnotationFinder finder = new AnnotationFinder( archive );
+List<Class<?>> plugins = finder.findAnnotatedClasses(PluginAnnotation.class)
+....
+
+Several archives can be composed together via `CompositeArchive`
+
+ Archive archive = new CompositeArchive(
+     new JarArchive(classloader, jarURL),
+     new FileArchive(classloader, new File("target/classes/")),
+     new ClassesArchive(Foo.class, Bar.class)
+     );
+
+Sky is the limit.
+
+We have the following `Archive` implementations
+
+* ClassesArchive(Class<?>...
+classes)
+* ClassesArchive(Iterable<Class<?>> classes)
+* FileArchive(ClassLoader loader, URL url)
+* FileArchive(ClassLoader loader, File dir)
+* JarArchive(ClassLoader loader, URL url)
+
+For creating combinations of the above we have:
+
+* CompositeArchive(Archive...
+archives)
+* CompositeArchive(Iterable+++<Archive>+++archives)+++</Archive>+++
+
+For filtering classes out of archvies:
+
+* FilteredArchive(Archive archive, Filter filter)
+
+And a convenience class to quickly get an Archive from a set of urls
+
+* ClasspathArchive(ClassLoader loader, URL...
+urls)
+* ClasspathArchive(ClassLoader loader, Iterable+++<URL>+++urls)+++</URL>+++
+
+The above currently only supports `jar:` and `file:` urls
+
+== Filters
+
+Several built in filters exist for convenience
+
+* ClassFilter(String name)
+* ContainsFilter(String token)
+* PackageFilter(String packageName)
+* PatternFilter(String expression)
+* PatternFilter(Pattern pattern)
+* PrefixFilter(String prefix)
+* SuffixFilter(String suffix)
+
+As well as some filter implementations that allow all of the above to be composed together
+
+* ExcludeIncludeFilter(Filter include, Filter exclude)
+* FilterList(Filter...
+filters)
+* FilterList(Iterable+++<Filter>+++filters)+++</Filter>+++
+* IncludeExcludeFilter(Filter include, Filter exclude)
+
+And the following convenience class for quickly creating any of the above
+
+ public class Filters {
+     public static Filter packages(String... packages) {
+     public static Filter classes(String... classes) {
+     public static Filter prefixes(String... prefixes) {
+     public static Filter tokens(String... tokens) {
+     public static Filter suffixes(String... suffixes) {
+     public static Filter patterns(String... patterns) {
+     public static Filter optimize(Filter... filters) {
+     public static Filter optimize(List<Filter>... filterss) {
+     public static Filter invert(Filter filter) {
+ }
+
+== ResourceFinder
+
+Something similar to Java 6 ServiceLoader, except doesn't do the instantiations, but you could add that for yourself very easily.
+
+Using the same `META-INF` layout and files as you posted, you can do like:
+
+ ResourceFinder finder = new ResourceFinder("META-INF/services/");
+ List plugins = finder.findAllImplementations(Plugin.class);
+
+A little neater if you adjusted your META-INF layout as follows
+
+ META-INF/com.example.plugins.Plugins/red
+ META-INF/com.example.plugins.Plugins/blue
+
+...where the "red" file contained the text "com.example.plugins.RedPlugin" and the "blue" file contained the text "com.example.plugins.BluePlugin", you could then get them in a map like so:
+ Map plugins = finder.mapAvailableImplementations(Plugin.class);
+ Class red = plugins.get("red");
+ Class blue = plugins.get("blue");
+
+Now say you want to do something similar, but the "red" and "blue" files are properties files which contain the name of the implementation class and other configurable properties for your red and blue plugins.
+
+ ResourceFinder finder = new ResourceFinder("META-INF/services/");
+ Map pluginConfigs = finder.mapAllProperties(Plugin.class.getName());
+ Properties redConfig = pluginConfigs.get("red");
+ Properties blueConfig = pluginConfigs.get("blue");
+
+Object instantiation was never written into any of those libraries because we're big fans of xbean-reflect package, which is a real "don't tell me what to do" library for when you just want to create a simple object and would like to get real basic field/setter/constructor injection without choking down a whole "i control everything" framework.
+
+You just:
+
+ ObjectRecipe recpie = new ObjectRecipe("com.example.plugins.RedPlugin");
+ recpie.setProperty("myDateField","2008-04-17"); recpie.setProperty("myIntField","100");
+ recpie.setProperty("myBooleanField","true");
+ recpie.setProperty("myUrlField","http://www.theserverside.com");
+ Plugin red = (Plugin) recpie.create();
+ red.start();
+
+Obviously, the above style to object creation couples really well to the `ResourceFinder` method that gives you Properties objects back.
+You put the class name and config for your plugin in the properties files and pass the properties right into the ObjectRecipe and more or less get a little do-it-yourself IoC plugin system.
+
+== OpenEJB/TomEE
+
+Here is a grep of some of the calls made to `AnnotationFinder`.
+Most of this code is in an OpenEJB class called `AnnotationDeployer` whose primary job is to merge the @annotation and +++<xml>+++metadata into one tree.+++</xml>+++
+
+         for (Annotated<Class<?>> clazz : finder.findMetaAnnotatedClasses(LocalClient.class)) {
+         for (Annotated<Class<?>> clazz : finder.findMetaAnnotatedClasses(RemoteClient.class)) {
+     	List<Class<?>> connectorClasses = finder.findAnnotatedClasses(Connector.class);
+     	List<Class<?>> classes = finder.findAnnotatedClasses(ConnectionDefinitions.class);
+     	classes = finder.findAnnotatedClasses(ConnectionDefinition.class);
+     	classes = finder.findAnnotatedClasses(Activation.class);
+     	classes = finder.findAnnotatedClasses(AdministeredObject.class);
+         classes.addAll(finder.findAnnotatedClasses(WebService.class));
+         classes.addAll(finder.findAnnotatedClasses(WebServiceProvider.class));
+         for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(Singleton.class)) {
+         for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(Stateless.class)) {
+         for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(Stateful.class)) {
+         for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(ManagedBean.class)) {
+         for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(MessageDriven.class)) {
+         List<Class<?>> appExceptions = finder.findAnnotatedClasses(ApplicationException.class);
+                 List<Class<?>> list = finder.findAnnotatedClasses(annotation);
+             final List<Annotated<Class<?>>> annotatedClasses = sortClasses(annotationFinder.findMetaAnnotatedClasses(Interceptors.class));
+             final List<Annotated<Method>> annotatedMethods = sortMethods(annotationFinder.findMetaAnnotatedMethods(Interceptors.class));
+             for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(ExcludeDefaultInterceptors.class)) {
+             for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(ExcludeClassInterceptors.class))) {
+                         if (annotationFinder.isAnnotationPresent(Path.class) || !annotationFinder.findAnnotatedMethods(Path.class).isEmpty()) {
+         for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(Asynchronous.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(Asynchronous.class)) {
+         for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(RolesAllowed.class)) {
+         for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(PermitAll.class)) {
+         for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(DenyAll.class)) {
+         scheduleMethods.addAll(annotationFinder.findMetaAnnotatedMethods(javax.ejb.Schedules.class));
+         scheduleMethods.addAll(annotationFinder.findMetaAnnotatedMethods(javax.ejb.Schedule.class));
+             for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(PostConstruct.class))) {
+             for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(PreDestroy.class))) {
+                 for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(javax.interceptor.AroundInvoke.class))) {
+                 for (Annotated<Method> method : sortMethods((annotationFinder.findMetaAnnotatedMethods(javax.interceptor.AroundTimeout.class)))) {
+                 List<Annotated<Method>> timeoutMethods = sortMethods(annotationFinder.findMetaAnnotatedMethods(javax.ejb.Timeout.class));
+                 for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(AfterBegin.class))) {
+                 for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(BeforeCompletion.class))) {
+                 for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(AfterCompletion.class))) {
+                 for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(PostActivate.class))) {
+                 for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(PrePassivate.class))) {
+             for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(Init.class))) {
+             List<Annotated<Method>> removeMethods = sortMethods(annotationFinder.findMetaAnnotatedMethods(Remove.class));
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(EJBs.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(EJB.class)) {
+         for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(EJB.class)) {
+         for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(EJB.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(Resources.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(Resource.class)) {
+         for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(Resource.class)) {
+         for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(Resource.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(WebServiceRefs.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(WebServiceRef.class)) {
+         for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(WebServiceRef.class)) {
+         for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(WebServiceRef.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceUnits.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceUnit.class)) {
+         for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(PersistenceUnit.class)) {
+         for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(PersistenceUnit.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceContexts.class)) {
+         for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceContext.class)) {
+         for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(PersistenceContext.class)) {
+         for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(PersistenceContext.class)) {
+         int ann = annotationFinder.findAnnotatedClasses(handler.getAnnotationClass()).size();
+         ann += annotationFinder.findAnnotatedMethods(handler.getAnnotationClass()).size();
+         List<Annotated<Class<?>>> types = sortClasses(annotationFinder.findMetaAnnotatedClasses(annotationClass));
+         List<Annotated<Method>> methods = annotationFinder.findMetaAnnotatedMethods(annotationClass);
+     List<Class<?>> annotatedClasses = finder.findAnnotatedClasses(Path.class);
+     methods.addAll(finder.findAnnotatedMethods(Path.class));
diff --git a/src/main/jbake/content/dev/xbean-finder.md b/src/main/jbake/content/dev/xbean-finder.md
deleted file mode 100644
index 98bcc93..0000000
--- a/src/main/jbake/content/dev/xbean-finder.md
+++ /dev/null
@@ -1,266 +0,0 @@
-# xbean-finder
-
-## AnnotationFinder
-
-It uses ASM create an index of annotations and classes in a specific archive. Reason for using ASM are:
-
-  - Security: Loading classes involves executing static initializers.  Imagine doing this for every class in every jar.
-  - Speed: Loading all those classes is slow
-  - Memory: Chews up permgen space quickly and needlessly.  Additional note, see above, some static initializers may hook themselves into the system and make the entire classloader (and the thousands of classes loaded) impossible to GC.
-
-### Usage
-
-Say you had an `@Plugin` annotation you used, you could do as follows and skip the
-whole `META-INF` business:
-
-    AnnotationFinder finder = new AnnotationFinder(new JarArchive(classloader, jarUrl));
-    List<Class<?>> plugins = finder.findAnnotatedClasses(Plugin.class);
-
-That's the basics.
-
-    public class AnnotationFinder {
-        boolean isAnnotationPresent(Class<? extends Annotation> annotation);
-
-        List<String> getClassesNotLoaded();
-
-        List<Package> findAnnotatedPackages(Class<? extends Annotation> annotation);
-
-        List<Class<?>> findAnnotatedClasses(Class<? extends Annotation> annotation);
-
-        List<Class<?>> findInheritedAnnotatedClasses(Class<? extends Annotation> annotation);
-
-        List<Method> findAnnotatedMethods(Class<? extends Annotation> annotation);
-
-        List<Constructor> findAnnotatedConstructors(Class<? extends Annotation> annotation);
-
-        List<Field> findAnnotatedFields(Class<? extends Annotation> annotation);
-
-        List<Class<?>> findClassesInPackage(String packageName, boolean recursive);
-
-        <T> List<Class<? extends T>> findSubclasses(Class<T> clazz);
-
-        <T> List<Class<? extends T>> findImplementations(Class<T> clazz);
-
-        List<Annotated<Method>> findMetaAnnotatedMethods(Class<? extends Annotation> annotation);
-
-        List<Annotated<Field>> findMetaAnnotatedFields(Class<? extends Annotation> annotation);
-
-        List<Annotated<Class<?>>> findMetaAnnotatedClasses(Class<? extends Annotation> annotation);
-
-        List<String> getAnnotatedClassNames();
-    }
-
-## Archive
-
-So what we have now is a composable system.  You create your finder and feed it an archive, like so:
-
-    Archive archive = new JarArchive(classloader, jarURL);
-    AnnotationFinder finder = new AnnotationFinder( archive );
-    List<Class<?>> plugins = finder.findAnnotatedClasses(PluginAnnotation.class)
-
-If you want some filtering, you add that in:
-
-    Archive archive = new JarArchive(classloader, jarURL);
-
-    archive = new FilteredArchive(archive, new Filter {
-
-        @Override
-        public boolean accept(String name) {
-            return name.startsWith("org.foo.");
-        }
-    });
-
-    AnnotationFinder finder = new AnnotationFinder( archive );
-    List<Class<?>> plugins = finder.findAnnotatedClasses(PluginAnnotation.class)
-
-Several archives can be composed together via `CompositeArchive`
-
-    Archive archive = new CompositeArchive(
-        new JarArchive(classloader, jarURL),
-        new FileArchive(classloader, new File("target/classes/")),
-        new ClassesArchive(Foo.class, Bar.class)
-        );
-
-Sky is the limit.
-
-We have the following `Archive` implementations
-
- - ClassesArchive(Class<?>... classes)
- - ClassesArchive(Iterable<Class<?>> classes)
- - FileArchive(ClassLoader loader, URL url)
- - FileArchive(ClassLoader loader, File dir)
- - JarArchive(ClassLoader loader, URL url)
-
-For creating combinations of the above we have:
-
- - CompositeArchive(Archive... archives)
- - CompositeArchive(Iterable<Archive> archives)
-
-For filtering classes out of archvies:
-
- - FilteredArchive(Archive archive, Filter filter)
-
-And a convenience class to quickly get an Archive from a set of urls
-
- - ClasspathArchive(ClassLoader loader, URL... urls)
- - ClasspathArchive(ClassLoader loader, Iterable<URL> urls)
-
-The above currently only supports `jar:` and `file:` urls
-
-## Filters
-
-Several built in filters exist for convenience
-
- - ClassFilter(String name)
- - ContainsFilter(String token)
- - PackageFilter(String packageName)
- - PatternFilter(String expression)
- - PatternFilter(Pattern pattern)
- - PrefixFilter(String prefix)
- - SuffixFilter(String suffix)
-
-
-As well as some filter implementations that allow all of the above to be composed together
-
- - ExcludeIncludeFilter(Filter include, Filter exclude)
- - FilterList(Filter... filters)
- - FilterList(Iterable<Filter> filters)
- - IncludeExcludeFilter(Filter include, Filter exclude)
-
-And the following convenience class for quickly creating any of the above
-
-    public class Filters {
-        public static Filter packages(String... packages) {
-        public static Filter classes(String... classes) {
-        public static Filter prefixes(String... prefixes) {
-        public static Filter tokens(String... tokens) {
-        public static Filter suffixes(String... suffixes) {
-        public static Filter patterns(String... patterns) {
-        public static Filter optimize(Filter... filters) {
-        public static Filter optimize(List<Filter>... filterss) {
-        public static Filter invert(Filter filter) {
-    }
-
-
-## ResourceFinder
-
-Something similar to Java 6 ServiceLoader, except doesn't do the instantiations, but you could add that for yourself very easily.
-
-Using the same `META-INF` layout and files as you posted, you can do like:
-
-    ResourceFinder finder = new ResourceFinder("META-INF/services/");
-    List plugins = finder.findAllImplementations(Plugin.class);
-
-A little neater if you adjusted your META-INF layout as follows
-
-    META-INF/com.example.plugins.Plugins/red
-    META-INF/com.example.plugins.Plugins/blue
-
-...where the "red" file contained the text "com.example.plugins.RedPlugin" and the
-"blue" file contained the text "com.example.plugins.BluePlugin", you could then get them
-in a map like so:
-
-    Map plugins = finder.mapAvailableImplementations(Plugin.class);
-    Class red = plugins.get("red");
-    Class blue = plugins.get("blue");
-
-Now say you want to do something similar, but the "red" and "blue" files are
-properties files which contain the name of the implementation class and other
-configurable properties for your red and blue plugins.
-
-    ResourceFinder finder = new ResourceFinder("META-INF/services/");
-    Map pluginConfigs = finder.mapAllProperties(Plugin.class.getName());
-    Properties redConfig = pluginConfigs.get("red");
-    Properties blueConfig = pluginConfigs.get("blue");
-
-Object instantiation was never written into any of those libraries because we're big fans
-of xbean-reflect package, which is a real "don't tell me what to do" library for when
-you just want to create a simple object and would like to get real basic
-field/setter/constructor injection without choking down a whole "i control everything"
-framework.
-
-You just:
-
-    ObjectRecipe recpie = new ObjectRecipe("com.example.plugins.RedPlugin");
-    recpie.setProperty("myDateField","2008-04-17"); recpie.setProperty("myIntField","100");
-    recpie.setProperty("myBooleanField","true");
-    recpie.setProperty("myUrlField","http://www.theserverside.com");
-    Plugin red = (Plugin) recpie.create();
-    red.start();
-
-Obviously, the above style to object creation couples really well to the `ResourceFinder` method
-that gives you Properties objects back. You put the class name and config for your plugin in the
-properties files and pass the properties right into the ObjectRecipe and more or less get a
-little do-it-yourself IoC plugin system.
-
-# OpenEJB/TomEE
-
-Here is a grep of some of the calls made to `AnnotationFinder`.  Most of this code is in an OpenEJB class called
-`AnnotationDeployer` whose primary job is to merge the @annotation and <xml> metadata into one tree.
-
-            for (Annotated<Class<?>> clazz : finder.findMetaAnnotatedClasses(LocalClient.class)) {
-            for (Annotated<Class<?>> clazz : finder.findMetaAnnotatedClasses(RemoteClient.class)) {
-        	List<Class<?>> connectorClasses = finder.findAnnotatedClasses(Connector.class);
-        	List<Class<?>> classes = finder.findAnnotatedClasses(ConnectionDefinitions.class);
-        	classes = finder.findAnnotatedClasses(ConnectionDefinition.class);
-        	classes = finder.findAnnotatedClasses(Activation.class);
-        	classes = finder.findAnnotatedClasses(AdministeredObject.class);
-            classes.addAll(finder.findAnnotatedClasses(WebService.class));
-            classes.addAll(finder.findAnnotatedClasses(WebServiceProvider.class));
-            for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(Singleton.class)) {
-            for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(Stateless.class)) {
-            for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(Stateful.class)) {
-            for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(ManagedBean.class)) {
-            for (Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(MessageDriven.class)) {
-            List<Class<?>> appExceptions = finder.findAnnotatedClasses(ApplicationException.class);
-                    List<Class<?>> list = finder.findAnnotatedClasses(annotation);
-                final List<Annotated<Class<?>>> annotatedClasses = sortClasses(annotationFinder.findMetaAnnotatedClasses(Interceptors.class));
-                final List<Annotated<Method>> annotatedMethods = sortMethods(annotationFinder.findMetaAnnotatedMethods(Interceptors.class));
-                for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(ExcludeDefaultInterceptors.class)) {
-                for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(ExcludeClassInterceptors.class))) {
-                            if (annotationFinder.isAnnotationPresent(Path.class) || !annotationFinder.findAnnotatedMethods(Path.class).isEmpty()) {
-            for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(Asynchronous.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(Asynchronous.class)) {
-            for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(RolesAllowed.class)) {
-            for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(PermitAll.class)) {
-            for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(DenyAll.class)) {
-            scheduleMethods.addAll(annotationFinder.findMetaAnnotatedMethods(javax.ejb.Schedules.class));
-            scheduleMethods.addAll(annotationFinder.findMetaAnnotatedMethods(javax.ejb.Schedule.class));
-                for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(PostConstruct.class))) {
-                for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(PreDestroy.class))) {
-                    for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(javax.interceptor.AroundInvoke.class))) {
-                    for (Annotated<Method> method : sortMethods((annotationFinder.findMetaAnnotatedMethods(javax.interceptor.AroundTimeout.class)))) {
-                    List<Annotated<Method>> timeoutMethods = sortMethods(annotationFinder.findMetaAnnotatedMethods(javax.ejb.Timeout.class));
-                    for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(AfterBegin.class))) {
-                    for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(BeforeCompletion.class))) {
-                    for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(AfterCompletion.class))) {
-                    for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(PostActivate.class))) {
-                    for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(PrePassivate.class))) {
-                for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(Init.class))) {
-                List<Annotated<Method>> removeMethods = sortMethods(annotationFinder.findMetaAnnotatedMethods(Remove.class));
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(EJBs.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(EJB.class)) {
-            for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(EJB.class)) {
-            for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(EJB.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(Resources.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(Resource.class)) {
-            for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(Resource.class)) {
-            for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(Resource.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(WebServiceRefs.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(WebServiceRef.class)) {
-            for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(WebServiceRef.class)) {
-            for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(WebServiceRef.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceUnits.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceUnit.class)) {
-            for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(PersistenceUnit.class)) {
-            for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(PersistenceUnit.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceContexts.class)) {
-            for (Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceContext.class)) {
-            for (Annotated<Field> field : annotationFinder.findMetaAnnotatedFields(PersistenceContext.class)) {
-            for (Annotated<Method> method : annotationFinder.findMetaAnnotatedMethods(PersistenceContext.class)) {
-            int ann = annotationFinder.findAnnotatedClasses(handler.getAnnotationClass()).size();
-            ann += annotationFinder.findAnnotatedMethods(handler.getAnnotationClass()).size();
-            List<Annotated<Class<?>>> types = sortClasses(annotationFinder.findMetaAnnotatedClasses(annotationClass));
-            List<Annotated<Method>> methods = annotationFinder.findMetaAnnotatedMethods(annotationClass);
-        List<Class<?>> annotatedClasses = finder.findAnnotatedClasses(Path.class);
-        methods.addAll(finder.findAnnotatedMethods(Path.class));
diff --git a/src/main/jbake/content/dev/xbean-usage-in-openejb.adoc b/src/main/jbake/content/dev/xbean-usage-in-openejb.adoc
new file mode 100644
index 0000000..13637b8
--- /dev/null
+++ b/src/main/jbake/content/dev/xbean-usage-in-openejb.adoc
@@ -0,0 +1,143 @@
+= Xbean usage in OpenEJB
+:jbake-type: page
+:jbake-status: published
+
+== How XBean is used in OpenEJB
+
+Below is an explanation by David Blevins on the usage of xbean in OpenEJB.
+This text was taken from an email conversation.
+To view the full conversation, click http://www.nabble.com/How-is-XBean-used-in-OpenEJB-3--tf2148639.html#a5959172[here]
+
+=== xbean-reflect
+
+xbean-reflect is a beefed up reflection library.
+
+Earlier all pluggable components had an "init(Properties props)" method?
+ Same concept except now we throw the component class and the properties into an "ObjectRecipe" and call create().
+ The recipe will take the props out, convert them to the right data types,  and construct the object using the right constructor and setters.
+
+So our Containers and stuff now use constructors and setters.
+ Same with anything in a  http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=markup[service-jar.xml]  file.
+
+==== Some code refs:
+
+. http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?revision=546308&view=markup[Assembler.java] We also use it to construct Stateful and Stateless session bean instances.
+. http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java?revision=546308&view=markup[StatefulInstanceManager.java]
+. http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?revision=546308&view=markup[StatelessInstanceManager.java]
+
+=== xbean-finder
+
+xbean-finder is the second coolest library ever.
+ It's a beefed up 
+service finder for grabbing stuff in your classpath.
+ We use it at a couple of places.
+
+==== COMMAND LINE TOOL:
+
+The available commands are in properties files in "META-INF/org.openejb.cli/\{name}", where \{name} is the name of the command.
+ See:
+
+. http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/[openejb cli]
+. http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/resources/META-INF/org.openejb.cli/[openejb cli for itests]
+
+Earlier we had the "test" 
+command hardcoded in a script, but the person may have uninstalled 
+the itests?
+ Well now, if you have the itests jar, the "test" command 
+will be available.
+ If you don't have the itests jar, the "test"  
+command won't be available.
+ The "test" command itself is in the 
+itests jar.
+ You can put any command in any jar and it will 
+automatically become available on the command line.
+ Remove the jar 
+and the command is gone.
+
+When someone types "java -jar openejb.jar start" this guy will look 
+for "META-INF/org.openejb.cli/start".
+ If he finds it, he'll create 
+it and execute it.
+ If he doesn't find it, he'll list the available 
+commands by enumerating over all the files he see's in the classpath 
+under the "META-INF/org.openejb.cli/" directory.
+See http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java?revision=546308&view=markup[MainImpl.java]
+
+An extra cool thing is that each command has in it's properties a 
+"description" property.
+ This is localized, so if the VM locale is 
+"pl" it will look for a "description.pl" property and use its value 
+when printing command line help.
+I'd like to give Jeremy Whitlock a big shout-out for doing such a 
+bang up job on this.
+ He and I worked out the idea and white-boarded 
+it in the wiki, then Jeremy went off and coded up the whole thing! 
+It was fantastic.
+
+==== SERVER SERVICES:
+
+We also use the xbean-finder to create our Server Services (aka. 
+protocols).
+ Our ServerService implementations are in properties 
+files under "META-INF/org.openejb.server.ServerService/\{protocolName}.
+See:
+
+. http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.server.ServerService/[OpenEJB Server - ServerService]
+. http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/resources/META-INF/org.apache.openejb.server.ServerService/[OpenEJB ejbd - ServerService]
+. http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-telnet/src/main/resources/META-INF/org.apache.openejb.server.ServerService/[OpenEJB Telnet - ServerService]
+. http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/resources/META-INF/org.apache.openejb.server.ServerService/[OpenEJB HTTP - ServerService]
+
+The very first time a ServerService is constructed, we squirt the properties file into the openejb/conf/ directory so the user can edit it.
+The properties files for ServerServices are very xinet.d like.
+For example, here is the definition of the "admin" server service:
+
+----
+server = org.openejb.server.admin.AdminDaemon
+bind = 127.0.0.1
+port = 4200
+disabled = false
+threads = 1
+only_from = localhost
+----
+
+You can reconfigure the "admin" server service, for example, via the properties file in openejb/conf/admin.properties.
+Or you can do it on the command line as such: in-a-shell
+
+$ ./bin/openejb start \-Dadmin.bind=192.168.42.13 OPENEJB_HOME=/Users/dblevins/work/openejb1/target/openejb-1.1-SNAPSHOT OpenEJB 1.1-SNAPSHOT    build: 20060420-2356 [http://www.openejb.org](http://www.openejb.org) resources 1 OpenEJB ready. \[init\](init\.html) OpenEJB Remote Server    *\* Starting Services \*\*    NAME                 IP              PORT    webadmin             127.0.0.1       4203    httpejbd             127.0.0.1       4204    telnet               127.0.0.1       4202    ejbd                 127.0.0.1       4201    admin                192.168.42.13   4200 \------\- Ready\!+++</in-a-shell>+++
+
+You can override any server service property in the same way.
+Here
+are a bunch more examples:
+
+ 
+Option: -D+++<service>+++.bind=<address>  
+ 
+openejb start \-Dejbd.bind=10.45.67.8  
+ 
+openejb start \-Dejbd.bind=myhost.foo.com  
+ 
+openejb start \-Dtelnet.bind=myhost.foo.com+++</service>+++
+
+ 
+Option: -D+++<service>+++.port=+++<port>+++ 
+ 
+openejb start \-Dejbd.port=8765  
+ 
+ openejb start \-Dhttpejbd.port=8888+++</port>++++++</service>+++
+
+ 
+Option: -D+++<service>+++.only_from=+++<addresses>+++ 
+ 
+ openejb start \-Dadmin.only_from=192.168.1.12  
+ 
+ openejb start \-Dadmin.only_from=192.168.1.12,joe.foo.com,robert+++</addresses>++++++</service>+++
+
+ 
+Option: -D+++<service>+++.threads=+++<max>+++ 
+ 
+ openejb start \-Dejbd.threads=200+++</max>++++++</service>+++
+
+ 
+Option: -D+++<service>+++.disabled=<true/false>  
+ 
+ openejb start \-Dtelnet.disabled=true+++</service>+++
diff --git a/src/main/jbake/content/dev/xbean-usage-in-openejb.md b/src/main/jbake/content/dev/xbean-usage-in-openejb.md
deleted file mode 100644
index 9a0b1aa..0000000
--- a/src/main/jbake/content/dev/xbean-usage-in-openejb.md
+++ /dev/null
@@ -1,149 +0,0 @@
-Title: Xbean usage in OpenEJB
-<a name="XbeanusageinOpenEJB-HowXBeanisusedinOpenEJB"></a>
-# How XBean is used in OpenEJB
-
-Below is an explanation by David Blevins on the usage of xbean in OpenEJB. This text was taken from an email conversation. To view the full conversation, click&nbsp;[here](http://www.nabble.com/How-is-XBean-used-in-OpenEJB-3--tf2148639.html#a5959172)
-
-
-<a name="XbeanusageinOpenEJB-xbean-reflect"></a>
-## xbean-reflect
-
- xbean-reflect is a beefed up reflection library.
-
-Earlier all pluggable components had an "init(Properties props)" method?
-&nbsp;Same concept except now we throw the component class and the
-properties into an "ObjectRecipe" and call create(). &nbsp;The recipe will
-take the props out, convert them to the right data types,  and construct
-the object using the right constructor and setters.
-
-So our Containers and stuff now use constructors and setters. &nbsp;Same with anything in a &nbsp;[service-jar.xml](http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=markup)
- file.
-
-<a name="XbeanusageinOpenEJB-Somecoderefs:"></a>
-#### Some code refs:
-
-1. [Assembler.java](http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?revision=546308&view=markup)
-We also use it to construct Stateful and Stateless session bean instances.
-
-1. [StatefulInstanceManager.java](http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java?revision=546308&view=markup)
-1. [StatelessInstanceManager.java](http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?revision=546308&view=markup)
-
-<a name="XbeanusageinOpenEJB-xbean-finder"></a>
-## xbean-finder
-
-xbean-finder is the second coolest library ever. &nbsp;It's a beefed
-up&nbsp; service finder for grabbing stuff in your classpath. &nbsp;We use
-it at a couple of places.
-
-<a name="XbeanusageinOpenEJB-COMMANDLINETOOL:"></a>
-### COMMAND LINE TOOL:
-
-The available commands are in properties files in
-"META-INF/org.openejb.cli/\{name\}", where \{name\} is the name of the
-command. &nbsp;See:
-1. [openejb cli](http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/)
-1. [openejb cli for itests](http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/resources/META-INF/org.openejb.cli/)
-
-Earlier we had the "test"&nbsp; command hardcoded in a script, but the
-person may have uninstalled&nbsp; the itests? &nbsp;Well now, if you have
-the itests jar, the "test" command&nbsp; will be available. &nbsp;If you
-don't have the itests jar, the "test" &nbsp;
-command won't be available. &nbsp;The "test" command itself is in the&nbsp;
-itests jar. &nbsp;You can put any command in any jar and it will&nbsp;
-automatically become available on the command line. &nbsp;Remove the
-jar&nbsp; and the command is gone.
-
-When someone types "java \-jar openejb.jar start" this guy will look&nbsp;
-for "META-INF/org.openejb.cli/start". &nbsp;If he finds it, he'll
-create&nbsp; it and execute it. &nbsp;If he doesn't find it, he'll list the
-available&nbsp; commands by enumerating over all the files he see's in the
-classpath&nbsp; under the "META-INF/org.openejb.cli/" directory. See [MainImpl.java](http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java?revision=546308&view=markup)
-
-An extra cool thing is that each command has in it's properties a&nbsp;
-"description" property. &nbsp;This is localized, so if the VM locale
-is&nbsp; "pl" it will look for a "description.pl" property and use its
-value&nbsp; when printing command line help.
-I'd like to give Jeremy Whitlock a big shout-out for doing such a&nbsp;
-bang up job on this. &nbsp;He and I worked out the idea and
-white-boarded&nbsp; it in the wiki, then Jeremy went off and coded up the
-whole thing\!&nbsp; It was fantastic.
-
-<a name="XbeanusageinOpenEJB-SERVERSERVICES:"></a>
-### SERVER SERVICES:
-
-We also use the xbean-finder to create our Server Services (aka.&nbsp;
-protocols). &nbsp;Our ServerService implementations are in properties&nbsp;
-files under "META-INF/org.openejb.server.ServerService/\{protocolName\}.
-See:
-1. [OpenEJB Server - ServerService](http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.server.ServerService/)
-1. [OpenEJB ejbd - ServerService](http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/resources/META-INF/org.apache.openejb.server.ServerService/)
-1. [OpenEJB Telnet - ServerService](http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-telnet/src/main/resources/META-INF/org.apache.openejb.server.ServerService/)
-1. [OpenEJB HTTP - ServerService](http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/resources/META-INF/org.apache.openejb.server.ServerService/)
-
-The very first time a ServerService is constructed, we squirt the&nbsp;
-properties file into the openejb/conf/ directory so the user can edit&nbsp;
-it. &nbsp;The properties files for ServerServices are very xinet.d
-like.&nbsp; For example, here is the definition of the "admin" server
-service:
-
-&nbsp; &nbsp; &nbsp;server &nbsp; &nbsp; &nbsp;=
-org.openejb.server.admin.AdminDaemon
-&nbsp; &nbsp; &nbsp;bind &nbsp; &nbsp; &nbsp; &nbsp;= 127.0.0.1
-&nbsp; &nbsp; &nbsp;port &nbsp; &nbsp; &nbsp; &nbsp;= 4200
-&nbsp; &nbsp; &nbsp;disabled &nbsp; &nbsp;= false
-&nbsp; &nbsp; &nbsp;threads &nbsp; &nbsp; = 1
-&nbsp; &nbsp; &nbsp;only_from &nbsp; = localhost
-
-You can reconfigure the "admin" server service, for example, via the&nbsp;
-properties file in openejb/conf/admin.properties. &nbsp;Or you can do
-it&nbsp; on the command line as such:
-
-<in-a-shell>
-$ ./bin/openejb start \-Dadmin.bind=192.168.42.13
-OPENEJB_HOME=/Users/dblevins/work/openejb1/target/openejb-1.1-SNAPSHOT
-OpenEJB 1.1-SNAPSHOT &nbsp; &nbsp;build: 20060420-2356
-[http://www.openejb.org](http://www.openejb.org)
-resources 1
-OpenEJB ready.
-\[init\](init\.html)
- OpenEJB Remote Server
-&nbsp; &nbsp;*\* Starting Services \*\*
-&nbsp; &nbsp;NAME &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-IP &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;PORT
-&nbsp; &nbsp;webadmin &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 127.0.0.1
-&nbsp; &nbsp; &nbsp; 4203
-&nbsp; &nbsp;httpejbd &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 127.0.0.1
-&nbsp; &nbsp; &nbsp; 4204
-&nbsp; &nbsp;telnet &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-127.0.0.1 &nbsp; &nbsp; &nbsp; 4202
-&nbsp; &nbsp;ejbd &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-127.0.0.1 &nbsp; &nbsp; &nbsp; 4201
-&nbsp; &nbsp;admin &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-&nbsp;192.168.42.13 &nbsp; 4200
-\------\-
-Ready\!
-</in-a-shell>
-
-You can override any server service property in the same way.
-&nbsp;Here&nbsp; are a bunch more examples:
-
-&nbsp; Option: \-D<service>.bind=<address>
-&nbsp; &nbsp; openejb start \-Dejbd.bind=10.45.67.8
-&nbsp; &nbsp; openejb start \-Dejbd.bind=myhost.foo.com
-&nbsp; &nbsp; openejb start \-Dtelnet.bind=myhost.foo.com
-
-&nbsp; Option: \-D<service>.port=<port>
-&nbsp; &nbsp; openejb start \-Dejbd.port=8765
-&nbsp; &nbsp; &nbsp;openejb start \-Dhttpejbd.port=8888
-
-&nbsp; Option: \-D<service>.only_from=<addresses>
-&nbsp; &nbsp; &nbsp;openejb start \-Dadmin.only_from=192.168.1.12
-&nbsp; &nbsp; &nbsp;openejb start
-\-Dadmin.only_from=192.168.1.12,joe.foo.com,robert
-
-&nbsp; Option: \-D<service>.threads=<max>
-&nbsp; &nbsp; &nbsp;openejb start \-Dejbd.threads=200
-
-&nbsp; Option: \-D<service>.disabled=<true/false>
-&nbsp; &nbsp; &nbsp;openejb start \-Dtelnet.disabled=true
-
diff --git a/src/main/jbake/content/docs.adoc b/src/main/jbake/content/docs.adoc
index 3c61c32..14f6ce9 100644
--- a/src/main/jbake/content/docs.adoc
+++ b/src/main/jbake/content/docs.adoc
@@ -2,25 +2,26 @@
 :jbake-date: 2016-03-16
 :jbake-type: page
 :jbake-status: published
-:jbake-tomeepdf:
 
-=== Administration
-- link:admin/configuration/index.html[Server Configuration]
-- link:admin/file-layout.html[Directory Structure]
-- link:admin/cluster/index.html[Clustering and High Availability (HA)]
+NOTE: TODO: This page should be generated or replaced by the contents of the jbake docs.html (generated by Docs.java)
 
-=== Developers
-- link:developer/ide/index.html[IDEs - Eclipse, Intellij Idea and Netbeans]
-- link:developer/testing/index.html[Unit Testing - Arquillian, OpenEJB JUnit, TomEE Embedded and ApplicationComposer]
-- link:developer/tools/index.html[Build Tools and Plugins]
-- link:developer/migration/tomee-1-to-7.html[Migrating From TomEE 1.x to 7.x]
-- link:developer/json/index.html[TomEE and Apache Johnzon - JAX-RS JSON Provider]
-- link:developer/configuration/cxf.html[Apache CXF Configuration - JAX-RS (RESTful Services) and JAX-WS (Web Services)]
-- link:developer/classloading/index.html[Understanding the TomEE ClassLoader]
+== Administration
+* xref:{tomee-latest-vc}::admin/configuration/index.adoc[Server Configuration]
+* xref:{tomee-latest-vc}::admin/file-layout.adoc[Directory Structure]
+* xref:{tomee-latest-vc}::admin/cluster/index.adoc[Clustering and High Availability (HA)]
 
-=== Advanced
-- link:advanced/applicationcomposer/index.html[`ApplicationComposer` with JBatch]
-- link:advanced/setup/index.html[How to Setup TomEE in Production]
-- link:advanced/shading/index.html[Fat / Uber Jar Deployment using the Maven Shade Plugin]
-- link:advanced/client/jndi.html[Java Naming and Directory Interface (JNDI)]
-- link:advanced/jms/jms-configuration.html[Why is my ActiveMQ/JMS MDB not scaling as expected?]
\ No newline at end of file
+== Developers
+* xref:{tomee-latest-vc}::developer/ide/index.adoc[IDEs - Eclipse, Intellij Idea and Netbeans]
+* xref:{tomee-latest-vc}::developer/testing/index.adoc[Unit Testing - Arquillian, OpenEJB JUnit, TomEE Embedded and ApplicationComposer]
+* xref:{tomee-latest-vc}::developer/tools/index.adoc[Build Tools and Plugins]
+* xref:{tomee-latest-vc}::developer/migration/tomee-1-to-7.adoc[Migrating From TomEE 1.x to 7.x]
+* xref:{tomee-latest-vc}::developer/json/index.adoc[TomEE and Apache Johnzon - JAX-RS JSON Provider]
+* xref:{tomee-latest-vc}::developer/configuration/cxf.adoc[Apache CXF Configuration - JAX-RS (RESTful Services) and JAX-WS (Web Services)]
+* xref:{tomee-latest-vc}::developer/classloading/index.adoc[Understanding the TomEE ClassLoader]
+
+== Advanced
+* xref:{tomee-latest-vc}::advanced/applicationcomposer/index.adoc[`ApplicationComposer` with JBatch]
+* xref:{tomee-latest-vc}::advanced/setup/index.adoc[How to Setup TomEE in Production]
+* xref:{tomee-latest-vc}::advanced/shading/index.adoc[Fat / Uber Jar Deployment using the Maven Shade Plugin]
+* xref:{tomee-latest-vc}::advanced/client/jndi.adoc[Java Naming and Directory Interface (JNDI)]
+* xref:{tomee-latest-vc}::advanced/jms/jms-configuration.adoc[Why is my ActiveMQ/JMS MDB not scaling as expected?]
diff --git a/src/main/jbake/content/download-archive.adoc b/src/main/jbake/content/download-archive.adoc
index 7faf027..4f53236 100644
--- a/src/main/jbake/content/download-archive.adoc
+++ b/src/main/jbake/content/download-archive.adoc
@@ -2,10 +2,9 @@
 :jbake-date: 2015-04-05
 :jbake-type: page
 :jbake-status: published
-:jbake-tomeepdf:
 :icons: font
 
-- link:download-ng.html[The current versions can be found here]
+- xref:download-ng.adoc[The current versions can be found here]
 
 == Release Integrity
 
@@ -13,11 +12,16 @@
 
 == Archive Links
 
-IMPORTANT: Note: TomEE 9.0.0-M1 is a milestone release, which targets the `jakarta` namespace. Applications using `javax` will not work on this release of TomEE 9. You may encounter issues - feedback on this release is encouraged
+IMPORTANT: Note: TomEE 9.0.0-M are milestone releases, which target the `jakarta` namespace. Applications using `javax` will not work on this release of TomEE 9. You may encounter issues - feedback on this release is encouraged
 and appreciated.
-[.table.table-bordered,options="header"]
+[cols="2,3*^1,2",options="header"]
 |===
 |Name|Version|Date|Size|Signatures & Hashes
+| https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plume.zip[icon:download[]TomEE plume ZIP]|9.0.0-M3|25 Jan 2021|65 MB | https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plume.zip.asc[icon:download[] PGP] https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plume.zip.sha256[icon:download[] SHA256] https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plume.zip.sha512[icon:download[] SHA512]
+| https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plus.zip[icon:download[]TomEE plus ZIP]|9.0.0-M3|25 Jan 2021|58 MB | https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plus.zip.asc[icon:download[] PGP] https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plus.zip.sha256[icon:download[] SHA256] https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plus.zip.sha512[icon:download[] SHA512]
+| https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-webprofile.zip[icon:download[]TomEE webprofile ZIP]|9.0.0-M3|25 Jan 2021|41 MB | https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-webprofile.zip.asc[icon:download[] PGP] https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-webprofile.zip.sha256[icon:download[] SHA256] https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-webprofile.zip.sha512[icon:download[] SHA512]
+| https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-microprofile.zip[icon:download[]TomEE microprofile ZIP]|9.0.0-M3|25 Jan 2021|41 MB | https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-microprofile.zip.asc[icon:download[] PGP] https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-microprofile.zip.sha256[icon:download[] SHA256] https://archive.apache.org/dist/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-microprofile.zip.sha512[icon:download[] SHA512]
+|||||
 | https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-plume.zip[icon:download[]TomEE plume ZIP]|9.0.0-M2|07 Aug 2020|65 MB | https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-plume.zip.asc[icon:download[] PGP] https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-plume.zip.sha256[icon:download[] SHA256] https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-plume.zip.sha512[icon:download[] SHA512]
 | https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-plus.zip[icon:download[]TomEE plus ZIP]|9.0.0-M2|07 Aug 2020|58 MB | https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-plus.zip.asc[icon:download[] PGP] https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-plus.zip.sha256[icon:download[] SHA256] https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-plus.zip.sha512[icon:download[] SHA512]
 | https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-webprofile.zip[icon:download[]TomEE webprofile ZIP]|9.0.0-M2|07 Aug 2020|41 MB | https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-webprofile.zip.asc[icon:download[] PGP] https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-webprofile.zip.sha256[icon:download[] SHA256] https://archive.apache.org/dist/tomee/tomee-9.0.0-M2/apache-tomee-9.0.0-M2-webprofile.zip.sha512[icon:download[] SHA512]
@@ -31,7 +35,8 @@
 
 IMPORTANT: Note: Only the TomEE 1.x WebProfile and JAX-RS distributions are certified.
 IMPORTANT: Note: Please note the 8.0.0-M releases are milestone releases intended for evaluation purposes and should not be used in production.
-[.table.table-bordered,options="header"]
+
+[cols="2,3*^1,2",options="header"]
 |===
 |Name|Version|Date|Size|Signatures & Hashes
 | https://archive.apache.org/dist/tomee/tomee-8.0.5/apache-tomee-8.0.5-plume.tar.gz[icon:download[]TomEE plume TAR.GZ]|8.0.5|24 Nov 2020|65 MB | https://archive.apache.org/dist/tomee/tomee-8.0.5/apache-tomee-8.0.5-plume.tar.gz.asc[icon:download[] PGP] https://archive.apache.org/dist/tomee/tomee-8.0.5/apache-tomee-8.0.5-plume.tar.gz.sha256[icon:download[] SHA256] https://archive.apache.org/dist/tomee/tomee-8.0.5/apache-tomee-8.0.5-plume.tar.gz.sha512[icon:download[] SHA512]
@@ -611,4 +616,4 @@
 | https://repo.maven.apache.org/maven2/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.tar.gz[icon:download[]TomEE webprofile TAR.GZ]|1.0.0|26 Apr 2012|27 MB | https://repo.maven.apache.org/maven2/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.tar.gz.asc[icon:download[] PGP] https://repo.maven.apache.org/maven2/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.tar.gz.sha1[icon:download[] SHA1] https://repo.maven.apache.org/maven2/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.tar.gz.md5[icon:download[] MD5]
 | https://repo.maven.apache.org/maven2/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.zip[icon:download[]TomEE webprofile ZIP]|1.0.0|26 Apr 2012|27 MB | https://repo.maven.apache.org/maven2/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.zip.asc[icon:download[] PGP] https://repo.maven.apache.org/maven2/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.zip.sha1[icon:download[] SHA1] https://repo.maven.apache.org/maven2/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.zip.md5[icon:download[] MD5]
 
-|===
\ No newline at end of file
+|===
diff --git a/src/main/jbake/content/download-ng.adoc b/src/main/jbake/content/download.adoc
similarity index 83%
rename from src/main/jbake/content/download-ng.adoc
rename to src/main/jbake/content/download.adoc
index 4dd8a61..dca6a2e 100755
--- a/src/main/jbake/content/download-ng.adoc
+++ b/src/main/jbake/content/download.adoc
@@ -2,33 +2,45 @@
 :jbake-date: 2015-04-05
 :jbake-type: page
 :jbake-status: published
-:jbake-tomeepdf:
 :icons: font
 
-[.table.table-bordered,options="header"]
-
 == Release Integrity
 
 You **must** link:https://www.apache.org/info/verification.html[verify] the integrity of the downloaded files. We provide OpenPGP signatures  (*.asc files) for every release file. This signature should be matched against link:https://downloads.apache.org/tomee/KEYS[KEYS] file which contains the OpenPGP keys of TomEE's Release Managers. We also provide SHA-512 checksums for every release file. After you download the file, you should calculate a checksum for your download, and make sure it is the same as ours.
 
-== Apache TomEE TCK results
-link:tck-results.html[Apache TomEE TCK Results]
 
-== Download Links
+== [[tomee-9.0]]Apache TomEE 9.0
 
-[.table.table-bordered,options="header"]
+- Jakarta EE 9.1
+- MicroProfile 2.0
+- Java 8 or higher
+- link:9.0.0-M7/release-notes.html[Release Notes]
+- link:9.0.0-M7/plume/webprofile-9.1.html[Jakarta EE 9.1 Web Profile TCK Results for Java 11]
+
+[cols="2,4*^1",options="header"]
 |===
 |Name|Version|Date|Size|Signatures & Hashes
-|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-microprofile.zip[icon:download[] TomEE Microprofile ZIP] |9.0.0-M3|25 Jan. 2021|54 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-microprofile.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-microprofile.zip.sha512[icon:download[] SHA512]
-|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plume.zip[icon:download[] TomEE Plume ZIP] |9.0.0-M3|25 Jan. 2021|66 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plume.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plume.zip.sha512[icon:download[] SHA512]
-|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plus.zip[icon:download[] TomEE Plus ZIP] |9.0.0-M3|25 Jan. 2021|59 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plus.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-plus.zip.sha512[icon:download[] SHA512]
-|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-webprofile.zip[icon:download[] TomEE Webprofile ZIP] |9.0.0-M3|25 Jan. 2021|41 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-webprofile.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M3/apache-tomee-9.0.0-M3-webprofile.zip.sha512[icon:download[] SHA512]
+|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-microprofile.zip[icon:download[] TomEE Microprofile ZIP] |9.0.0-M7|10 May 2021|64 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-microprofile.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-microprofile.zip.sha512[icon:download[] SHA512]
+|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-microprofile.tar.gz[icon:download[] TomEE Microprofile TAR.GZ] |9.0.0-M7|10 May 2021|63 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-microprofile.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-microprofile.tar.gz.sha512[icon:download[] SHA512]
+|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plume.zip[icon:download[] TomEE Plume ZIP] |9.0.0-M7|10 May 2021|76 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plume.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plume.zip.sha512[icon:download[] SHA512]
+|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plume.tar.gz[icon:download[] TomEE Plume TAR.GZ] |9.0.0-M7|10 May 2021|76 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plume.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plume.tar.gz.sha512[icon:download[] SHA512]
+|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plus.zip[icon:download[] TomEE Plus ZIP] |9.0.0-M7|10 May 2021|69 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plus.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plus.zip.sha512[icon:download[] SHA512]
+|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plus.tar.gz[icon:download[] TomEE Plus TAR.GZ] |9.0.0-M7|10 May 2021|68 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plus.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plus.tar.gz.sha512[icon:download[] SHA512]
+|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-webprofile.zip[icon:download[] TomEE Webprofile ZIP] |9.0.0-M7|10 May 2021|53 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-webprofile.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-webprofile.zip.sha512[icon:download[] SHA512]
+|https://www.apache.org/dyn/closer.cgi/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-webprofile.tar.gz[icon:download[] TomEE Webprofile TAR.GZ] |9.0.0-M7|10 May 2021|53 MB |https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-webprofile.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-webprofile.tar.gz.sha512[icon:download[] SHA512]
 |===
 
-IMPORTANT: Note: TomEE 9.0.0-M3 is a milestone release, which targets the `jakarta` namespace. Applications using `javax` will not work on this release of TomEE 9. You may encounter issues - feedback on this release is encouraged
+IMPORTANT: Note: TomEE 9.0.0-M7 is a milestone release, which targets the `jakarta` namespace. Applications using `javax` will not work on this release of TomEE 9. You may encounter issues - feedback on this release is encouraged
 and appreciated.
 
-[.table.table-bordered,options="header"]
+
+== [[tomee-8.0]]Apache TomEE 8.0
+
+- Jakarta EE 8 / Java EE 8
+- MicroProfile 2.0
+- Java 8 or higher
+
+[cols="2,4*^1",options="header"]
 |===
 |Name|Version|Date|Size|Signatures & Hashes
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.6/apache-tomee-8.0.6-microprofile.tar.gz[icon:download[] TomEE Microprofile TAR.GZ] |8.0.6|25 Jan. 2021|59 MB |https://downloads.apache.org/tomee/tomee-8.0.6/apache-tomee-8.0.6-microprofile.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-8.0.6/apache-tomee-8.0.6-microprofile.tar.gz.sha512[icon:download[] SHA512]
@@ -48,9 +60,14 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.6/tomee-webapp-8.0.6.war[icon:download[] TomEE Webapp WAR] |8.0.6|25 Jan. 2021|34 MB |https://downloads.apache.org/tomee/tomee-8.0.6/tomee-webapp-8.0.6.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-8.0.6/tomee-webapp-8.0.6.war.sha512[icon:download[] SHA512]
 |===
 
-IMPORTANT: Note: Only the TomEE 1.x WebProfile and JAX-RS distributions are certified.
 
-[.table.table-bordered,options="header"]
+== [[tomee-7.1]]Apache TomEE 7.1
+
+- Java EE 7
+- MicroProfile 2.0
+- Java 7 or Java 8
+
+[cols="2,4*^1",options="header"]
 |===
 |Name|Version|Date|Size|Signatures & Hashes
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.1.4/apache-tomee-7.1.4-microprofile.tar.gz[icon:download[] TomEE Microprofile TAR.GZ] |7.1.4|25 Sep. 2020|39 MB |https://downloads.apache.org/tomee/tomee-7.1.4/apache-tomee-7.1.4-microprofile.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.1.4/apache-tomee-7.1.4-microprofile.tar.gz.sha512[icon:download[] SHA512]
@@ -68,7 +85,17 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.1.4/tomee-plus-webapp-7.1.4.war[icon:download[] TomEE Plus Webapp WAR] |7.1.4|25 Sep. 2020|45 MB |https://downloads.apache.org/tomee/tomee-7.1.4/tomee-plus-webapp-7.1.4.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.1.4/tomee-plus-webapp-7.1.4.war.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.1.4/tomee-project-7.1.4-source-release.zip[icon:download[] TomEE Project Source Release ZIP] |7.1.4|25 Sep. 2020|13 MB |https://downloads.apache.org/tomee/tomee-7.1.4/tomee-project-7.1.4-source-release.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.1.4/tomee-project-7.1.4-source-release.zip.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.1.4/tomee-webapp-7.1.4.war[icon:download[] TomEE Webapp WAR] |7.1.4|25 Sep. 2020|29 MB |https://downloads.apache.org/tomee/tomee-7.1.4/tomee-webapp-7.1.4.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.1.4/tomee-webapp-7.1.4.war.sha512[icon:download[] SHA512]
-|||||
+|===
+
+
+== [[tomee-7.0]]Apache TomEE 7.0
+
+- Java EE 7
+- Java 7 or Java 8
+
+[cols="2,4*^1",options="header"]
+|===
+|Name|Version|Date|Size|Signatures & Hashes
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.tar.gz[icon:download[] TomEE Plume TAR.GZ] |7.0.9|25 Sep. 2020|60 MB |https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.tar.gz.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.zip[icon:download[] TomEE Plume ZIP] |7.0.9|25 Sep. 2020|60 MB |https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.zip.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/apache-tomee-7.0.9-plus.tar.gz[icon:download[] TomEE Plus TAR.GZ] |7.0.9|25 Sep. 2020|53 MB |https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plus.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plus.tar.gz.sha512[icon:download[] SHA512]
@@ -81,7 +108,18 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/tomee-plus-webapp-7.0.9.war[icon:download[] TomEE Plus Webapp WAR] |7.0.9|25 Sep. 2020|44 MB |https://downloads.apache.org/tomee/tomee-7.0.9/tomee-plus-webapp-7.0.9.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/tomee-plus-webapp-7.0.9.war.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/tomee-project-7.0.9-source-release.zip[icon:download[] TomEE Project Source Release ZIP] |7.0.9|25 Sep. 2020|13 MB |https://downloads.apache.org/tomee/tomee-7.0.9/tomee-project-7.0.9-source-release.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/tomee-project-7.0.9-source-release.zip.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/tomee-webapp-7.0.9.war[icon:download[] TomEE Webapp WAR] |7.0.9|25 Sep. 2020|27 MB |https://downloads.apache.org/tomee/tomee-7.0.9/tomee-webapp-7.0.9.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/tomee-webapp-7.0.9.war.sha512[icon:download[] SHA512]
-|||||
+|===
+
+
+== [[tomee-1.7]]Apache TomEE 1.7
+
+- Java EE 6
+- Java 6, Java 7 or Java 8
+
+
+[cols="2,4*^1",options="header"]
+|===
+|Name|Version|Date|Size|Signatures & Hashes
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.zip[icon:download[] TomEE Jaxrs ZIP] |1.7.5|27 Sep. 2017|33 MB |https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.zip.sha1[icon:download[] SHA1]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.tar.gz[icon:download[] TomEE Jaxrs TAR.GZ] |1.7.5|27 Sep. 2017|32 MB |https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.tar.gz.sha1[icon:download[] SHA1]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-1.7.5/apache-tomee-1.7.5-plume.tar.gz[icon:download[] TomEE Plume TAR.GZ] |1.7.5|27 Sep. 2017|49 MB |https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-plume.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-plume.tar.gz.sha1[icon:download[] SHA1]
@@ -96,4 +134,4 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-1.7.5/tomee-webapp-1.7.5.war[icon:download[] TomEE Webapp WAR] |1.7.5|27 Sep. 2017|21 MB |https://downloads.apache.org/tomee/tomee-1.7.5/tomee-webapp-1.7.5.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-1.7.5/tomee-webapp-1.7.5.war.sha1[icon:download[] SHA1]
 |===
 
-- link:download-archive.html[Older versions can be found here]
+- xref:download-archive.adoc[Older versions can be found here]
diff --git a/src/main/jbake/content/enterprise-tomcat.adoc b/src/main/jbake/content/enterprise-tomcat.adoc
new file mode 100644
index 0000000..4d79b44
--- /dev/null
+++ b/src/main/jbake/content/enterprise-tomcat.adoc
@@ -0,0 +1,7 @@
+= Enterprise Tomcat
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/enterprise-tomcat.md b/src/main/jbake/content/enterprise-tomcat.md
deleted file mode 100644
index 4b617a8..0000000
--- a/src/main/jbake/content/enterprise-tomcat.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Title: Enterprise Tomcat
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
-
-{include:apache-tomee.mdtext}
diff --git a/src/main/jbake/content/evolution-of-ejb.adoc b/src/main/jbake/content/evolution-of-ejb.adoc
new file mode 100644
index 0000000..e7a1650
--- /dev/null
+++ b/src/main/jbake/content/evolution-of-ejb.adoc
@@ -0,0 +1,99 @@
+= Evolution of EJB
+:jbake-type: page
+:jbake-status: published
+:icons: font
+:y: icon:check[role="green"]
+:n: icon:times[role="red"]
+:c: icon:file-text-o[role="blue"]
+
+The following is a view of how EJB has evolved strictly in terms of the other specifications EJB incorporates.
+Despite how people think of EJB, EJB is the union of all of the following APIs.
+
+Commonly misunderstood or oversimplified, it really is the integration of many things into one place that drives EJB.
+
+[cols="8,5*1",options="header"]
+|===
+|
+|1.1
+|2.0
+|2.1
+|3.0
+|3.1
+
+|Java Transaction API (JTA)
+|{y}
+|{y}
+|{y}
+|{y}
+|{y}
+
+|JavaMail API
+|{y}
+|{y}
+|{y}
+|{y}
+|{y}
+
+|Java EE Connector Architecture
+|
+|{y}
+|{y}
+|{y}
+|{y}
+
+|Java Messaging Service (JMS)
+|
+|{y}
+|{y}
+|{y}
+|{y}
+
+|Java Authentication and Authorization Service (JAAS)
+|
+|{y}
+|{y}
+|{y}
+|{y}
+
+|Java Authorization Contract for Containers (JACC)
+|
+|
+|{y}
+|{y}
+|{y}
+
+|Java Persistence API (JPA)
+|
+|
+|
+|{y}
+|{y}
+
+|Java API for XML Web Services (JAX-WS)
+|
+|
+|
+|{y}
+|{y}
+
+|Java API for RESTful Web Services (JAX-RS)
+|
+|
+|
+|
+|{y}
+
+|Java Contexts and Dependency Injection (CDI)
+|
+|
+|
+|
+|{y}
+
+|Bean Validation
+|
+|
+|
+|
+|{y}
+|===
\ No newline at end of file
diff --git a/src/main/jbake/content/evolution-of-ejb.md b/src/main/jbake/content/evolution-of-ejb.md
deleted file mode 100644
index 6505708..0000000
--- a/src/main/jbake/content/evolution-of-ejb.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# Evolution of EJB
-
-The following is a view of how EJB has evolved strictly in terms of the other specifications EJB incorporates.  Despite how people think of EJB, EJB is the union of all of the following APIs.
-
-Commonly misunderstood or oversimplified, it really is the integration of many things into one place that drives EJB.
-
-<table>
-<tr>
-<th></th>
-<th>1.1</th>
-<th>2.0</th>
-<th>2.1</th>
-<th>3.0</th>
-<th>3.1</th>
-</tr>
-
-<td>Java Transaction API (JTA)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>JavaMail API</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java EE Connector Architecture</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Messaging Service (JMS)</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Authentication and Authorization Service (JAAS)</td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Authorization Contract for Containers (JACC)</td>
-<td></td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Persistence API (JPA)</td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<td>Java API for XML Web Services (JAX-WS)</td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java API for RESTful Web Services (JAX-RS)</td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Java Contexts and Dependency Injection (CDI)</td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-</tr>
-
-<tr>
-<td>Bean Validation</td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td>(/)</td>
-</tr>
-
-</table>
diff --git a/src/main/jbake/content/faq.adoc b/src/main/jbake/content/faq.adoc
new file mode 100644
index 0000000..9a4c6db
--- /dev/null
+++ b/src/main/jbake/content/faq.adoc
@@ -0,0 +1,79 @@
+= FAQ
+:jbake-type: page
+:jbake-status: published
+
+== General
+
+
+=== What spec version does OpenEJB support?
+
+OpenEJB supports the Enterprise JavaBeans 3.0 specification and previous versions 2.1, 2.0 and 1.1.
+
+
+=== I don't plan to use EJBs, so why would I embed OpenEJB into Tomcat.
+
+Adding OpenEJB to Tomcat gives servlets several new Java EE 5 capabilities such as JPA, JAX-WS, JMS, J2EE Connectors, transactions, and more as well as enhancing the injection features of Tomcat 6 to now support injection of JavaEE objects like Topics, Queues, EntityManagers, JMS ConnectionFactories, JavaMail Sessions, as well as simpler data types such as Dates, Classes, URI, URL, List, Map, Set, Properties, and more.
+In the case of Tomcat 5.5 which doesn't support dependency injection at all, even more is gained.
+
+
+=== Can I run OpenEJB with a JVM for any vendor?
+
+The Sun, Mac, and IBM vms are regularly tested, however any vm should work.
+
+
+=== Which version of Java is required to run OpenEJB?
+
+Java versions 5 or 6, aka Java 1.5 or 1.6.
+
+
+=== Do I need Apache Maven to work with OpenEJB?
+
+Definitely not.
+Most of the examples include both Maven and Ant build files.
+OpenEJB is usable as a plain library, much like an embedded database like Derby, so it is usable in any application regardless if that application is run via Maven, Ant, Intellij, Eclipse, NetBeans, JUnit, TestNG, etc.
+
+=== Can I start and stop OpenEJB from an IDE? If yes, which IDE is
+
+supported by OpenEJB?
+
+The short answer is yes.
+The basic approach for all embedding scenarios is to 1) add OpenEJB to your classpath, and 2) construct your InitialContext using org.apache.openejb.client.LocalInitialContextFactory.
+The LocalInitialContextFactory will boot OpenEJB in your vm and all ejb applications visible in the classpath will be deployed.
+See xref:embedding.adoc[embedding openejb] for details on how to embed openejb in your application and IDE.
+See xref:application-discovery-via-the-classpath.adoc[Application discovery via the classpath]  for various ways to have your applications discovered.
+
+=== During embedded testing, how can I externalize all my DataSource
+
+configuration?
+
+Create an openejb.xml file in any directory that gets added to your test classpath.
+For maven, something that winds up directly under "target/classes/" or "target/test-classes/" will work just fine.
+Then in your test case do this:
+
+[source,java]
+----
+   protected void setUp() throws Exception {
+       Properties properties = new Properties();
+       properties.setProperty(Context.INITIAL_CONTEXT_FACTORY,  "org.apache.openejb.client.LocalInitialContextFactory");
+
+       URL config = this.getClass().getClassLoader().getResource("openejb.xml");
+       properties.setProperty("openejb.configuration", config.toExternalForm());
+
+       initialContext = new InitialContext(properties);
+   }
+----
+
+The file itself doesn't have to be called "openejb.xml", you could have a few different files like that for different testing scenarios each with a name that describes the basic setup.
+
+
+== Container-Managed Persistence
+
+
+=== What engine does OpenEJB use for CMP?
+
+The CMP engine is written as a layer over JPA with OpenJPA doing the persistence work.
+
+
+=== What is the format for the CMP mapping files?
+
+The standard JPA mapping file and annotations are also used for CMP mappings.
diff --git a/src/main/jbake/content/faq.md b/src/main/jbake/content/faq.md
deleted file mode 100644
index dea9cf5..0000000
--- a/src/main/jbake/content/faq.md
+++ /dev/null
@@ -1,96 +0,0 @@
-Title: FAQ
-<a name="FAQ-&nbsp;General"></a>
-## &nbsp;General
-
-&nbsp;
-
-<a name="FAQ-WhatspecversiondoesOpenEJBsupport?"></a>
-### What spec version does OpenEJB support?
-
-OpenEJB supports the Enterprise JavaBeans 3.0 specification and previous
-versions 2.1, 2.0 and 1.1.
-
-<a name="FAQ-Idon'tplantouseEJBs,sowhywouldIembedOpenEJBintoTomcat."></a>
-###  I don't plan to use EJBs, so why would I embed OpenEJB into Tomcat.
-
-Adding OpenEJB to Tomcat gives servlets several new Java EE 5 capabilities
-such as JPA, JAX-WS, JMS, J2EE Connectors, transactions, and more as well
-as enhancing the injection features of Tomcat 6 to now support injection of
-JavaEE objects like Topics, Queues, EntityManagers, JMS
-ConnectionFactories, JavaMail Sessions, as well as simpler data types such
-as Dates, Classes, URI, URL, List, Map, Set, Properties, and more.  In the
-case of Tomcat 5.5 which doesn't support dependency injection at all, even
-more is gained.
-
-<a name="FAQ-CanIrunOpenEJBwithaJVMforanyvendor?"></a>
-### Can I run OpenEJB with a JVM for any vendor?
-
-The Sun, Mac, and IBM vms are regularly tested, however any vm should work.
-
-<a name="FAQ-WhichversionofJavaisrequiredtorunOpenEJB?"></a>
-### Which version of Java is required to run OpenEJB?
-
-Java versions 5 or 6, aka Java 1.5 or 1.6.
-
-<a name="FAQ-DoIneedApacheMaventoworkwithOpenEJB?"></a>
-### Do I need Apache Maven to work with OpenEJB?
-
-Definitely not. Most of the examples include both Maven and Ant build
-files.	OpenEJB is usable as a plain library, much like an embedded
-database like Derby, so it is usable in any application regardless if that
-application is run via Maven, Ant, Intellij, Eclipse, NetBeans, JUnit,
-TestNG, etc.
-
-### Can I start and stop OpenEJB from an IDE? If yes, which IDE is
-supported by OpenEJB?
-
-The short answer is yes.  The basic approach for all embedding scenarios is
-to 1) add OpenEJB to your classpath, and 2) construct your InitialContext
-using org.apache.openejb.client.LocalInitialContextFactory.  The
-LocalInitialContextFactory will boot OpenEJB in your vm and all ejb
-applications visible in the classpath will be deployed. See
-http://tomee.apache.org/embedding-openejb.html for details on how to
-embed openejb in your application and IDE.  See [Application discovery via the classpath](openejbx30:application-discovery-via-the-classpath.html)
- for various ways to have your applications discovered. 
-
-
-###  During embedded testing, how can I externalize all my DataSource
-configuration? 
-
-Create an openejb.xml file in any directory that gets added to your test
-classpath. For maven, something that winds up directly under
-"target/classes/" or "target/test-classes/" will work just fine.  Then in
-your test case do this:
-
-       protected void setUp() throws Exception {
-           Properties properties = new Properties();
-           properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, 
-"org.apache.openejb.client.LocalInitialContextFactory");
-    
-           URL config =
-this.getClass().getClassLoader().getResource("openejb.xml");
-           properties.setProperty("openejb.configuration",
-config.toExternalForm());
-    
-           initialContext = new InitialContext(properties);
-       }
-
-The file itself doesn't have to be called "openejb.xml", you could have a
-few different files like that for different testing scenarios each with a
-name that describes the basic setup.
-
-<a name="FAQ-Container-ManagedPersistence"></a>
-## Container-Managed Persistence
-
-<a name="FAQ-WhatenginedoesOpenEJBuseforCMP?"></a>
-### What engine does OpenEJB use for CMP?
-
-The CMP engine is written as a layer over JPA with OpenJPA doing the
-persistence work.
-
-<a name="FAQ-WhatistheformatfortheCMPmappingfiles?"></a>
-### What is the format for the CMP mapping files?
-
-The standard JPA mapping file and annotations are also used for CMP
-mappings.
-
diff --git a/src/main/jbake/content/features.adoc b/src/main/jbake/content/features.adoc
new file mode 100644
index 0000000..6268eb7
--- /dev/null
+++ b/src/main/jbake/content/features.adoc
@@ -0,0 +1 @@
+= Features
diff --git a/src/main/jbake/content/features.md b/src/main/jbake/content/features.md
deleted file mode 100644
index 72b8e33..0000000
--- a/src/main/jbake/content/features.md
+++ /dev/null
@@ -1 +0,0 @@
-Title: Features
diff --git a/src/main/jbake/content/geronimo.adoc b/src/main/jbake/content/geronimo.adoc
new file mode 100644
index 0000000..1b2c96b
--- /dev/null
+++ b/src/main/jbake/content/geronimo.adoc
@@ -0,0 +1,7 @@
+= Geronimo OpenEJB is the EJB Container implementation for http://geronimo.apache.org[Apache Geronimo] .  That integration is quite a bit different than what OpenEJB users are familiar with.
+:jbake-type: page
+:jbake-status: published
+
+The best source of documentation on Geronimo and it's usage of OpenEJB is here:
+
+* http://geronimo.apache.org/documentation.html
diff --git a/src/main/jbake/content/geronimo.md b/src/main/jbake/content/geronimo.md
deleted file mode 100644
index e352af6..0000000
--- a/src/main/jbake/content/geronimo.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Title: Geronimo
-OpenEJB is the EJB Container implementation for [Apache Geronimo](http://geronimo.apache.org)
-.  That integration is quite a bit different than what OpenEJB users are
-familiar with.	The best source of documentation on Geronimo and it's usage
-of OpenEJB is here:  
-
- - [http://geronimo.apache.org/documentation.html](http://geronimo.apache.org/documentation.html)
diff --git a/src/main/jbake/content/getting-started-with-eclipse-and-webby.adoc b/src/main/jbake/content/getting-started-with-eclipse-and-webby.adoc
new file mode 100644
index 0000000..3cd0bd8
--- /dev/null
+++ b/src/main/jbake/content/getting-started-with-eclipse-and-webby.adoc
@@ -0,0 +1,41 @@
+= TomEE and Eclipse using Webby
+:jbake-type: page
+:jbake-status: published
+
+If you want to use Eclipse and WTP (the classic way), please read this xref:tomee-and-eclipse.adoc[docs].
+
+If you intends to run a Maven WAR project, you can adopt link:https://github.com/tesla/m2eclipse-webby[m2eclipse-webby], because it will be more efficient. In this case, follow this docs.
+
+== Prerequisite
+Download and install both Apache TomEE (1.7.2 minimum) and Eclipse IDE (not JavaEE version, because Webby doesn't work if link:https://www.eclipse.org/m2e-wtp[m2eclipse-WTP] is present).
+
+=== m2eclipse
+The next thing you need is link:http://www.eclipse.org/m2e[m2eclipse] plugin.
+If you doesn't have it in your eclipse package, install it like another plugin.
+
+=== Webby
+. Then you need to install link:https://github.com/tesla/m2eclipse-webby[m2eclipse-webby]
+. In eclipse, select menu "Help" / "Install new software", and type this URL : https://repository.takari.io/content/sites/m2e.extras/m2eclipse-webby/0.2.2/N/LATEST/
+. Select Web Application Launcher for M2Eclipse / Webby Core
+. Click Finish and continue the classic installation way.
+. Restart eclipse.
+
+== Setting up eclipse project
+. Create new Maven project or import an existing one (only War project are accepted with Webby).
+. Add new Debug configuration (Right click on the project / Debug As / Debug Configuration)
+. Select Launch Type "Webby", right click "New"
+. Browse your project if it not present
+. Type an optionnal context root
+. Select container "tomee1x" and select "Installed" as type (the only way who works right now)
+. Browse your tomEE installation in "Home" section
+. Optionnal : change port and timeout values.
+. Click "Apply", and "Debug" to start TomEE.
+
+== Webby capabilities
+* Webby manage code hot replacement if you don't change method signature and so on... If other case you need to restart it.
+* Webby manage hot jsp replacement too.
+* If you want to see Webby status Click menu "Widows" / "Show View" / "Other" / "Webby" / "Webapps". You can start and stop webby in this panel.
+* If you need to start 2 or more Webby in the same time, you need to change port to at least 3 numbers more. Example : 8080 and 8084 (other value are reserved by Webby automatically).
+* If you have an error "timeout ..." during Webby start, you can change the Webby timeout in debug configurations (Note : this error will not stop Webby, it's just a warning).
+* In opposite to m2eclipse-WTP, Webby will not "publish" all of your project dependencies. It makes just a link to your Maven local repositories. You can see the entire list of dependencies in Webby start console.
+* If you want to "publish" you code in Webby, just start it and it works.
diff --git a/src/main/jbake/content/lightening-demos.adoc b/src/main/jbake/content/lightening-demos.adoc
new file mode 100644
index 0000000..685fd00
--- /dev/null
+++ b/src/main/jbake/content/lightening-demos.adoc
@@ -0,0 +1,75 @@
+= Lightning Demos
+:jbake-type: page
+:jbake-status: published
+:properties-table-layout: cols="3a,2a,5a",options="header"
+
+== Lightning Demos Details
+
+[{properties-table-layout}]
+|===
+|Demo Name
+|Sponsor
+|Links/Comments
+
+|TestCase Injection
+|David Blevins
+|video::g5l14G9RBCM[youtube]
+
+video::16876983[vimeo]
+
+|Simple @WebService
+|David Blevins
+|video::ZcSnhVlOxJc[youtube]
+
+video::16876894[vimeo]
+
+|Simple @Stateless bean
+|David Blevins
+|video::aLx2jta96xU[youtube]
+
+video::16876787[vimeo]
+
+|Simple @Stateful bean
+|David Blevins
+|video::9JqxbfzsWOQ[youtube]
+
+video::16876733[vimeo]
+
+|Simple @MessageDriven bean
+|David Blevins
+|video::HmXFxMDLCJQ[youtube]
+
+video::16876667[vimeo]
+
+|EntityManager injection and usage
+|David Blevins
+|video::s4uiIoAehgQ[youtube]
+
+video::16876564[vimeo]
+
+|DataSource injection and usage
+|David Blevins
+|video::g3lIPlegDJk[youtube]
+
+video::16876492[vimeo]
+
+|Alternate Descriptors
+|David Blevins
+|video::r1lDC40ESug[youtube]
+
+video::16876426[vimeo]
+
+|Getting started with the OpenEJB Eclipse Plugin
+|David Blevins
+|video::7393498[vimeo]
+
+|EJB Unit Testing with Eclipse and OpenEJB
+|David Blevins
+|video::6149008[vimeo]
+
+|ScreenFlow720
+|David Blevins
+|video::16872034[vimeo]
+|===
+
+NOTE: For more details about the idea behind Lightening Demos, please read link:http://markmail.org/message/5jq5xun44kt7tcni.adoc[this]  e-mail thread.
diff --git a/src/main/jbake/content/lightening-demos.md b/src/main/jbake/content/lightening-demos.md
deleted file mode 100644
index 0e9df58..0000000
--- a/src/main/jbake/content/lightening-demos.md
+++ /dev/null
@@ -1,83 +0,0 @@
-Title: Lightening Demos
-
-### Lightening Demos Details
-
-<div >
-<table class="confluenceTable"><tbody>
-<tr>
-<th > Demo Name                                      </th>
-<th > Description </th>
-<th > Sponsor      </th>
-<th > Links/Comments                    </th>
-</tr>
-<tr>
-<td > TestCase Injection                              </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=g5l14G9RBCM">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876983">Vimeo </a> </td>
-</tr>
-<tr>
-<td > Simple @WebService                              </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=ZcSnhVlOxJc">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876894">Vimeo </a> </td>
-</tr>
-<tr>
-<td > Simple @Stateless bean                          </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=aLx2jta96xU">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876787">Vimeo </a> </td>
-</tr>
-<tr>
-<td > Simple @Stateful bean                           </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=9JqxbfzsWOQ">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876733">Vimeo </a> </td>
-</tr>
-<tr>
-<td > Simple @MessageDriven bean                      </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=HmXFxMDLCJQ">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876667">Vimeo </a> </td>
-</tr>
-<tr>
-<td > EntityManager injection and usage               </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=s4uiIoAehgQ">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876564">Vimeo </a> </td>
-</tr>
-<tr>
-<td > DataSource injection and usage                  </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=g3lIPlegDJk">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876492">Vimeo </a> </td>
-</tr>
-<tr>
-<td > Alternate Descriptors                           </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=r1lDC40ESug">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876426">Vimeo </a> </td>
-</tr>
-<tr>
-<td > Getting started with the OpenEJB Eclipse Plugin </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://vimeo.com/7393498">Vimeo </a>  </td>
-</tr>
-<tr>
-<td > EJB Unit Testing with Eclipse and OpenEJB       </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://vimeo.com/6149008">Vimeo </a>  </td>
-</tr>
-<tr>
-<td > ScreenFlow720                                   </td>
-<td >&nbsp;</td>
-<td > David Blevins </td>
-<td > <a rel="nofollow" class="external-link" href="http://vimeo.com/16872034">Vimeo </a> </td>
-</tr>
-</tbody></table>
-</div>
-
-*NOTE: For more details about the idea behind Lightening Demos, please read [this ](-http://markmail.org/message/5jq5xun44kt7tcni.html)
- e-mail thread.*
\ No newline at end of file
diff --git a/src/main/jbake/content/mailing-lists.adoc b/src/main/jbake/content/mailing-lists.adoc
new file mode 100644
index 0000000..d7fb08d
--- /dev/null
+++ b/src/main/jbake/content/mailing-lists.adoc
@@ -0,0 +1,135 @@
+= Mailing Lists
+:jbake-type: page
+:jbake-status: published
+:mailing-list-table-layout: cols="1,1,2,5",options="header"
+:y: icon:check[role="green"]
+:n: icon:times[role="red"]
+
+== User Mailing List
+
+Where the general TomEE community goes to ask questions, make suggestions, chat  with other users and developers, and keep a finger on the pulse of the project.
+
+Medium volume mailing list, dedicated to the  TomEE community.
+
+* link:mailto:users@tomee.apache.org[users@tomee.apache.org]
+* link:mailto:users-subscribe@tomee.apache.org[Subscribe]
+* link:mailto:users-unsubscribe@tomee.apache.org[Unsubscribe]
+
+TomEE Users Online Archives/Forums:
+[{mailing-list-table-layout}]
+|===
+|Search
+|Post
+|Depth
+|Archive URL
+
+|{y}
+|{n}
+|2002
+|http://openejb.markmail.org/search/?q=type:users
+
+|{y}
+|{n}
+|2002
+|http://marc.info/?l=openejb-user
+
+|{n}
+|{n}
+|2006
+|http://mail-archives.apache.org/mod_mbox/TomEE-users/
+
+|{y}
+|{y}
+|2006
+|http://n4.nabble.com/OpenEJB-User-f979441.html
+
+|{y}
+|{n}
+|2007
+|http://www.mail-archive.com/users@tomee.apache.org
+|===
+
+== Developer Mailing List
+
+If you're a developer or contributor on TomEE, this is the place for you.
+Join in on the develpment and planning discussions.
+Get the scoop on the changes that take place in TomEE as our team is hard at work in developing and refining the TomEE container system.
+
+* link:mailto:dev@tomee.apache.org[dev@tomee.apache.org]
+* link:mailto:dev-subscribe@tomee.apache.org[Subscribe]
+* link:mailto:dev-unsubscribe@tomee.apache.org[Unsubscribe]
+
+TomEE Developers Online Archives/Forums:
+
+[{mailing-list-table-layout}]
+|===
+|Search
+|Post
+|Depth
+|Archive URL
+
+|{y}
+|{n}
+|2002
+|http://openejb.markmail.org/search/?q=type:development
+
+|{y}
+|{n}
+|2002
+|http://marc.info/?l=openejb-development
+
+|{n}
+|{n}
+|2006
+|http://mail-archives.apache.org/mod_mbox/tomee-dev/
+
+|{y}
+|{y}
+|2006
+|http://n4.nabble.com/OpenEJB-Dev-f982480.html
+
+|{y}
+|{n}
+|2007
+|http://www.mail-archive.com/dev@tomee.apache.org
+|===
+
+== Commit Mailing List
+
+Keep tabs on all the changes to our svn.
+We have mixed a few of the popular perl scripts for cvs email notification as well as added a few features that are all new.
+This new list provides you with as-it-happens information regarding TomEE development.
+
+* link:mailto:commits@tomee.apache.org[commits@tomee.apache.org]
+* link:mailto:commits-subscribe@tomee.apache.org[Subscribe]
+* link:mailto:commits-unsubscribe@tomee.apache.org[Unsubscribe]
+
+TomEE Commits Online Archives/Forums:
+
+[{mailing-list-table-layout}]
+|===
+|Search
+|Post
+|Depth
+|Archive URL
+
+|{y}
+|{n}
+|2002
+|http://openejb.markmail.org/search/?q=type:checkins
+
+|{y}
+|{n}
+|2004
+|http://marc.info/?l=openejb-cvs
+
+|{n}
+|{n}
+|2006
+|http://mail-archives.apache.org/mod_mbox/TomEE-commits/
+
+|{y}
+|{n}
+|2007
+|http://www.mail-archive.com/commits@tomee.apache.org
+|===
\ No newline at end of file
diff --git a/src/main/jbake/content/mailing-lists.md b/src/main/jbake/content/mailing-lists.md
deleted file mode 100644
index 9b59e9e..0000000
--- a/src/main/jbake/content/mailing-lists.md
+++ /dev/null
@@ -1,74 +0,0 @@
-Title: Mailing Lists
-
-<a name="MailingLists-UserMailingList"></a>
-# User Mailing List
-
-Where the general TomEE community goes to ask questions, make
-suggestions, chat  with other users and developers, and keep a finger on
-the pulse of the project.
-
-Medium volume mailing list, dedicated to the  TomEE community.
-
-* [users@tomee.apache.org](mailto:users@tomee.apache.org)
-* [Subscribe](mailto:users-subscribe@tomee.apache.org)
-* [Unsubscribe](mailto:users-unsubscribe@tomee.apache.org)
-
-TomEE Users Online Archives/Forums:
-<table>
-<tr><th> Search </th><th> Post </th><th> Depth </th><th> Archive URL </th></tr>
-<tr><td> (/) </td><td> (x) </td><td> 2002 </td><td>  http://openejb.markmail.org/search/?q=type:users </td></tr>
-<tr><td> (/) </td><td> (x) </td><td> 2002 </td><td>  http://marc.info/?l=openejb-user </td></tr>
-<tr><td> (x) </td><td> (x) </td><td> 2006 </td><td> 
-http://mail-archives.apache.org/mod_mbox/TomEE-users/ </td></tr>
-<tr><td> (/) </td><td> (/) </td><td> 2006 </td><td>  http://n4.nabble.com/OpenEJB-User-f979441.html </td></tr>
-<tr><td> (/) </td><td> (x) </td><td> 2007 </td><td>  http://www.mail-archive.com/users@tomee.apache.org
-</td></tr>
-</table>
-
-<a name="MailingLists-DeveloperMailingList"></a>
-# Developer Mailing List
-
-If you're a developer or contributor on TomEE, this is the place for you.
-Join in on the develpment and planning discussions. Get the scoop on the
-changes that take place in TomEE as our team is hard at work in
-developing and refining the TomEE container system.
-
-* [dev@tomee.apache.org](mailto:dev@tomee.apache.org)
-* [Subscribe](mailto:dev-subscribe@tomee.apache.org)
-* [Unsubscribe](mailto:dev-unsubscribe@tomee.apache.org)
-
-TomEE Developers Online Archives/Forums:
-<table>
-<tr><th> Search </th><th> Post </th><th> Depth </th><th> Archive URL </th></tr>
-<tr><td> (/) </td><td> (x) </td><td> 2002 </td><td> 
-http://openejb.markmail.org/search/?q=type:development </td></tr>
-<tr><td> (/) </td><td> (x) </td><td> 2002 </td><td>  http://marc.info/?l=openejb-development </td></tr>
-<tr><td> (x) </td><td> (x) </td><td> 2006 </td><td>  http://mail-archives.apache.org/mod_mbox/tomee-dev/
-</td></tr>
-<tr><td> (/) </td><td> (/) </td><td> 2006 </td><td>  http://n4.nabble.com/OpenEJB-Dev-f982480.html </td></tr>
-<tr><td> (/) </td><td> (x) </td><td> 2007 </td><td>  http://www.mail-archive.com/dev@tomee.apache.org </td></tr>
-</table>
-
-<a name="MailingLists-CommitMailingList"></a>
-# Commit Mailing List
-
-Keep tabs on all the changes to our svn. We have mixed a few of the popular
-perl scripts for cvs email notification as well as added a few features
-that are all new. This new list provides you with as-it-happens information
-regarding TomEE development.
-
-* [commits@tomee.apache.org](mailto:commits@tomee.apache.org)
-* [Subscribe](mailto:commits-subscribe@tomee.apache.org)
-* [Unsubscribe](mailto:commits-unsubscribe@tomee.apache.org)
-
-TomEE Commits Online Archives/Forums:
-<table>
-<tr><th> Search </th><th> Post </th><th> Depth </th><th> Archive URL </th></tr>
-<tr><td> (/) </td><td> (x) </td><td> 2002 </td><td>  http://openejb.markmail.org/search/?q=type:checkins </td></tr>
-<tr><td> (/) </td><td> (x) </td><td> 2004 </td><td>  http://marc.info/?l=openejb-cvs </td></tr>
-<tr><td> (x) </td><td> (x) </td><td> 2006 </td><td> 
-http://mail-archives.apache.org/mod_mbox/TomEE-commits/ </td></tr>
-<tr><td> (/) </td><td> (x) </td><td> 2007 </td><td> 
-http://www.mail-archive.com/commits@tomee.apache.org </td></tr>
-</table>
-
diff --git a/src/main/jbake/content/management-and-voting.adoc b/src/main/jbake/content/management-and-voting.adoc
new file mode 100644
index 0000000..1c18e3f
--- /dev/null
+++ b/src/main/jbake/content/management-and-voting.adoc
@@ -0,0 +1,62 @@
+=  Management and Voting
+:jbake-type: page
+:jbake-status: published
+
+==  Basic info
+
+Apache has a few roles that relate to all Apache projects:
+
+* Contributors http://www.apache.org/dev/contributors.html
+* Committers http://www.apache.org/dev/committers.html
+* PMC Members http://www.apache.org/dev/pmc.html
+
+Despite there being various roles, we try extremely hard to keep the project flat.
+All feedback is welcome, all people matter.
+Everyone should feel very encouraged to participate regardless if they are new or old to the project.
+If you are new and want to participate, please speak up, we'll always be happy to hear from you.
+
+If anything there is a reverse hierarchy that is not unlike traffic laws;
+pedestrians (users) always have the right of way, bikes (contributors) yield to pedestrians, automobiles (committers) yield to bikes and pedestrians.
+Depending on what you're driving you have a greater responsibility to those around you.
+Be careful not to run anyone over.
+
+==  PMC
+
+We don't focus on the PMC in this project so many may not have a clear concept of it.
+Every project at Apache has a PMC which at minimum represents Apache from a legal perspective.
+The people on it are expected to provide legal oversight, making sure that the legal entity that is Apache has awareness enough to legally protect the code that leaves it's doors, the users that use it, and the people who create it.
+This means making sure any contributions going into the project are clean and can be legally projected and making sure any binaries going out meet the legal requirements so they as well can be legally protected.
+It's a lot of watching all commits, keeping an eye on doc contributions, ensuring CLAs are on file for anything of substantial size, screening release binaries and source for headers, license files, making sure any binaries being widely distributed have been voted on, etc., etc.
+If you are on the PMC and you vote on a release it means _you_ have done all these things to the best of your ability.
+If you have not, you either should not be on the PMC or should not vote +1.
+
+Being on the PMC is a service, not an achievement.
+Therefore if someone is added to the PMC you should not say "congratulations", but simply "thank you."  It does not mean anything more than they have the time to help us function legally.
+If someone is perpetually too busy to provide legal oversight and steps down or goes emeritus, it does not mean they are leaving, just that they are too busy for the extra legal responsibility.
+
+Some projects go beyond that and use the PMC as the decision makers and leaders of the project.
+We do not.
+We make all our decisions on the dev list.
+We don't even focus on who is a committer and who is not, which is a major factor of our family-like community and general "everyone is welcome and matters" spirit.
+If someone doesn't feel like their input matters till they are a committer, or any other status, we've done something wrong.
+Fortunately, this is one of our strongest attributes and part of the magic that is this community.
+
+==  FAQ
+
+===  Q. Whose votes count?
+
+Apache requires a minimum of three +1 PMC votes which have legal significance to Apache as a corporation.
+That said, all votes from the community are significant to the project and decision making and any -1 is cause for pause and discussion.
+We frequently encourage and welcome votes from anyone in the community regardless of status.
+
+===  Q. Voting on people: Is it hard to vote -1 in public / Can someone get their feelings hurt ?
+
+Yes and yes.
+Voting in public requires greater care and sensitivity on behalf of everyone;
+the vote proposer, the voters, and the votee.
+Prior to voting the proposer should create several opportunities for feedback, hopefully positive and constructive.
+Community members with concerns should get involved early and actively mentor potential committers, taking opportunities for feedback as queues to get involved, encourage, and work through areas where they see said person needs more help.
+The contributor should actively solicit and welcome all help and feedback and encouragement and feel welcome to give it in return.
+Do not rush;
+all parties (proposer, voters, and votee) have work to do in grooming contributors, etc., and that work takes time.
+Votes that result in one or more -1s should not be seen as a failure of any one individual and instead be seen as an opportunity for all parties (proposer, voters, and votee) to make improvements, be more active, and give the process more time.
diff --git a/src/main/jbake/content/management-and-voting.md b/src/main/jbake/content/management-and-voting.md
deleted file mode 100644
index 26d043c..0000000
--- a/src/main/jbake/content/management-and-voting.md
+++ /dev/null
@@ -1,86 +0,0 @@
-Title: Management and Voting
-<a name="ManagementandVoting-Basicinfo"></a>
-# Basic info
-
-Apache has a few roles that relate to all Apache projects:
-
- - Contributors [http://www.apache.org/dev/contributors.html](http://www.apache.org/dev/contributors.html)
- - Committers [http://www.apache.org/dev/committers.html](http://www.apache.org/dev/committers.html)
- - PMC Members [http://www.apache.org/dev/pmc.html](http://www.apache.org/dev/pmc.html)
-
-Despite there being various roles, we try extremely hard to keep the
-project flat.  All feedback is welcome, all people matter.  Everyone should
-feel very encouraged to participate regardless if they are new or old to
-the project.  If you are new and want to participate, please speak up,
-we'll always be happy to hear from you.
-
-If anything there is a reverse hierarchy that is not unlike traffic laws;
-pedestrians (users) always have the right of way, bikes (contributors)
-yield to pedestrians, automobiles (committers) yield to bikes and
-pedestrians.  Depending on what you're driving you have a greater
-responsibility to those around you.  Be careful not to run anyone over.
-
-<a name="ManagementandVoting-PMC"></a>
-# PMC
-
-We don't focus on the PMC in this project so many may not have a clear
-concept of it.	Every project at Apache has a PMC which at minimum
-represents Apache from a legal perspective.  The people on it are expected
-to provide legal oversight, making sure that the legal entity that is
-Apache has awareness enough to legally protect the code that leaves it's
-doors, the users that use it, and the people who create it.  This means
-making sure any contributions going into the project are clean and can be
-legally projected and making sure any binaries going out meet the legal
-requirements so they as well can be legally protected.	It's a lot of
-watching all commits, keeping an eye on doc contributions, ensuring CLAs
-are on file for anything of substantial size, screening release binaries
-and source for headers, license files, making sure any binaries being
-widely distributed have been voted on, etc., etc.  If you are on the PMC
-and you vote on a release it means *you* have done all these things to the
-best of your ability.  If you have not, you either should not be on the PMC
-or should not vote +1.
-
-Being on the PMC is a service, not an achievement.  Therefore if someone is
-added to the PMC you should not say "congratulations", but simply "thank
-you."  It does not mean anything more than they have the time to help us
-function legally.  If someone is perpetually too busy to provide legal
-oversight and steps down or goes emeritus, it does not mean they are
-leaving, just that they are too busy for the extra legal responsibility.
-
-Some projects go beyond that and use the PMC as the decision makers and
-leaders of the project.  We do not.  We make all our decisions on the dev
-list.  We don't even focus on who is a committer and who is not, which is a
-major factor of our family-like community and general "everyone is welcome
-and matters" spirit.  If someone doesn't feel like their input matters till
-they are a committer, or any other status, we've done something wrong. 
-Fortunately, this is one of our strongest attributes and part of the magic
-that is this community.
-
-<a name="ManagementandVoting-FAQ"></a>
-# FAQ
-
-<a name="ManagementandVoting-Q.Whosevotescount?"></a>
-## Q. Whose votes count?
-
-Apache requires a minimum of three +1 PMC votes which have legal
-significance to Apache as a corporation.  That said, all votes from the
-community are significant to the project and decision making and any -1 is
-cause for pause and discussion.  We frequently encourage and welcome votes
-from anyone in the community regardless of status.
-
-## Q. Voting on people: Is it hard to vote -1 in public / Can someone get their feelings hurt ?
-
-Yes and yes.  Voting in public requires greater care and sensitivity on
-behalf of everyone; the vote proposer, the voters, and the votee.  Prior to
-voting the proposer should create several opportunities for feedback,
-hopefully positive and constructive.  Community members with concerns
-should get involved early and actively mentor potential committers, taking
-opportunities for feedback as queues to get involved, encourage, and work
-through areas where they see said person needs more help.  The contributor
-should actively solicit and welcome all help and feedback and encouragement
-and feel welcome to give it in return.	Do not rush; all parties (proposer,
-voters, and votee) have work to do in grooming contributors, etc., and that
-work takes time.  Votes that result in one or more -1s should not be seen
-as a failure of any one individual and instead be seen as an opportunity
-for all parties (proposer, voters, and votee) to make improvements, be more
-active, and give the process more time.
diff --git a/src/main/jbake/content/powered-by.adoc b/src/main/jbake/content/powered-by.adoc
new file mode 100644
index 0000000..74050ab
--- /dev/null
+++ b/src/main/jbake/content/powered-by.adoc
@@ -0,0 +1,24 @@
+= Powered By
+:jbake-type: page
+:jbake-status: published
+
+This page is a list of some, in all likelihood a very small fraction actually, of the sites out there that use Apache TomEE in production.
+For security and other policy-related reasons, many organizations choose not to disclose the server they use.
+
+Anyone can and is encouraged to add to this page: please add your site, application, or system as you see fit.
+
+Don't worry if you don't think it fits here or into any particular category.
+We would like to see your application listed no matter how big, how small, or how miscategorized.
+
+Please note that all the corporate logos and names used below are trademarked by their respective organizations.
+These organizations are not affiliated with this web site or with The Apache Software Foundation, and make no claims regarding The Foundation or its products.
+
+== Sites
+
+* http://ilikeplaces.com/[iLikePlaces]
+
+== Software
+
+== Services
+
+* http://metawerx.net[Metawerx] - offers Apache TomEE hosting and provides detailed statistics and support services.
diff --git a/src/main/jbake/content/powered-by.md b/src/main/jbake/content/powered-by.md
deleted file mode 100644
index 82221e0..0000000
--- a/src/main/jbake/content/powered-by.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Title: Powered By
-
-This page is a list of some, in all likelihood a very small fraction actually, of the sites out there that use Apache TomEE in production. For security and other policy-related reasons, many organizations choose not to disclose the server they use.
-
-Anyone can and is encouraged to add to this page: please add your site, application, or system as you see fit.
-
-Don't worry if you don't think it fits here or into any particular category. We would like to see your application listed no matter how big, how small, or how miscategorized.
-
-Please note that all the corporate logos and names used below are trademarked by their respective organizations. These organizations are not affiliated with this web site or with The Apache Software Foundation, and make no claims regarding The Foundation or its products.
-
-# Sites
-
-- [iLikePlaces](http://ilikeplaces.com/)
-
-# Software
-
-
-# Services
-
- - [Metawerx](http://metawerx.net) - offers Apache TomEE hosting and provides detailed statistics and support services.
diff --git a/src/main/jbake/content/privacy-policy.adoc b/src/main/jbake/content/privacy-policy.adoc
new file mode 100644
index 0000000..d7c992f
--- /dev/null
+++ b/src/main/jbake/content/privacy-policy.adoc
@@ -0,0 +1,19 @@
+= Privacy Policy Information about your use of this website is collected using server access logs and a tracking cookie.
+:jbake-type: page
+:jbake-status: published
+
+The collected information consists of the following:
+
+. The IP address from which you access the website;
+. The type of browser and operating system you use to access our site;
+. The date and time you access our site;
+. The pages you visit;
+and
+. The addresses of pages from where you followed a link to our site.
+
+Part of this information is gathered using a tracking cookie set by the http://www.google.com/analytics/[Google Analytics]  service and handled by Google as described in their [privacy policy|http://www.google.com/privacy.html] . See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.
+
+We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used.
+We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.
+
+By using this website, you consent to the collection of this data in the manner and for the purpose described above.
diff --git a/src/main/jbake/content/privacy-policy.md b/src/main/jbake/content/privacy-policy.md
deleted file mode 100644
index 2fb5b2e..0000000
--- a/src/main/jbake/content/privacy-policy.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Title: Privacy Policy
-Information about your use of this website is collected using server access
-logs and a tracking cookie. The collected information consists of the
-following:
-
-1. The IP address from which you access the website;
-1. The type of browser and operating system you use to access our site;
-1. The date and time you access our site;
-1. The pages you visit; and
-1. The addresses of pages from where you followed a link to our site.
-
-Part of this information is gathered using a tracking cookie set by the [Google Analytics](http://www.google.com/analytics/)
- service and handled by Google as described in their [privacy policy|http://www.google.com/privacy.html]
-. See your browser documentation for instructions on how to disable the
-cookie if you prefer not to share this data with Google.
-
-We use the gathered information to help us make our site more useful to
-visitors and to better understand how and when our site is used. We do not
-track or collect personally identifiable information or associate gathered
-data with any personally identifying information from other sources.
-
-By using this website, you consent to the collection of this data in the
-manner and for the purpose described above.
diff --git a/src/main/jbake/content/security/security.adoc b/src/main/jbake/content/security/security.adoc
index bf333b8..c1c7b9b 100755
--- a/src/main/jbake/content/security/security.adoc
+++ b/src/main/jbake/content/security/security.adoc
@@ -2,9 +2,9 @@
 :jbake-date: 2016-03-16
 :jbake-type: page
 :jbake-status: published
-:jbake-tomeepdf:
+//:page-aliases: security/index.adoc
 
-=== Security updates
+== Security updates
 
 Please note that, except in rare circumstances, binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a particular vulnerability you should upgrade to an Apache TomEE version where that vulnerability has been fixed.
 
@@ -25,13 +25,13 @@
 - obtaining further information on a published vulnerability
 - availability of patches and/or new releases
 
-should be addressed to the link:support.html[users mailing list].
+should be addressed to the xref:support.adoc[users mailing list].
 
 The private security mailing address is: **security (at) apache (dot) org**
 
 Note that all networked servers are subject to denial of service attacks, and we cannot promise magic workarounds to generic problems (such as a client streaming lots of data to your server, or re-requesting the same URL repeatedly). In general our philosophy is to avoid any attacks which can cause the server to consume resources in a non-linear relationship to the size of inputs.
 
-=== Third-party projects
+== Third-party projects
 
 Apache TomEE is built with the following components. Please see the security advisories information for each component for more information on the security vulnerabilities and issues that may affect that component.
 
@@ -44,7 +44,7 @@
 
 By default, any regular TomEE releases uses the latest sub-project releases, so that we can follow all security fixes as much as possible.
 
-=== Apache TomEE versioning details
+== Apache TomEE versioning details
 
 As security is a key concern in many companies, TomEE team also considers delivering specific security fixes for those external projects being fixed. For instance, if Tomcat fixes a security issue in Tomcat x.y.z, used in TomEE a.b.c, we will consider packaging a new security update release using the new Tomcat release.
 
@@ -56,17 +56,17 @@
 
 Optionally we can concatenate a security update to the version if TomEE source base if not impacted but only a dependency. Note this didn't happen yet.
 
-=== Additional information
+== Additional information
 
-==== Secunia
+=== Secunia
 
 Secunia is an international IT security company specialising in vulnerability management based in Copenhagen, Denmark.
 
 There is an Apache Software Foundation vendor declared, so you can follow all vulnerabilities related to Apache products. Of course, an Apache TomEE product is also available, so you can search for know advisories.
 
-=== Links
+== Links
 
-- http://apache.org/security/
-- http://apache.org/security/projects.html
-- http://apache.org/security/committers.html
-- http://cve.mitre.org/[Common Vulnerabilities and Exposures database]
+- https://apache.org/security/
+- https://apache.org/security/projects.html
+- https://apache.org/security/committers.html
+- https://cve.mitre.org/[Common Vulnerabilities and Exposures database]
diff --git a/src/main/jbake/content/security/support.adoc b/src/main/jbake/content/security/support.adoc
index b337632..45016ef 100755
--- a/src/main/jbake/content/security/support.adoc
+++ b/src/main/jbake/content/security/support.adoc
@@ -2,31 +2,32 @@
 :jbake-date: 2016-03-16
 :jbake-type: page
 :jbake-status: published
-:jbake-tomeepdf:
 
 
 Support for Apache TomEE is given freely by the community.
 Please be aware when asking questions that the Apache Software Foundation does not have paid developers or dedicated support staff.
 All community support comes from volunteers on a volunteer basis.
-Joining the link:../community/index.html[Community] as a volunteer and helping your fellow users is highly encouraged!
+Joining the xref:../community/index.adoc[Community] as a volunteer and helping your fellow users is highly encouraged!
 
-=== Mailing Lists
+== Mailing Lists
 
-mailto:users@tomee.apache.org[User Mailing List] (mailto:users-subscribe@tomee.apache.org[Subscribe now] | mailto:users-unsubscribe@tomee.apache.org[Unsubscribe] | http://www.mail-archive.com/users@tomee.apache.org[Archive]): for all your questions or to share the issues you can meet
-
-mailto:dev@tomee.apache.org[Dev Mailing List] (mailto:dev-subscribe@tomee.apache.org[Subscribe now] | mailto:dev-unsubscribe@tomee.apache.org[Unsubscribe] | http://www.mail-archive.com/dev@tomee.apache.org[Archive]): to speak about the project and developments
-
-mailto:commits@tomee.apache.org[Commits Mailing List] (mailto:commits-subscribe@tomee.apache.org[Subscribe now] | mailto:commits-unsubscribe@tomee.apache.org[Unsubscribe] | http://www.mail-archive.com/commits@tomee.apache.org[Archives]): receive commits by mail
+- mailto:users@tomee.apache.org[User Mailing List] (mailto:users-subscribe@tomee.apache.org[Subscribe now] | mailto:users-unsubscribe@tomee.apache.org[Unsubscribe]): for all your questions or to share the issues you can meet
+- mailto:dev@tomee.apache.org[Dev Mailing List] (mailto:dev-subscribe@tomee.apache.org[Subscribe now] | mailto:dev-unsubscribe@tomee.apache.org[Unsubscribe]): to speak about the project and developments
+- mailto:commits@tomee.apache.org[Commits Mailing List] (mailto:commits-subscribe@tomee.apache.org[Subscribe now] | mailto:commits-unsubscribe@tomee.apache.org[Unsubscribe]): receive commits by mail
 
 
-=== IRC
+== IRC
 
 http://webchat.freenode.net/?channels=openejb[openejb @ freenode] is the channel most of us use.
 
-=== Bugtracker/JIRA
+== Forums
+
+Our forum (mailing lists archives) can be accessed through http://tomee-openejb.979440.n4.nabble.com/[Nabble].
+
+== Bugtracker/JIRA
 
 If you encounter a bug or want to submit a patch just go on our https://issues.apache.org/jira/browse/TOMEE[JIRA].
 
-=== Commercial Support
+== Commercial Support
 
-If you need advanced support with SLA please have a look to our link:../community/commercial.html[Commercial] page.
+If you need advanced support with SLA please have a look to our xref:community/commercial.adoc[Commercial] page.
\ No newline at end of file
diff --git a/src/main/jbake/content/security/tomee.adoc b/src/main/jbake/content/security/tomee.adoc
new file mode 100644
index 0000000..6c04558
--- /dev/null
+++ b/src/main/jbake/content/security/tomee.adoc
@@ -0,0 +1,64 @@
+= Apache TomEE Security Vulnerabilities
+:jbake-type: page
+:jbake-status: published
+
+This page lists all security vulnerabilities fixed in maintenance releases or interim builds of Apache TomEE 1.x.
+Each vulnerability is given a security impact rating by either the Apache TomEE team or by the dependent project supplying the fix - please note that this rating is not uniform and will vary from project to project.
+We also list the versions of Apache TomEE the flaw is known to affect, and where a flaw has not been verified list the version with a question mark.
+
+NOTE: Vulnerabilities that are not TomEE vulnerabilities but have either been incorrectly reported against TomEE or where TomEE provides a workaround are listed bellow in the section "Not a vulnerability".
+
+Please note that binary patches are never provided.
+If you need to apply a source code patch, use the building instructions for the Apache TomEE version that you are using.
+For TomEE 1.x those are xref:/dev/building-from-source.adoc[Building TomEE from source].
+
+If you need help on building or configuring TomEE or other help on following the instructions to mitigate the known vulnerabilities listed here, please send your questions to the public xref:../support.adoc[Users mailing list]
+
+If you have encountered an unlisted security vulnerability or other unexpected behaviour that has security impact, or if the descriptions here are incomplete, please report them privately to the http://www.apache.org/security[Apache Security Team].
+Thank you.
+
+== Fixed in Apache TomEE 7.0.1
+
+* http://mail-archives.us.apache.org/mod_mbox/www-announce/201606.mbox/%3C45A20804-ABFF-4FED-A297-69AC95AB9A3F@apache.org%3E[CVE-2016-3092] Apache Tomcat Denial of Service
+
+== Fixed in Apache TomEE 7.0.0-M3 and 1.7.4
+
+TomEE was subject until versions 1.7.3 and 7.0.0-M1 included to the 0-day vulnerability.
+Note that even if fixed in 7.0.0-M2 we recommand you to upgrade to the 7.0.0-M3 which includes a better fix for that (better defaults).
+
+This issue only affects you if you rely on EJBd protocol (proprietary remote EJB protocol).
+This one one is not activated by default on the 7.x series but it was on the 1.x ones.
+
+The related CVE numbers are:
+
+* http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-0779[CVE-2016-0779]: The EJBd protocol provided by TomEE can exploit the 0-day vulnerability.
+* http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8581[CVE-2015-8581]: The EjbObjectInputStream class in Apache TomEE allows remote attackers to execute arbitrary commands via a serialized Java stream.
+
+This has been fixed in commit 58cdbbef9c77ab2b44870f9d606593b49cde76d9.
+
+Check xref:/properties-listing.adoc[properties configuration] and xref:/ejbd-transport.adoc[Ejbd transport] for more details (tomee.serialization.class.* and tomee.remote.support).
+
+=== Credit
+
+We would like to thank cpnrodzc7 who discovered it working with HP's Zero Day Initiative
+
+== Fixed in Third-party
+
+Covered by http://tomee.apache.org/downloads.html[Apache TomEE 1.6.0.2]
+
+* http://cxf.apache.org/security-advisories.data/CVE-2014-0109.txt.asc?version=1&modificationDate=1398873370740&api=v2[CVE-2014-0109]: HTML content posted to SOAP endpoint could cause OOM errors
+* http://cxf.apache.org/security-advisories.data/CVE-2014-0110.txt.asc?version=1&modificationDate=1398873378628&api=v2[CVE-2014-0110]: Large invalid content could cause temporary space to fill
+* http://cxf.apache.org/security-advisories.data/CVE-2014-0034.txt.asc?version=1&modificationDate=1398873385252&api=v2[CVE-2014-0034]: The SecurityTokenService accepts certain invalid SAML Tokens as valid
+* http://cxf.apache.org/security-advisories.data/CVE-2014-0035.txt.asc?version=1&modificationDate=1398873391788&api=v2[CVE-2014-0035]: UsernameTokens are sent in plaintext with a Symmetric EncryptBeforeSigning policy
+
+Covered by http://tomee.apache.org/downloads.html[Apache TomEE 1.6.0.1]
+
+* Fixed in Tomcat 7.0.52 _Important: Denial of Service_ http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0050[CVE-2014-0050]
+
+Covered by http://tomee.apache.org/downloads.html[Apache TomEE 1.6.0]
+
+* http://cxf.apache.org/security-advisories.data/CVE-2013-2160.txt.asc?version=1&modificationDate=1372324301000&api=v2[CVE-2013-2160] - Denial of Service Attacks on Apache CXF
+* http://cxf.apache.org/cve-2012-5575.html[Note on CVE-2012-5575] - XML Encryption backwards compatibility attack on Apache CXF.
+* http://cxf.apache.org/cve-2013-0239.html[CVE-2013-0239] - Authentication bypass in the case of WS-SecurityPolicy enabled plaintext UsernameTokens.
+
+== Not a vulnerability
diff --git a/src/main/jbake/content/support.adoc b/src/main/jbake/content/support.adoc
new file mode 100644
index 0000000..2bfa9ad
--- /dev/null
+++ b/src/main/jbake/content/support.adoc
@@ -0,0 +1,30 @@
+= Getting Support
+:jbake-type: page
+:jbake-status: published
+
+== Mailing Lists
+
+* link:mailto:users@tomee.apache.org[Users] (link:mailto:users-subscribe@tomee.apache.org[Subscribe], link:mailto:users-unsubscribe@tomee.apache.org[Unsubscribe])
+* link:mailto:dev@tomee.apache.org[Developers] (link:mailto:dev-subscribe@tomee.apache.org[Subscribe], link:mailto:dev-unsubscribe@tomee.apache.org[Unsubscribe])
+* link:mailto:commits@tomee.apache.org[Commits] (link:mailto:commits-subscribe@tomee.apache.org[Subscribe], link:mailto:commits-unsubscribe@tomee.apache.org[Unsubscribe])
+* link:http://webchat.freenode.net/?channels=openejb[IRC]
+
+
+== Forums
+
+* link:http://openejb.979440.n4.nabble.com/OpenEJB-User-f979441.html[User Forum]
+* link:http://openejb.979440.n4.nabble.com/OpenEJB-Dev-f982480.html[Dev Forum]
+
+
+== JIRA
+
+* link:https://issues.apache.org/jira/browse/TOMEE[TOMEE]
+* link:https://issues.apache.org/jira/browse/OPENEJB[OPENEJB]
+
+
+Support for Apache TomEE is given freely by the community.
+Please be aware when asking questions that the Apache Software Foundation does not have paid developers or dedicated support staff.
+All community support comes from volunteers on a volunteer basis.
+Joining the community as a volunteer and helping your fellow users is highly encouraged!
+
+For commercial support or to commercially support the community see xref:commercial-support.adoc[Commercial Support] page.
diff --git a/src/main/jbake/content/support.md b/src/main/jbake/content/support.md
deleted file mode 100644
index a26f331..0000000
--- a/src/main/jbake/content/support.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Title: Getting Support
-
-{row
-
-{span-one-third
-## Mailing Lists
-
-* [Users](mailto:users@tomee.apache.org) ([Subscribe](mailto:users-subscribe@tomee.apache.org), [Unsubscribe](mailto:users-unsubscribe@tomee.apache.org))
-* [Developers](mailto:dev@tomee.apache.org) ([Subscribe](mailto:dev-subscribe@tomee.apache.org), [Unsubscribe](mailto:dev-unsubscribe@tomee.apache.org))
-* [Commits](mailto:commits@tomee.apache.org) ([Subscribe](mailto:commits-subscribe@tomee.apache.org), [Unsubscribe](mailto:commits-unsubscribe@tomee.apache.org))
-* [IRC](http://webchat.freenode.net/?channels=openejb)
-
-}
-
-{span-one-third
-## Forums
-
-* [User Forum](http://www.mail-archive.com/users@tomee.apache.org)
-* [Dev Forum](http://www.mail-archive.com/dev@tomee.apache.org)
-
-}
-
-{span-one-third
-## JIRA
-
-* [TOMEE](https://issues.apache.org/jira/browse/TOMEE)
-* [OPENEJB](https://issues.apache.org/jira/browse/OPENEJB)
-
-}
-
-}
-
-Support for Apache TomEE is given freely by the community.  Please be aware when asking questions that the Apache Software Foundation does not have paid developers or dedicated support staff.
-All community support comes from volunteers on a volunteer basis.  Joining the community as a volunteer and helping your fellow users is highly encouraged!
-
-For commercial support or to commercially support the community see [Commercial Support](commercial-support.html) page.
\ No newline at end of file
diff --git a/src/main/jbake/content/tck-results.adoc b/src/main/jbake/content/tck-results.adoc
index bb11d83..aff6603 100644
--- a/src/main/jbake/content/tck-results.adoc
+++ b/src/main/jbake/content/tck-results.adoc
@@ -2,7 +2,6 @@
 :jbake-date: 2021-04-29
 :jbake-type: page
 :jbake-status: published
-:jbake-tomeepdf:
 :icons: font
 
 - link:https://tomee.apache.org/9.0.0-M7/plume/webprofile-9.1.html[Apache TomEE 9.0.0-M7 TCK results]
diff --git a/src/main/jbake/content/team.adoc b/src/main/jbake/content/team.adoc
new file mode 100644
index 0000000..d9624f2
--- /dev/null
+++ b/src/main/jbake/content/team.adoc
@@ -0,0 +1,188 @@
+= Team
+:jbake-type: page
+:jbake-status: published
+
+[cols=6*]
+|===
+| [Alan Cabrera](mailto:adc@apache.org.html)
+| Committer, PMC
+| [adc
+| http://people.apache.org/~adc]
+| [map
+| http://people.apache.org/map.html?adc]
+
+| [Aaron Mulder](mailto:ammulder@apache.org.html)
+| Committer
+| [ammulder
+| http://people.apache.org/~ammulder]
+| [map
+| http://people.apache.org/map.html?ammulder]
+
+| [Andrew Gumbrecht](mailto:andygumbrecht@apache.org.html)
+| Committer
+| [andygumbrecht
+| http://people.apache.org/~andygumbrecht]
+| [map
+| http://people.apache.org/map.html?andygumbrecht]
+
+| [Dain Sundstrom](mailto:dain@apache.org.html)
+| Committer, PMC
+| [dain
+| http://people.apache.org/~dain]
+| [map
+| http://people.apache.org/map.html?dain]
+
+| [David Blevins](mailto:dblevins@apache.org.html)
+| Founder, Chair
+| [dblevins
+| http://people.apache.org/~dblevins]
+| [map
+| http://people.apache.org/map.html?dblevins]
+
+| [David Jencks](mailto:djencks@apache.org.html)
+| Committer, PMC
+| [djencks
+| http://people.apache.org/~djencks]
+| [map
+| http://people.apache.org/map.html?djencks]
+
+| [Daniel Stefan Haischt](mailto:dsh@apache.org.html)
+| Committer
+| [dsh
+| http://people.apache.org/~dsh]
+| [map
+| http://people.apache.org/map.html?dsh]
+
+| [Jarek Gawor](mailto:gawor@apache.org.html)
+| Committer
+| [gawor
+| http://people.apache.org/~gawor]
+| [map
+| http://people.apache.org/map.html?gawor]
+
+| [Gianny Damour](mailto:gdamour@apache.org.html)
+| Committer
+| [gdamour
+| http://people.apache.org/~gdamour]
+| [map
+| http://people.apache.org/map.html?gdamour]
+
+| [Lin Quan Jiang](mailto:genspring@apache.org.html)
+| Committer
+| [genspring
+| http://people.apache.org/~genspring]
+| [map
+| http://people.apache.org/map.html?genspring]
+
+| [Matt Richard Hogstrom](mailto:hogstrom@apache.org.html)
+| Committer
+| [hogstrom
+| http://people.apache.org/~hogstrom]
+| [map
+| http://people.apache.org/map.html?hogstrom]
+
+| [Jonathan Gallimore](mailto:jgallimore@apache.org.html)
+| Committer, PMC
+| [jgallimore
+| http://people.apache.org/~jgallimore]
+| [map
+| http://people.apache.org/map.html?jgallimore]
+
+| [Jeff Genender](mailto:jgenender@apache.org.html)
+| Committer
+| [jgenender
+| http://people.apache.org/~jgenender]
+| [map
+| http://people.apache.org/map.html?jgenender]
+
+| [Jacek Laskowski](mailto:jlaskowski@apache.org.html)
+| Committer, PMC
+| [jlaskowski
+| http://people.apache.org/~jlaskowski]
+| [map
+| http://people.apache.org/map.html?jlaskowski]
+
+| [Jean-Louis Monteiro](mailto:jlmonteiro@apache.org.html)
+| Committer, PMC
+| [jlmonteiro
+| http://people.apache.org/~jlmonteiro]
+| [map
+| http://people.apache.org/map.html?jlmonteiro]
+
+| [Jason van Zyl](mailto:jvanzyl@apache.org.html)
+| Committer
+| [jvanzyl
+| http://people.apache.org/~jvanzyl]
+| [map
+| http://people.apache.org/map.html?jvanzyl]
+
+| [Jeremy Whitlock](mailto:jwhitlock@apache.org.html)
+| Committer
+| [jwhitlock
+| http://people.apache.org/~jwhitlock]
+| [map
+| http://people.apache.org/map.html?jwhitlock]
+
+| [Kevan Lee Miller](mailto:kevan@apache.org.html)
+| Committer, PMC
+| [kevan
+| http://people.apache.org/~kevan]
+| [map
+| http://people.apache.org/map.html?kevan]
+
+| [Karan Singh Malhi](mailto:kmalhi@apache.org.html)
+| Committer
+| [kmalhi
+| http://people.apache.org/~kmalhi]
+| [map
+| http://people.apache.org/map.html?kmalhi]
+
+| [Lajos Moczar](mailto:lajos@apache.org.html)
+| Committer
+| [lajos
+| http://people.apache.org/~lajos]
+| [map
+| http://people.apache.org/map.html?lajos]
+
+| [Manu George](mailto:manugeorge@apache.org.html)
+| Committer
+| [manugeorge
+| http://people.apache.org/~manugeorge]
+| [map
+| http://people.apache.org/map.html?manugeorge]
+
+| [Mohammad Nour El-Din](mailto:mnour@apache.org.html)
+| Committer
+| [mnour
+| http://people.apache.org/~mnour]
+| [map
+| http://people.apache.org/map.html?mnour]
+
+| [Richard McGuire](mailto:rickmcguire@apache.org.html)
+| Committer
+| [rickmcguire
+| http://people.apache.org/~rickmcguire]
+| [map
+| http://people.apache.org/map.html?rickmcguire]
+
+| [Romain Manni-Bucau](mailto:rmannibucau@apache.org.html)
+| Committer
+| [rmannibucau
+| http://people.apache.org/~rmannibucau]
+| [map
+| http://people.apache.org/map.html?rmannibucau]
+
+| [Thiago Veronezi](mailto:tveronezi@apache.org.html)
+| Committer
+| [tveronezi
+| http://people.apache.org/~tveronezi]
+| [map
+| http://people.apache.org/map.html?tveronezi]
+
+| [Haihong Xu](mailto:xuhaihong@apache.org.html)
+| Committer
+| [xuhaihong
+| http://people.apache.org/~xuhaihong]
+| [map
+| http://people.apache.org/map.html?xuhaihong]
+|===
diff --git a/src/main/jbake/content/team.md b/src/main/jbake/content/team.md
deleted file mode 100644
index cc948a2..0000000
--- a/src/main/jbake/content/team.md
+++ /dev/null
@@ -1,106 +0,0 @@
-Title: Team
-<table>
-<tr><td> [Alan Cabrera](mailto:adc@apache.org.html)
- </td><td> Committer, PMC </td><td> [adc</td><td>http://people.apache.org/~adc]
- </td><td> [map</td><td>http://people.apache.org/map.html?adc]
-</td></tr>
-<tr><td> [Aaron Mulder](mailto:ammulder@apache.org.html)
- </td><td> Committer </td><td> [ammulder</td><td>http://people.apache.org/~ammulder]
- </td><td> [map</td><td>http://people.apache.org/map.html?ammulder]
-</td></tr>
-<tr><td> [Andrew Gumbrecht](mailto:andygumbrecht@apache.org.html)
- </td><td> Committer </td><td> [andygumbrecht</td><td>http://people.apache.org/~andygumbrecht]
- </td><td> [map</td><td>http://people.apache.org/map.html?andygumbrecht]
-</td></tr>
-<tr><td> [Dain Sundstrom](mailto:dain@apache.org.html)
- </td><td> Committer, PMC </td><td> [dain</td><td>http://people.apache.org/~dain]
- </td><td> [map</td><td>http://people.apache.org/map.html?dain]
-</td></tr>
-<tr><td> [David Blevins](mailto:dblevins@apache.org.html)
- </td><td> Founder, Chair </td><td> [dblevins</td><td>http://people.apache.org/~dblevins]
- </td><td> [map</td><td>http://people.apache.org/map.html?dblevins]
-</td></tr>
-<tr><td> [David Jencks](mailto:djencks@apache.org.html)
- </td><td> Committer, PMC </td><td> [djencks</td><td>http://people.apache.org/~djencks]
- </td><td> [map</td><td>http://people.apache.org/map.html?djencks]
-</td></tr>
-<tr><td> [Daniel Stefan Haischt](mailto:dsh@apache.org.html)
- </td><td> Committer </td><td> [dsh</td><td>http://people.apache.org/~dsh]
- </td><td> [map</td><td>http://people.apache.org/map.html?dsh]
-</td></tr>
-<tr><td> [Jarek Gawor](mailto:gawor@apache.org.html)
- </td><td> Committer </td><td> [gawor</td><td>http://people.apache.org/~gawor]
- </td><td> [map</td><td>http://people.apache.org/map.html?gawor]
-</td></tr>
-<tr><td> [Gianny Damour](mailto:gdamour@apache.org.html)
- </td><td> Committer </td><td> [gdamour</td><td>http://people.apache.org/~gdamour]
- </td><td> [map</td><td>http://people.apache.org/map.html?gdamour]
-</td></tr>
-<tr><td> [Lin Quan Jiang](mailto:genspring@apache.org.html)
- </td><td> Committer </td><td> [genspring</td><td>http://people.apache.org/~genspring]
- </td><td> [map</td><td>http://people.apache.org/map.html?genspring]
-</td></tr>
-<tr><td> [Matt Richard Hogstrom](mailto:hogstrom@apache.org.html)
- </td><td> Committer </td><td> [hogstrom</td><td>http://people.apache.org/~hogstrom]
- </td><td> [map</td><td>http://people.apache.org/map.html?hogstrom]
-</td></tr>
-<tr><td> [Jonathan Gallimore](mailto:jgallimore@apache.org.html)
- </td><td> Committer, PMC </td><td> [jgallimore</td><td>http://people.apache.org/~jgallimore]
- </td><td> [map</td><td>http://people.apache.org/map.html?jgallimore]
-</td></tr>
-<tr><td> [Jeff Genender](mailto:jgenender@apache.org.html)
- </td><td> Committer </td><td> [jgenender</td><td>http://people.apache.org/~jgenender]
- </td><td> [map</td><td>http://people.apache.org/map.html?jgenender]
-</td></tr>
-<tr><td> [Jacek Laskowski](mailto:jlaskowski@apache.org.html)
- </td><td> Committer, PMC </td><td> [jlaskowski</td><td>http://people.apache.org/~jlaskowski]
- </td><td> [map</td><td>http://people.apache.org/map.html?jlaskowski]
-</td></tr>
-<tr><td> [Jean-Louis Monteiro](mailto:jlmonteiro@apache.org.html)
- </td><td> Committer, PMC </td><td> [jlmonteiro</td><td>http://people.apache.org/~jlmonteiro]
- </td><td> [map</td><td>http://people.apache.org/map.html?jlmonteiro]
-</td></tr>
-<tr><td> [Jason van Zyl](mailto:jvanzyl@apache.org.html)
- </td><td> Committer </td><td> [jvanzyl</td><td>http://people.apache.org/~jvanzyl]
- </td><td> [map</td><td>http://people.apache.org/map.html?jvanzyl]
-</td></tr>
-<tr><td> [Jeremy Whitlock](mailto:jwhitlock@apache.org.html)
- </td><td> Committer </td><td> [jwhitlock</td><td>http://people.apache.org/~jwhitlock]
- </td><td> [map</td><td>http://people.apache.org/map.html?jwhitlock]
-</td></tr>
-<tr><td> [Kevan Lee Miller](mailto:kevan@apache.org.html)
- </td><td> Committer, PMC </td><td> [kevan</td><td>http://people.apache.org/~kevan]
- </td><td> [map</td><td>http://people.apache.org/map.html?kevan]
-</td></tr>
-<tr><td> [Karan Singh Malhi](mailto:kmalhi@apache.org.html)
- </td><td> Committer </td><td> [kmalhi</td><td>http://people.apache.org/~kmalhi]
- </td><td> [map</td><td>http://people.apache.org/map.html?kmalhi]
-</td></tr>
-<tr><td> [Lajos Moczar](mailto:lajos@apache.org.html)
- </td><td> Committer </td><td> [lajos</td><td>http://people.apache.org/~lajos]
- </td><td> [map</td><td>http://people.apache.org/map.html?lajos]
-</td></tr>
-<tr><td> [Manu George](mailto:manugeorge@apache.org.html)
- </td><td> Committer </td><td> [manugeorge</td><td>http://people.apache.org/~manugeorge]
- </td><td> [map</td><td>http://people.apache.org/map.html?manugeorge]
-</td></tr>
-<tr><td> [Mohammad Nour El-Din](mailto:mnour@apache.org.html)
- </td><td> Committer </td><td> [mnour</td><td>http://people.apache.org/~mnour]
- </td><td> [map</td><td>http://people.apache.org/map.html?mnour]
-</td></tr>
-<tr><td> [Richard McGuire](mailto:rickmcguire@apache.org.html)
- </td><td> Committer </td><td> [rickmcguire</td><td>http://people.apache.org/~rickmcguire]
- </td><td> [map</td><td>http://people.apache.org/map.html?rickmcguire]
-</td></tr>
-<tr><td> [Romain Manni-Bucau](mailto:rmannibucau@apache.org.html)
- </td><td> Committer </td><td> [rmannibucau</td><td>http://people.apache.org/~rmannibucau]
- </td><td> [map</td><td>http://people.apache.org/map.html?rmannibucau]
-</td></tr>
-<tr><td> [Thiago Veronezi](mailto:tveronezi@apache.org.html)
- </td><td> Committer </td><td> [tveronezi</td><td>http://people.apache.org/~tveronezi]
- </td><td> [map</td><td>http://people.apache.org/map.html?tveronezi]
-</td></tr>
-<tr><td> [Haihong Xu](mailto:xuhaihong@apache.org.html)
- </td><td> Committer </td><td> [xuhaihong</td><td>http://people.apache.org/~xuhaihong]
- </td><td> [map</td><td>http://people.apache.org/map.html?xuhaihong]
-</td></tr>
diff --git a/src/main/jbake/content/testcase-with-testbean-inner-class.adoc b/src/main/jbake/content/testcase-with-testbean-inner-class.adoc
new file mode 100644
index 0000000..5744782
--- /dev/null
+++ b/src/main/jbake/content/testcase-with-testbean-inner-class.adoc
@@ -0,0 +1,73 @@
+= TestCase with TestBean inner-class The use of an inner-class annotated as an EJB can get you all the resources you may need to run your test case such as a UserTransaction, EntityManager, JMS Topic or Queue, DataSource, references to other EJBs, etc.
+:jbake-type: page
+:jbake-status: published
+
+Simply add a _META-INF/ejb-jar.xml_ to your _test_ _sources_ and start annotating your inner class as needed.
+
+The test logic can be placed inside the inner-class EJB or you can setup the EJB to pass the required resources to the outer class.
+
+....
+import junit.framework.TestCase;
+
+import javax.ejb.Stateless;
+import javax.ejb.TransactionManagement;
+import static javax.ejb.TransactionManagementType.BEAN;
+import javax.annotation.Resource;
+import javax.transaction.UserTransaction;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.EntityManager;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Properties;
+
+public class MyTest extends TestCase {
+
+   private EntityManager entityManager;
+   private UserTransaction userTransaction;
+
+   @Override
+   protected void setUp() throws Exception {
+       Properties p = new Properties();
+       p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
+       // set any other properties
+
+       InitialContext initialContext = new InitialContext(p);
+       TestLocal testLocal = (TestLocal) initialContext.lookup("TestBeanLocal");
+
+       entityManager = testLocal.getEntityManager();
+       userTransaction = testLocal.getUserTransaction();
+   }
+
+
+   /**
+    * The src/test/resource/META-INF/ejb-jar.xml will cause this
+    * EJB to be automatically discovered and deployed when
+    * OpenEJB boots up.
+    */
+   @Stateless
+   @TransactionManagement(BEAN)
+   public static class TestBean implements TestLocal {
+
+       @Resource
+       private UserTransaction userTransaction;
+
+       @PersistenceContext(type = PersistenceContextType.EXTENDED)
+       private EntityManager entityManager;
+
+       public UserTransaction getUserTransaction() {
+	   return userTransaction;
+       }
+
+       public EntityManager getEntityManager() {
+	   return entityManager;
+       }
+   }
+
+   public static interface TestLocal {
+       EntityManager getEntityManager();
+       UserTransaction getUserTransaction();
+   }
+
+}
+....
diff --git a/src/main/jbake/content/time-saved.md b/src/main/jbake/content/time-saved.adoc
similarity index 98%
rename from src/main/jbake/content/time-saved.md
rename to src/main/jbake/content/time-saved.adoc
index a7b0f3f..aa316ac 100644
--- a/src/main/jbake/content/time-saved.md
+++ b/src/main/jbake/content/time-saved.adoc
@@ -1,4 +1,7 @@
-Title: Time Saved
+= Time Saved
+:jbake-type: page
+:jbake-status: published
+
 Ever wonder exactly how much time you might be saving being able to quickly
 compile and test code with OpenEJB?  Well, find out!
 
@@ -7,6 +10,8 @@
 put together this little calculator so you can see what OpenEJB is doing
 for you!
 
+
+++++
 <a name="TimeSaved-Calculator"></a>
 # Calculator
 <script type="text/javascript" src="http://prototypejs.org/assets/2010/4/1/prototype.js"></script>
@@ -243,3 +248,4 @@
 <h3>Total Savings</h3>
 
 <p><span  id="totalSavings"></span></p>
+++++
diff --git a/src/main/jbake/content/tomcat-activemq.adoc b/src/main/jbake/content/tomcat-activemq.adoc
new file mode 100644
index 0000000..64d16ec
--- /dev/null
+++ b/src/main/jbake/content/tomcat-activemq.adoc
@@ -0,0 +1,60 @@
+= Tomcat and ActiveMQ
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+With TomEE you get Tomcat with ActiveMQ added and integrated and ready to go!
+
+In a plain Servlet, Filter or Listener you can do fun things like injection of JMS Topics or Queues:
+
+[source,java]
+----
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServlet;
+import javax.jms.Topic;
+import javax.jms.Queue;
+import javax.jms.ConnectionFactory;
+
+public class MyServet extends HttpServlet {
+
+    @Resource(name = "foo")
+    private Topic fooTopic;
+
+    @Resource(name = "bar")
+    private Queue barQueue;
+
+    @Resource
+    private ConnectionFactory connectionFactory;
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        //...
+
+        Connection connection = connectionFactory.createConnection();
+        connection.start();
+
+        // Create a Session
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        // Create a MessageProducer from the Session to the Topic or Queue
+        MessageProducer producer = session.createProducer(fooTopic);
+        producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+        // Create a message
+        TextMessage message = session.createTextMessage("Hello World!");
+
+        // Tell the producer to send the message
+        producer.send(message);
+
+        //...
+    }
+
+}
+----
+
+No need to add even a single library!
+In the above scenario even the "foo" Topic and the "bar" Queue would be automatically created with no configuration necessary.
+
+xref:download-ng.adoc[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat.
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-activemq.md b/src/main/jbake/content/tomcat-activemq.md
deleted file mode 100644
index 4c09a6b..0000000
--- a/src/main/jbake/content/tomcat-activemq.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Title: Tomcat and ActiveMQ
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.  With TomEE you get Tomcat with ActiveMQ added and integrated and ready to go!
-
-In a plain Servlet, Filter or Listener you can do fun things like injection of JMS Topics or Queues:
-
-    import javax.annotation.Resource;
-    import javax.servlet.http.HttpServlet;
-    import javax.jms.Topic;
-    import javax.jms.Queue;
-    import javax.jms.ConnectionFactory;
-
-    public class MyServet extends HttpServlet {
-
-        @Resource(name = "foo")
-        private Topic fooTopic;
-
-        @Resource(name = "bar")
-        private Queue barQueue;
-
-        @Resource
-        private ConnectionFactory connectionFactory;
-
-        @Override
-        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-            //...
-
-            Connection connection = connectionFactory.createConnection();
-            connection.start();
-
-            // Create a Session
-            Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            // Create a MessageProducer from the Session to the Topic or Queue
-            MessageProducer producer = session.createProducer(fooTopic);
-            producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
-            // Create a message
-            TextMessage message = session.createTextMessage("Hello World!");
-
-            // Tell the producer to send the message
-            producer.send(message);
-
-            //...
-        }
-
-    }
-
-No need to add even a single library!  In the above scenario even the "foo" Topic and the "bar" Queue would be automatically created with no configuration necessary.
-
-[Download](downloads.html) TomEE and you're minutes away from a functioning JMS application on Tomcat.
-
-{include:apache-tomee.mdtext}
\ No newline at end of file
diff --git a/src/main/jbake/content/tomcat-cdi.adoc b/src/main/jbake/content/tomcat-cdi.adoc
new file mode 100644
index 0000000..c804aae
--- /dev/null
+++ b/src/main/jbake/content/tomcat-cdi.adoc
@@ -0,0 +1,69 @@
+= Tomcat CDI
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+With TomEE you get Tomcat with CDI added and integrated and ready to go!
+
+[source,java]
+----
+import javax.annotation.Resource;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class MyServlet extends HttpServlet {
+
+    @Inject
+    private Car car;
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+        car.drive();
+
+    }
+}
+----
+
+Where `Car` could be any POJO with a no-arg constructor.
+Additionally it's quite easy to create a factory to create the car you want injected.
+Simply do as follows:
+
+[source,java]
+----
+
+import javax.enterprise.inject.Produces;
+
+public class AssemblyLine {
+
+    @Produces
+    public Car createFancyCar() {
+        return new Car("Ferrari", "458 Italia", 2012);
+    }
+}
+----
+
+So when will the `Car` be created?
+In the above it will be created when `MyServlet` is created.
+If you annotate `createFancyCar` with `@RequestScoped` it will be created once per http request and shared by everyone in the request.
+If you annotate `createFancyCar` with `@SessionScoped` it will be created once per `HttpSession` and shared by everyone in the same session.
+So no more repeatedly putting and getting into the `HttpSession` by hand, just let the container do it!
+
+No need to add even a single library!
+To make the above work all you need is a `META-INF/beans.xml` file in your webapp like the following:
+
+ <beans/>
+
+Any jar in your webapp with the above will automatically be CDI enabled and all those beans can be injected with `@Inject` with no need to make them EJBs or third party frameworks.
+
+All this is setup and ready to go!
+Spend your time learning and having fun and writing your app, don't spend it chasing down libraries and integrating things the hard way.
+
+xref:download-ng.adoc[Download] TomEE and you're minutes away from having fun with CDI on Tomcat.
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-cdi.md b/src/main/jbake/content/tomcat-cdi.md
deleted file mode 100644
index b26c05c..0000000
--- a/src/main/jbake/content/tomcat-cdi.md
+++ /dev/null
@@ -1,54 +0,0 @@
-Title: Tomcat CDI
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.  With TomEE you get Tomcat with CDI added and integrated and ready to go!
-
-    import javax.annotation.Resource;
-    import javax.enterprise.inject.spi.BeanManager;
-    import javax.inject.Inject;
-    import javax.servlet.ServletException;
-    import javax.servlet.http.HttpServlet;
-    import javax.servlet.http.HttpServletRequest;
-    import javax.servlet.http.HttpServletResponse;
-    import java.io.IOException;
-
-    public class MyServlet extends HttpServlet {
-
-        @Inject
-        private Car car;
-
-        @Override
-        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-
-            car.drive();
-
-        }
-    }
-
-Where `Car` could be any POJO with a no-arg constructor.  Additionally it's quite easy to create a factory to create the car you want injected.  Simply do as follows:
-
-    import javax.enterprise.inject.Produces;
-
-    public class AssemblyLine {
-
-        @Produces
-        public Car createFancyCar() {
-            return new Car("Ferrari", "458 Italia", 2012);
-        }
-    }
-
-So when will the `Car` be created?  In the above it will be created when `MyServlet` is created.  If you annotate `createFancyCar` with `@RequestScoped` it will be created once
-per http request and shared by everyone in the request.  If you annotate `createFancyCar` with `@SessionScoped` it will be created once
-per `HttpSession` and shared by everyone in the same session.  So no more repeatedly putting and getting into the `HttpSession` by hand, just let the container do it!
-
-No need to add even a single library!  To make the above work all you need is a `META-INF/beans.xml` file in your webapp like the following:
-
-    <beans/>
-
-Any jar in your webapp with the above will automatically be CDI enabled and all those beans can be injected with `@Inject` with no need to make them EJBs or third party frameworks.
-
-All this is setup and ready to go!  Spend your time learning and having fun and writing your app, don't
-spend it chasing down libraries and integrating things the hard way.
-
-[Download](downloads.html) TomEE and you're minutes away from having fun with CDI on Tomcat.
-
-{include:apache-tomee.mdtext}
\ No newline at end of file
diff --git a/src/main/jbake/content/tomcat-detailed-instructions.adoc b/src/main/jbake/content/tomcat-detailed-instructions.adoc
new file mode 100644
index 0000000..e74273c
--- /dev/null
+++ b/src/main/jbake/content/tomcat-detailed-instructions.adoc
@@ -0,0 +1,298 @@
+= Tomcat Detailed Instructions
+:jbake-type: page
+:jbake-status: published
+
+== Detailed Installation Instructions
+
+These instructions assume you have a standard Tomcat installation running on port 8080.
+If you do not have an existing Tomcat installation, or want to start with a fresh installation for OpenEJB, the xref:tomcat-installation.adoc[Tomcat Installation]  will show you how to setup and verify a Tomcat installation.
+
+=== Add openejb.war to Tomcat
+
+The TomEE plugin for Tomcat is distributed as a standalone war file containing all of the necessary files and an installer Servlet.
+The war can be obtained from the xref:download-ng.adoc[download page].
+Once downloaded, simply copy the file into the Tomcat webapps directory.
+
+{deck:id=Copy openejb.war} {card:label=Windows}{noformat:nopanel=true}
+
+[source,console]
+----
+C:>copy openejb.war apache-tomcat-6.0.14\webapps\openejb.war
+1 file(s) copied.
+
+C:>dir apache-tomcat-6.0.14\webapps  Volume in drive C has no label.
+Volume Serial Number is 0000-0000
+
+Directory of C:\apache-tomcat-6.0.14\webapps
+
+09/20/2007 03:03 PM	.
+09/20/2007 03:03 PM ..
+09/20/2007 03:02 PM docs
+09/20/2007 03:01 PM examples
+09/20/2007 03:01 PM host-manager
+09/20/2007 03:03 PM manager
+09/19/2007 09:31 AM 13,394,733 openejb.war
+09/20/2007 03:01 PM ROOT 1 File(s) 13,394,733 bytes 7 Dir(s) 5,100,126,208 bytes free
+----
+
+[source,console]
+----
+$ cp openejb.war apache-tomcat-6.0.14/webapps/openejb.war
+
+$ ls apache-tomcat-6.0.14/webapps/
+ROOT/
+docs/
+examples/
+host-manager/
+manager/
+openejb.war
+----
+
+=== Run Installer Servlet
+
+The OpenEJB Plugin for Tomcat contains an installer servlet which adds the OpenEJB listener and JavaAgent to the Tomcat installation.
+To run the installer, you must first start Tomcat.
+
+[source,console]
+----
+C:>set JRE_HOME=C:\Program Files\Java\jre1.5.0_06
+
+C:>cd apache-tomcat-6.0.14\bin
+
+C:\apache-tomcat-6.0.14\bin>startup.bat Using CATALINA_BASE:   C:\apache-tomcat-6.0.14 Using CATALINA_HOME:   C:\apache-tomcat-6.0.14 Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp Using JRE_HOME:        C:\your\java\installation
+----
+
+[source,console]
+----
+$ cd apache-tomcat-6.0.14/bin
+
+apache-tomcat-6.0.14/bin$ chmod u+x *.sh
+
+apache-tomcat-6.0.14/bin$ ./startup.sh
+Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
+Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
+Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
+Using JRE_HOME:        /your/java/installation
+----
+
+NOTE: Your output will be different from the example above due to differences in installation locations.
+
+It is a good idea to wait a 5-60 seconds (depending on the speed of your computer) for Tomcat to fully start.
+Once Tomcat is fully started, simply visit http://localhost:8080/openejb/installer  and click the 'install' button to run the installer.
+The installer should report that the installation was successful.
+If it didn't work click [OPENEJB:here|#problems] .
+
+WARNING: The installer servlet adds the OpenEJB JavaAgent declaration to the catalina.sh and catalina.bat files.
+If you are using an IDE or some other mechanism to start Tomcat, you will need to xref:manual-installation#javaagent.adoc[manually]  add the JavaAgent declaration to the Java VM options of the launcher you are using.
+
+=== Restart Tomcat
+
+OpenEJB uses OpenJPA for persistence and OpenJPA currently requires a JavaAgent to function.
+Unfortunately, there is no way to install a JavaAgent at runtime, so you will have to restart Tomcat to enable the JavaAgent.
+Simply execute the shutdown command, wait 5-60 seconds (depending on the speed of your computer) for Tomcat to fully stop, and run the startup command to restart Tomcat.
+
+[source,console]
+----
+C:>cd apache-tomcat-6.0.14\bin
+
+C:\apache-tomcat-6.0.14\bin>shutdown.bat Using CATALINA_BASE:   C:\apache-tomcat-6.0.14 Using CATALINA_HOME:   C:\apache-tomcat-6.0.14 Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp Using JRE_HOME:        C:\your\java\installation
+
+C:\apache-tomcat-6.0.14\bin>startup.bat Using CATALINA_BASE:   C:\apache-tomcat-6.0.14 Using CATALINA_HOME:   C:\apache-tomcat-6.0.14 Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp Using JRE_HOME:        C:\your\java\installation
+
+----
+
+[source,console]
+----
+$ cd apache-tomcat-6.0.14/bin
+
+apache-tomcat-6.0.14/bin$ ./shutdown.sh
+Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
+Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
+Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
+Using JRE_HOME:        /your/java/installation
+
+apache-tomcat-6.0.14/bin$ ./startup.sh
+Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
+Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
+Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
+Using JRE_HOME:        /your/java/installation
+----
+
+NOTE: Your output will be different from the example above due to differences in installation locations.
+
+Once Tomcat is fully started, simply visit link:http://localhost:8080/openejb/installer[]  to verify the installation is complete.
+
+== Examples, Tutorials and Tests
+
+=== ejb-examples.war
+
+Download the link:http://people.apache.org/~dain/openejb-temp/examples[ejb-examples.war] , copy it into the Tomcat webapps directory, and visit link:http://localhost:8080/ejb-examples[] .
+
+=== OpenEJB iTests
+
+OpenEJB uses a large test suite to verify the final server assembly, and you can use this to verify your OpenEJB installation.
+Simply download the link:http://people.apache.org/~dain/openejb-temp/itests[openejb-itests.war and openejb-standalone-client.jar]  and copy it the war into the Tomcat webapps directory.
+It will take a bit to load the application because it contains a huge number of EJBs.
+Finally, run the test client executable jar.
+
+==== Start Tomcat
+
+.Windows
+[source,console]
+----
+C:>java -jar openejb-itests-standalone-client.jar tomcat
+_________________
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+ _
+
+Running EJB compliance tests on HTTP/Tomcat Server *__**__**__**__**__**__**__***__**_
+WARNING: No test suite configuration file specified, assuming system properties contain all  needed information.
+To specify a test suite configuration file by setting its location using the system property "openejb.testsuite.properties"  test server = org.apache.openejb.test.TomcatRemoteTestServer entry = java.naming.provider.url:http://127.0.0.1:8080/openejb/ejb entry = java.naming.factory.initial:org.apache.openejb.client.RemoteInitialContextFactory .........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+............................
+Time: 20.644
+
+OK (889 tests)
+
+'''
+
+CLIENT JNDI PROPERTIES java.naming.provider.url = http://127.0.0.1:8080/openejb/ejb java.naming.factory.initial = org.apache.openejb.client.RemoteInitialContextFactory *__**__**__**__**__**__**__***__**_
+
+----
+
+
+.Unix
+[source,console]
+----
+$ java -jar openejb-itests-standalone-client.jar tomcat
+_________________________________________________
+________________________
+
+Running EJB compliance tests on HTTP/Tomcat Server
+_________________________________________________
+WARNING: No test suite configuration file specified, assuming system properties contain all
+needed information.  To specify a test suite configuration file by setting its location using
+the system property "openejb.testsuite.properties"
+test server = org.apache.openejb.test.TomcatRemoteTestServer
+entry = java.naming.provider.url:http://127.0.0.1:8080/openejb/ejb
+entry = java.naming.factory.initial:org.apache.openejb.client.RemoteInitialContextFactory
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+.........................................
+............................
+Time: 12.186
+
+OK (889 tests)
+
+
+_________________________________________________
+CLIENT JNDI PROPERTIES
+java.naming.provider.url = http://127.0.0.1:8080/openejb/ejb
+java.naming.factory.initial = org.apache.openejb.client.RemoteInitialContextFactory
+_________________________________________________
+----
+
+
+
+TIP: The tests should completely pass the first time they are run.
+If you execute the test client a second time, 21 tests fail for some unknown reason.\{tip}
+
+== Problems?
+
+=== HTTP Status 403
+
+Did you get a "HTTP Status 403" error page containing the description "Access to the specified resource () has been forbidden." when visiting http://localhost:8080/openejb ?
+
+The openejb.war is protected by a Tomcat valve that restricts access to the application to the computer on which Tomcat is running.
+If your browser is running on the same computer as Tomcat, try accessing OpenEJB using this link instead http://127.0.0.1:8080/openejb .
+
+If you want to access the openejb.war from another computer, you will need to either remove the valve, or modify the IP list in the valve declaration.
+The easiest way to remove the valve it to simply delete the webapps/openejb/META-INF/context.xml file and and the webapps/openejb.war file _while Tomcat is stopped_.
+The openejb.war file must be removed because some versions of Tomcat will use the context.xml file packed in the openejb.war file regardless of what is in the unpacked directory.
+
+=== Other Issues
+
+If you are having problems with the installation, please send a message to the OpenEJB users xref:mailing-lists.adoc[mailing list]  containing any error message(s) and the following information:
+
+* OpenEJB Version
+* Tomcat Version
+* Java Version (execute java -version)
+* Operating System Type and Version
+
+== Limitations
+
+_Tomcat 6.x_ - Currently, only Tomcat 6.x is supported due to API difference between 5.5.x and 6.x.
+It is expected that 5.5 will be supported in the future, but there are no plans to support 5.0.x due to the lack of annotation support in 5.0.x.
+
+_Security_ - Unfortunately, at this time security with Tomcat/OpenEJB is not integrated, but is being worked on.
+
+_EAR Files_ - The integration only supports war (and collapsed-ear) files.
+EAR, EJB Jar, and RAR files will be supported in a future release.
+
+_JavaAgent_ - OpenEJB uses OpenJPA to provide JPA and CMP persistence, and OpenJPA currently requires a JavaAgent to function properly.
+This requirement is something that the OpenJPA project is working on removing.
+Once removed, the OpenEJB plugin for Tomcat will no longer need to modify the startup shell scripts and you will not need to restart Tomcat after the OpenEJB installation.
+
+== Misc
+
+This document is a starting point for using OpenEJB in Tomcat and will evolve based on user contributions.
+If you wish to contribute to this document, feel very welcome to click the 'Edit' link in the upper right and make changes and add new HOWTO's and other docs.
diff --git a/src/main/jbake/content/tomcat-detailed-instructions.md b/src/main/jbake/content/tomcat-detailed-instructions.md
deleted file mode 100644
index 6f71afa..0000000
--- a/src/main/jbake/content/tomcat-detailed-instructions.md
+++ /dev/null
@@ -1,343 +0,0 @@
-Title: Tomcat Detailed Instructions
-{composition-setup}
-
-<a name="TomcatDetailedInstructions-{anchor:detailedinstructions}DetailedInstallationInstructions"></a>
-# {anchor:detailed instructions} Detailed Installation Instructions
-
-These instructions assume you have a standard Tomcat installation running
-on port 8080.  If you do not have an existing Tomcat installation, or want
-to start with a fresh installation for OpenEJB, the [Tomcat Installation](tomcat-installation.html)
- will show you how to setup and verify a Tomcat installation.
-
-<a name="TomcatDetailedInstructions-Addopenejb.wartoTomcat"></a>
-## Add openejb.war to Tomcat
-
-The TomEE plugin for Tomcat is distributed as a standalone war file
-containing all of the necessary files and an installer Servlet.  The war
-can be obtained from the [download page](http://tomee.apache.org/downloads.html)
-.  Once downloaded, simply copy the file into the Tomcat webapps directory. 
-
-{deck:id=Copy openejb.war}
-{card:label=Windows}{noformat:nopanel=true}
-C:\>copy openejb.war apache-tomcat-6.0.14\webapps\openejb.war
-	1 file(s) copied.
-
-C:\>dir apache-tomcat-6.0.14\webapps
- Volume in drive C has no label.
- Volume Serial Number is 0000-0000
-
- Directory of C:\apache-tomcat-6.0.14\webapps
-
-09/20/2007  03:03 PM	<DIR>	       .
-09/20/2007  03:03 PM	<DIR>	       ..
-09/20/2007  03:02 PM	<DIR>	       docs
-09/20/2007  03:01 PM	<DIR>	       examples
-09/20/2007  03:01 PM	<DIR>	       host-manager
-09/20/2007  03:03 PM	<DIR>	       manager
-09/19/2007  09:31 AM	    13,394,733 openejb.war
-09/20/2007  03:01 PM	<DIR>	       ROOT
-	       1 File(s)     13,394,733 bytes
-	       7 Dir(s)   5,100,126,208 bytes free
-
-    {card:label=Unix}{noformat:nopanel=true}
-    $ cp openejb.war apache-tomcat-6.0.14/webapps/openejb.war
-    
-    $ ls apache-tomcat-6.0.14/webapps/
-    ROOT/	      docs/	    examples/	  host-manager/ manager/     
-openejb.war
-
-{deck}
-
-<a name="TomcatDetailedInstructions-RunInstallerServlet"></a>
-## Run Installer Servlet
-
-The OpenEJB Plugin for Tomcat contains an installer servlet which adds the
-OpenEJB listener and JavaAgent to the Tomcat installation.  To run the
-installer, you must first start Tomcat.
-
-{deck:id=Start Tomcat}
-{card:label=Windows}{noformat:nopanel=true}
-C:\>set JRE_HOME=C:\Program Files\Java\jre1.5.0_06
-
-C:\>cd apache-tomcat-6.0.14\bin
-
-C:\apache-tomcat-6.0.14\bin>startup.bat
-Using CATALINA_BASE:   C:\apache-tomcat-6.0.14
-Using CATALINA_HOME:   C:\apache-tomcat-6.0.14
-Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp
-Using JRE_HOME:        C:\your\java\installation
-
-    {card:label=Unix}{noformat:nopanel=true}
-    $ cd apache-tomcat-6.0.14/bin
-    
-    apache-tomcat-6.0.14/bin$ chmod u+x *.sh
-    
-    apache-tomcat-6.0.14/bin$ ./startup.sh 
-    Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
-    Using JRE_HOME:        /your/java/installation
-
-{deck}
-
-*NOTE:* Your output will be different from the example above due to
-differences in installation locations.
-
-It is a good idea to wait a 5-60 seconds (depending on the speed of your
-computer) for Tomcat to fully start.  Once Tomcat is fully started, simply
-visit [http://localhost:8080/openejb/installer](http://localhost:8080/openejb/installer)
- and click the 'install' button to run the installer.  The installer should
-report that the installation was successful. If it didn't work click [OPENEJB:here|#problems]
-.
-
-{warning}
-The installer servlet adds the OpenEJB JavaAgent declaration to the
-catalina.sh and catalina.bat files.  If you are using an IDE or some other
-mechanism to start Tomcat, you will need to [manually](manual-installation#javaagent.html)
- add the JavaAgent declaration to the Java VM options of the launcher you
-are using. 
-{warning}
-
-<a name="TomcatDetailedInstructions-RestartTomcat"></a>
-## Restart Tomcat
-
-OpenEJB uses OpenJPA for persistence and OpenJPA currently requires a
-JavaAgent to function.	Unfortunately, there is no way to install a
-JavaAgent at runtime, so you will have to restart Tomcat to enable the
-JavaAgent.  Simply execute the shutdown command, wait 5-60 seconds
-(depending on the speed of your computer) for Tomcat to fully stop, and run
-the startup command to restart Tomcat.
-
-{deck:id=Start Tomcat}
-{card:label=Windows}{noformat:nopanel=true}
-C:\>cd apache-tomcat-6.0.14\bin
-
-C:\apache-tomcat-6.0.14\bin>shutdown.bat
-Using CATALINA_BASE:   C:\apache-tomcat-6.0.14
-Using CATALINA_HOME:   C:\apache-tomcat-6.0.14
-Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp
-Using JRE_HOME:        C:\your\java\installation
-
-C:\apache-tomcat-6.0.14\bin>startup.bat
-Using CATALINA_BASE:   C:\apache-tomcat-6.0.14
-Using CATALINA_HOME:   C:\apache-tomcat-6.0.14
-Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp
-Using JRE_HOME:        C:\your\java\installation
-
-    {card:label=Unix}{noformat:nopanel=true}
-    $ cd apache-tomcat-6.0.14/bin
-    
-    apache-tomcat-6.0.14/bin$ ./shutdown.sh 
-    Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
-    Using JRE_HOME:        /your/java/installation
-    
-    apache-tomcat-6.0.14/bin$ ./startup.sh 
-    Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
-    Using JRE_HOME:        /your/java/installation
-
-{deck}
-
-*NOTE:* Your output will be different from the example above due to
-differences in installation locations.
-
-Once Tomcat is fully started, simply visit [http://localhost:8080/openejb/installer](http://localhost:8080/openejb/installer)
- to verify the installation is complete.
-
-<a name="TomcatDetailedInstructions-Examples,TutorialsandTests"></a>
-# Examples, Tutorials and Tests
-
-<a name="TomcatDetailedInstructions-ejb-examples.war"></a>
-## ejb-examples.war
-
-Download the [ejb-examples.war](http://people.apache.org/~dain/openejb-temp/examples)
-, copy it into the Tomcat webapps directory, and visit [http://localhost:8080/ejb-examples]
-.
-
-<a name="TomcatDetailedInstructions-OpenEJBiTests"></a>
-## OpenEJB iTests
-
-OpenEJB uses a large test suite to verify the final server assembly, and
-you can use this to verify your OpenEJB installation.  Simply download the [openejb-itests.war and openejb-standalone-client.jar](http://people.apache.org/~dain/openejb-temp/itests)
- and copy it the war into the Tomcat webapps directory.  It will take a bit
-to load the application because it contains a huge number of EJBs. 
-Finally, run the test client executable jar.
-
-{deck:id=Start Tomcat}
-{card:label=Windows}{noformat:nopanel=true}
-C:\>java -jar openejb-itests-standalone-client.jar tomcat
-_________________________________________________
-<table>
-<tr><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td><td>_</td></tr>
-</table>
-
-Running EJB compliance tests on HTTP/Tomcat Server
-_________________________________________________
-WARNING: No test suite configuration file specified, assuming system
-properties contain all 
-needed information.  To specify a test suite configuration file by setting
-its location using
-the system property "openejb.testsuite.properties" 
-test server = org.apache.openejb.test.TomcatRemoteTestServer
-entry = java.naming.provider.url:http://127.0.0.1:8080/openejb/ejb
-entry =
-java.naming.factory.initial:org.apache.openejb.client.RemoteInitialContextFactory
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-.........................................
-............................
-Time: 20.644
-
-OK (889 tests)
-
-
-_________________________________________________
-CLIENT JNDI PROPERTIES
-java.naming.provider.url = http://127.0.0.1:8080/openejb/ejb
-java.naming.factory.initial =
-org.apache.openejb.client.RemoteInitialContextFactory
-_________________________________________________
-
-    {card:label=Unix}{noformat:nopanel=true}
-    $ java -jar openejb-itests-standalone-client.jar tomcat
-    _________________________________________________
-    |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|
-    
-    Running EJB compliance tests on HTTP/Tomcat Server
-    _________________________________________________
-    WARNING: No test suite configuration file specified, assuming system
-properties contain all
-    needed information.  To specify a test suite configuration file by setting
-its location using
-    the system property "openejb.testsuite.properties"
-    test server = org.apache.openejb.test.TomcatRemoteTestServer
-    entry = java.naming.provider.url:http://127.0.0.1:8080/openejb/ejb
-    entry =
-java.naming.factory.initial:org.apache.openejb.client.RemoteInitialContextFactory
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    .........................................
-    ............................
-    Time: 12.186
-    
-    OK (889 tests)
-    
-    
-    _________________________________________________
-    CLIENT JNDI PROPERTIES
-    java.naming.provider.url = http://127.0.0.1:8080/openejb/ejb
-    java.naming.factory.initial =
-org.apache.openejb.client.RemoteInitialContextFactory
-    _________________________________________________
-
-{deck}
-
-{tip:title=Failures}The tests should completely pass the first time they
-are run.  If you execute the test client a second time, 21 tests fail for
-some unknown reason.{tip}
-
-<a name="TomcatDetailedInstructions-{anchor:problems}Problems?"></a>
-# {anchor:problems} Problems?
-
-<a name="TomcatDetailedInstructions-HTTPStatus403"></a>
-## HTTP Status 403 
-
-Did you get a "HTTP Status 403" error page containing the description
-"Access to the specified resource () has been forbidden." when visiting [http://localhost:8080/openejb](http://localhost:8080/openejb)
-?
-
-The openejb.war is protected by a Tomcat valve that restricts access to the
-application to the computer on which Tomcat is running.  If your browser is
-running on the same computer as Tomcat, try accessing OpenEJB using this
-link instead [http://127.0.0.1:8080/openejb](http://127.0.0.1:8080/openejb)
-.
-
-If you want to access the openejb.war from another computer, you will need
-to either remove the valve, or modify the IP list in the valve declaration.
- The easiest way to remove the valve it to simply delete the
-webapps/openejb/META-INF/context.xml file and and the webapps/openejb.war
-file *while Tomcat is stopped*.  The openejb.war file must be removed
-because some versions of Tomcat will use the context.xml file packed in the
-openejb.war file regardless of what is in the unpacked directory.
-
-<a name="TomcatDetailedInstructions-OtherIssues"></a>
-## Other Issues
-
-If you are having problems with the installation, please send a message to
-the OpenEJB users [mailing list](openejb:mailing-lists.html)
- containing any error message(s) and the following information:
-
-* OpenEJB Version
-* Tomcat Version
-* Java Version (execute java -version)
-* Operating System Type and Version
-
-
-<a name="TomcatDetailedInstructions-Limitations"></a>
-# Limitations
-
- *Tomcat 6.x* - Currently, only Tomcat 6.x is supported due to API
-difference between 5.5.x and 6.x.  It is expected that 5.5 will be
-supported in the future, but there are no plans to support 5.0.x due to the
-lack of annotation support in 5.0.x.
-
- *Security* - Unfortunately, at this time security with Tomcat/OpenEJB is
-not integrated, but is being worked on.
-
- *EAR Files* - The integration only supports war (and collapsed-ear) files.
- EAR, EJB Jar, and RAR files will be supported in a future release.
-
- *JavaAgent* - OpenEJB uses OpenJPA to provide JPA and CMP persistence, and
-OpenJPA currently requires a JavaAgent to function properly.  This
-requirement is something that the OpenJPA project is working on removing. 
-Once removed, the OpenEJB plugin for Tomcat will no longer need to modify
-the startup shell scripts and you will not need to restart Tomcat after the
-OpenEJB installation.
-
-<a name="TomcatDetailedInstructions-Misc"></a>
-# Misc
-
-This document is a starting point for using OpenEJB in Tomcat and will
-evolve based on user contributions. If you wish to contribute to this
-document, feel very welcome to click the 'Edit' link in the upper right and
-make changes and add new HOWTO's and other docs.  
-
diff --git a/src/main/jbake/content/tomcat-ejb-refs.adoc b/src/main/jbake/content/tomcat-ejb-refs.adoc
new file mode 100644
index 0000000..247eff3
--- /dev/null
+++ b/src/main/jbake/content/tomcat-ejb-refs.adoc
@@ -0,0 +1,29 @@
+= Tomcat ejb-refs
+:jbake-type: page
+:jbake-status: published
+
+== Via @EJB Annotation
+
+Which an be as simple as adding this to your Servlet, Filter, or Listener:
+
+----
+ @EJB
+ private HelloLocal helloLocal;
+----
+
+See the xref:injection-of-other-ejbs-example.adoc[@EJB Injection Example]  for a running example.
+The example uses one ejb to refer to another ejb, but the same rules apply for servlets.
+
+== Adding ejb-ref in your web.xml
+
+Or on the older xml-style:
+
+----
+ <ejb-ref>
+  <description> EJB Reference to the bean deployed to OpenEJB </description>
+  <ejb-ref-name>ejb/hello</ejb-ref-name>
+  <ejb-ref-type>Session</ejb-ref-type>
+  <home>org.acme.HelloHome</home>
+  <remote>org.acme.Hello</remote>
+ </ejb-ref>
+----
\ No newline at end of file
diff --git a/src/main/jbake/content/tomcat-ejb-refs.md b/src/main/jbake/content/tomcat-ejb-refs.md
deleted file mode 100644
index f0c6446..0000000
--- a/src/main/jbake/content/tomcat-ejb-refs.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Title: Tomcat ejb-refs
-<a name="Tomcatejb-refs-Via@EJBAnnotation"></a>
-# Via @EJB Annotation
-
-Which an be as simple as adding this to your Servlet, Filter, or Listener:
-
-
-    @EJB
-    private HelloLocal helloLocal;
-
-
-See the [@EJB Injection Example](injection-of-other-ejbs-example.html)
- for a running example.  The example uses one ejb to refer to another ejb,
-but the same rules apply for servlets.
-
-<a name="Tomcatejb-refs-Addingejb-refinyourweb.xml"></a>
-# Adding ejb-ref in your web.xml
-
-Or on the older xml-style:
-
-
-    <ejb-ref>
-     <description> EJB Reference to the bean deployed to OpenEJB </description>
-     <ejb-ref-name>ejb/hello</ejb-ref-name>
-     <ejb-ref-type>Session</ejb-ref-type>
-     <home>org.acme.HelloHome</home>
-     <remote>org.acme.Hello</remote> 
-    </ejb-ref>
-
diff --git a/src/main/jbake/content/tomcat-ejb.adoc b/src/main/jbake/content/tomcat-ejb.adoc
new file mode 100644
index 0000000..2446018
--- /dev/null
+++ b/src/main/jbake/content/tomcat-ejb.adoc
@@ -0,0 +1,8 @@
+= Tomcat EJB
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+With TomEE you get Tomcat with EJB added and integrated and ready to go!
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-ejb.md b/src/main/jbake/content/tomcat-ejb.md
deleted file mode 100644
index 090254f..0000000
--- a/src/main/jbake/content/tomcat-ejb.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Title: Tomcat EJB
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.  With TomEE you get Tomcat with EJB added and integrated and ready to go!
-
-{include:apache-tomee.mdtext}
\ No newline at end of file
diff --git a/src/main/jbake/content/tomcat-installation.adoc b/src/main/jbake/content/tomcat-installation.adoc
new file mode 100644
index 0000000..b1fb4bf
--- /dev/null
+++ b/src/main/jbake/content/tomcat-installation.adoc
@@ -0,0 +1,150 @@
+= Tomcat Installation
+:jbake-type: page
+:jbake-status: published
+
+== Overview
+
+Tomcat installation is very simple, and can be describes as "Unpack and Run".
+These instructions were written using Tomcat 6.0.14 but any recent 6.x version should work.
+If you are comfortable with the CLI, these the following quick instructions will get you going ASAP;
+otherwise skip to the <<Download Tomcat>>  section.
+
+. Download Tomcat zip or tar.gz
+. Unpack archive
+. Platform specific setup
+** <<OpenEJB - Unix>>.
+If zip was unpacked, _chmod u+x bin/_.sh*
+** <<OpenEJB - Windows>> _set JAVA_HOME =C:\your\java\installation_
+. Run bin/startup.sh or bin/startup.bat
+. Visit http://localhost:8080/
+. Run bin/shutdown.sh or bin/shutdown.bat
+
+== Download Tomcat
+
+Download Tomcat 6 zip file from link:http://tomcat.apache.org/download-60.cgi#6.0.14[here] .
+
+== Unpack Tomcat
+
+Unpack the Tomcat zip file  which will create a new directory containing the complete Tomcat installation.
+
+[source,console]
+----
+C:>jar -xvf apache-tomcat-6.0.14.zip
+created: apache-tomcat-6.0.14/
+created: apache-tomcat-6.0.14/bin/
+created: apache-tomcat-6.0.14/conf/
+...snip...
+
+C:>dir apache-tomcat-6.0.14  Volume in drive C has no label.
+Volume Serial Number is 0000-0000
+
+Directory of C:\apache-tomcat-6.0.14
+
+09/20/2007  09:14 PM	.
+09/20/2007 09:14 PM ..
+09/20/2007 09:15 PM bin
+09/20/2007 09:15 PM conf
+09/20/2007 09:15 PM lib
+07/20/2007 04:20 AM 11,560 LICENSE
+09/20/2007 09:14 PM logs
+07/20/2007 04:20 AM 556 NOTICE
+07/20/2007 04:20 AM 6,656 RELEASE-NOTES
+07/20/2007 04:20 AM 5,829 RUNNING.txt
+09/20/2007 09:14 PM temp
+09/20/2007 09:14 PM webapps
+09/20/2007 09:14 PM work
+4 File(s) 24,601 bytes 9 Dir(s) 5,085,085,696 bytes free
+----
+
+[source,console]
+----
+$ jar -xvf apache-tomcat-6.0.14.zip
+  created: apache-tomcat-6.0.14/
+  created: apache-tomcat-6.0.14/bin/
+  created: apache-tomcat-6.0.14/conf/
+...snip...
+
+$ ls apache-tomcat-6.0.14/
+LICENSE        RELEASE-NOTES  bin/	     lib/	    temp/	   work/
+NOTICE	       RUNNING.txt    conf/	     logs/	    webapps/
+----
+
+== OpenEJB - Windows
+
+Set JAVA_HOME environment variable
+
+For Windows users, the Tomcat shell scripts must know the location of the Java installation, and this is done with environment variables.
+The following command will set the JAVA_HOME environment variable:
+
+[source,console]
+----
+C:>set JAVA_HOME =C:\your\java\installation
+----
+
+== OpenEJB - Unix
+
+Make shell scripts executable
+
+For Unix users, the shell scripts in the Tomcat installation are not executable by default, so in order to execute them, you must set mark them as executable.
+If you unpacked the Tomcat tar.gz file, the scripts are already executable.  The following command will make all shell scripts executable:
+
+[source,console]
+----
+apache-tomcat-6.0.14$ chmod u+x bin/*.sh
+----
+
+== Start Tomcat
+
+Execute the following command to start the Tomcat server:
+
+[source,console]
+----
+C:>cd apache-tomcat-6.0.14\bin
+
+C:\apache-tomcat-6.0.14\bin>startup.bat
+Using CATALINA_BASE:   C:\apache-tomcat-6.0.14
+Using CATALINA_HOME:   C:\apache-tomcat-6.0.14
+Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp
+Using JRE_HOME:        C:\your\java\installation
+----
+
+[source,console]
+----
+$ cd apache-tomcat-6.0.14/bin
+
+apache-tomcat-6.0.14/bin$ ./startup.sh
+Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
+Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
+Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
+Using JRE_HOME:        /your/java/installation
+----
+
+_NOTE:_ Your output will be different from the example above due to differences in installation location.
+
+== Verify Tomcat is Running
+
+Visit link:http://localhost:8080/[]  and you should see the Tomcat welcome page.
+
+== Stop Tomcat
+
+Shutdown Tomcat by executing the following command:
+
+[source,console]
+----
+C:\apache-tomcat-6.0.14\bin>shutdown.bat
+Using CATALINA_BASE:   C:\apache-tomcat-6.0.14
+Using CATALINA_HOME:   C:\apache-tomcat-6.0.14
+Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp
+Using JRE_HOME:        C:\your\java\installation
+----
+
+[source,console]
+----
+ apache-tomcat-6.0.14/bin$ ./shutdown.sh
+ Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
+ Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
+ Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
+ Using JRE_HOME:        /your/java/installation
+----
+
+_NOTE:_ Your output will be different from the example above due to differences in installation locations.
diff --git a/src/main/jbake/content/tomcat-installation.md b/src/main/jbake/content/tomcat-installation.md
deleted file mode 100644
index 32ae3f2..0000000
--- a/src/main/jbake/content/tomcat-installation.md
+++ /dev/null
@@ -1,168 +0,0 @@
-Title: Tomcat Installation
-{composition-setup}
-{composition-setup}
-
-<a name="TomcatInstallation-Overview"></a>
-# Overview
-
-Tomcat installation is very simple, and can be describes as "Unpack and
-Run".  These instructions were written using Tomcat 6.0.14 but any recent
-6.x version should work.  If you are comfortable with the CLI, these the
-following quick instructions will get you going ASAP; otherwise skip to the [OPENEJB:Download Tomcat](#download.html)
- section.
-
-1. Download Tomcat zip or tar.gz
-1. Unpack archive
-1. Platform specific setup
-** \[OPENEJB:Unix\](openejb:unix\.html)
- If zip was unpacked, *chmod u+x bin/*.sh*
-** \[OPENEJB:Windows\](openejb:windows\.html)
- *set JAVA_HOME =C:\your\java\installation* 
-1. Run bin/startup.sh or bin/startup.bat
-1. Visit http://localhost:8080/
-1. Run bin/shutdown.sh or bin/shutdown.bat
-
-<a name="TomcatInstallation-{anchor:download}DownloadTomcat"></a>
-# {anchor:download} Download Tomcat
-
-Download Tomcat 6 zip file from [here](http://tomcat.apache.org/download-60.cgi#6.0.14)
-.    
-
-<a name="TomcatInstallation-UnpackTomcat"></a>
-# Unpack Tomcat
-
-Unpack the Tomcat zip file  which will create a new directory containing
-the complete Tomcat installation.
-
-{deck:id=unpack tomcat}
-{card:label=Windows}{noformat:nopanel=true}
-C:\>jar -xvf apache-tomcat-6.0.14.zip
-  created: apache-tomcat-6.0.14/
-  created: apache-tomcat-6.0.14/bin/
-  created: apache-tomcat-6.0.14/conf/
-...snip...
-
-C:\>dir apache-tomcat-6.0.14
- Volume in drive C has no label.
- Volume Serial Number is 0000-0000
-
- Directory of C:\apache-tomcat-6.0.14
-
-09/20/2007  09:14 PM	<DIR>	       .
-09/20/2007  09:14 PM	<DIR>	       ..
-09/20/2007  09:15 PM	<DIR>	       bin
-09/20/2007  09:15 PM	<DIR>	       conf
-09/20/2007  09:15 PM	<DIR>	       lib
-07/20/2007  04:20 AM		11,560 LICENSE
-09/20/2007  09:14 PM	<DIR>	       logs
-07/20/2007  04:20 AM		   556 NOTICE
-07/20/2007  04:20 AM		 6,656 RELEASE-NOTES
-07/20/2007  04:20 AM		 5,829 RUNNING.txt
-09/20/2007  09:14 PM	<DIR>	       temp
-09/20/2007  09:14 PM	<DIR>	       webapps
-09/20/2007  09:14 PM	<DIR>	       work
-	       4 File(s)	 24,601 bytes
-	       9 Dir(s)   5,085,085,696 bytes free
-
-    {card:label=Unix}{noformat:nopanel=true}
-    $ jar -xvf apache-tomcat-6.0.14.zip 
-      created: apache-tomcat-6.0.14/
-      created: apache-tomcat-6.0.14/bin/
-      created: apache-tomcat-6.0.14/conf/
-    ...snip...
-    
-    $ ls apache-tomcat-6.0.14/  
-    LICENSE        RELEASE-NOTES  bin/	     lib/	    temp/	  
-work/
-    NOTICE	       RUNNING.txt    conf/	     logs/	    webapps/
-
-{deck}
-
-# \[OPENEJB:Windows\](openejb:windows\.html)
- Set JAVA_HOME environment variable
-
-For Windows users, the Tomcat shell scripts must know the location of the
-Java installation, and this is done with environment variables.  The
-following command will set the JAVA_HOME environment variable:
-
-{deck:id=unpack tomcat}
-{card:label=Windows}{noformat:nopanel=true}
-C:\>set JAVA_HOME =C:\your\java\installation
-
-    {deck}
-    
-# \[OPENEJB:Unix\]
- Make shell scripts executable
-    
-    For Unix users, the shell scripts in the Tomcat installation are not
-executable by default, so in order to execute them, you must set mark them
-as executable.	If you unpacked the Tomcat tar.gz file, the scripts are
-already executable.  The following command will make all shell scripts
-executable:
-    
-    {deck:id=unpack tomcat}
-    {card:label=Unix}{noformat:nopanel=true}
-    apache-tomcat-6.0.14$ chmod u+x bin/*.sh
-
-{deck}
-
-<a name="TomcatInstallation-StartTomcat"></a>
-# Start Tomcat
-
-Execute the following command to start the Tomcat server:
-
-{deck:id=Start Tomcat}
-{card:label=Windows}{noformat:nopanel=true}
-C:\>cd apache-tomcat-6.0.14\bin
-
-C:\apache-tomcat-6.0.14\bin>startup.bat
-Using CATALINA_BASE:   C:\apache-tomcat-6.0.14
-Using CATALINA_HOME:   C:\apache-tomcat-6.0.14
-Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp
-Using JRE_HOME:        C:\your\java\installation
-
-    {card:label=Unix}{noformat:nopanel=true}
-    $ cd apache-tomcat-6.0.14/bin
-    
-    apache-tomcat-6.0.14/bin$ ./startup.sh 
-    Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
-    Using JRE_HOME:        /your/java/installation
-
-{deck}
-
-*NOTE:* Your output will be different from the example above due to
-differences in installation location.
-
-<a name="TomcatInstallation-VerifyTomcatisRunning"></a>
-# Verify Tomcat is Running
-
-Visit [http://localhost:8080/](http://localhost:8080/)
- and you should see the Tomcat welcome page.
-
-
-<a name="TomcatInstallation-StopTomcat"></a>
-# Stop Tomcat
-
-Shutdown Tomcat by executing the following command:
-
-{deck:id=Start Tomcat}
-{card:label=Windows}{noformat:nopanel=true}
-C:\apache-tomcat-6.0.14\bin>shutdown.bat
-Using CATALINA_BASE:   C:\apache-tomcat-6.0.14
-Using CATALINA_HOME:   C:\apache-tomcat-6.0.14
-Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp
-Using JRE_HOME:        C:\your\java\installation
-
-    {card:label=Unix}{noformat:nopanel=true}
-    apache-tomcat-6.0.14/bin$ ./shutdown.sh 
-    Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
-    Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
-    Using JRE_HOME:        /your/java/installation
-
-{deck}
-
-*NOTE:* Your output will be different from the example above due to
-differences in installation locations.
diff --git a/src/main/jbake/content/tomcat-java-ee.adoc b/src/main/jbake/content/tomcat-java-ee.adoc
new file mode 100644
index 0000000..07b9360
--- /dev/null
+++ b/src/main/jbake/content/tomcat-java-ee.adoc
@@ -0,0 +1,7 @@
+= Tomcat Java EE
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-java-ee.md b/src/main/jbake/content/tomcat-java-ee.md
deleted file mode 100644
index c25b1bd..0000000
--- a/src/main/jbake/content/tomcat-java-ee.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Title: Tomcat Java EE
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
-
-{include:apache-tomee.mdtext}
diff --git a/src/main/jbake/content/tomcat-javaee.adoc b/src/main/jbake/content/tomcat-javaee.adoc
new file mode 100644
index 0000000..6e9d8dc
--- /dev/null
+++ b/src/main/jbake/content/tomcat-javaee.adoc
@@ -0,0 +1,7 @@
+= Tomcat JavaEE
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-javaee.md b/src/main/jbake/content/tomcat-javaee.md
deleted file mode 100644
index f02a02f..0000000
--- a/src/main/jbake/content/tomcat-javaee.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Title: Tomcat JavaEE
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
-
-{include:apache-tomee.mdtext}
diff --git a/src/main/jbake/content/tomcat-jaxrs.adoc b/src/main/jbake/content/tomcat-jaxrs.adoc
new file mode 100644
index 0000000..f3c02bf
--- /dev/null
+++ b/src/main/jbake/content/tomcat-jaxrs.adoc
@@ -0,0 +1,8 @@
+= Tomcat JAX-RS
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+With TomEE you get Tomcat with JAX-RS added and integrated and ready to go!
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-jaxrs.md b/src/main/jbake/content/tomcat-jaxrs.md
deleted file mode 100644
index 2429ded..0000000
--- a/src/main/jbake/content/tomcat-jaxrs.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Title: Tomcat JAX-RS
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.  With TomEE you get Tomcat with JAX-RS added and integrated and ready to go!
-
-{include:apache-tomee.mdtext}
\ No newline at end of file
diff --git a/src/main/jbake/content/tomcat-jaxws.adoc b/src/main/jbake/content/tomcat-jaxws.adoc
new file mode 100644
index 0000000..897af04
--- /dev/null
+++ b/src/main/jbake/content/tomcat-jaxws.adoc
@@ -0,0 +1,8 @@
+= Tomcat JAX-WS
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+With TomEE you get Tomcat with JAX-WS added and integrated and ready to go!
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-jaxws.md b/src/main/jbake/content/tomcat-jaxws.md
deleted file mode 100644
index 60d9e9c..0000000
--- a/src/main/jbake/content/tomcat-jaxws.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Title: Tomcat JAX-WS
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.  With TomEE you get Tomcat with JAX-WS added and integrated and ready to go!
-
-{include:apache-tomee.mdtext}
\ No newline at end of file
diff --git a/src/main/jbake/content/tomcat-jms.adoc b/src/main/jbake/content/tomcat-jms.adoc
new file mode 100644
index 0000000..b60fa30
--- /dev/null
+++ b/src/main/jbake/content/tomcat-jms.adoc
@@ -0,0 +1,59 @@
+= Tomcat JMS
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+With TomEE you get Tomcat with JMS added and integrated and ready to go!
+
+In a plain Servlet, Filter or Listener you can do fun things like injection of JMS Topics or Queues:
+
+....
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServlet;
+import javax.jms.Topic;
+import javax.jms.Queue;
+import javax.jms.ConnectionFactory;
+
+public class MyServet extends HttpServlet {
+
+    @Resource(name = "foo")
+    private Topic fooTopic;
+
+    @Resource(name = "bar")
+    private Queue barQueue;
+
+    @Resource
+    private ConnectionFactory connectionFactory;
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        //...
+
+        Connection connection = connectionFactory.createConnection();
+        connection.start();
+
+        // Create a Session
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        // Create a MessageProducer from the Session to the Topic or Queue
+        MessageProducer producer = session.createProducer(fooTopic);
+        producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+        // Create a message
+        TextMessage message = session.createTextMessage("Hello World!");
+
+        // Tell the producer to send the message
+        producer.send(message);
+
+        //...
+    }
+
+}
+....
+
+No need to add even a single library!
+In the above scenario even the "foo" Topic and the "bar" Queue would be automatically created with no configuration necessary.
+
+xref:download-ng.adoc[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat.
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-jms.md b/src/main/jbake/content/tomcat-jms.md
deleted file mode 100644
index 655dc99..0000000
--- a/src/main/jbake/content/tomcat-jms.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Title: Tomcat JMS
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.  With TomEE you get Tomcat with JMS added and integrated and ready to go!
-
-In a plain Servlet, Filter or Listener you can do fun things like injection of JMS Topics or Queues:
-
-    import javax.annotation.Resource;
-    import javax.servlet.http.HttpServlet;
-    import javax.jms.Topic;
-    import javax.jms.Queue;
-    import javax.jms.ConnectionFactory;
-
-    public class MyServet extends HttpServlet {
-
-        @Resource(name = "foo")
-        private Topic fooTopic;
-
-        @Resource(name = "bar")
-        private Queue barQueue;
-
-        @Resource
-        private ConnectionFactory connectionFactory;
-
-        @Override
-        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-            //...
-
-            Connection connection = connectionFactory.createConnection();
-            connection.start();
-
-            // Create a Session
-            Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            // Create a MessageProducer from the Session to the Topic or Queue
-            MessageProducer producer = session.createProducer(fooTopic);
-            producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
-            // Create a message
-            TextMessage message = session.createTextMessage("Hello World!");
-
-            // Tell the producer to send the message
-            producer.send(message);
-
-            //...
-        }
-
-    }
-
-No need to add even a single library!  In the above scenario even the "foo" Topic and the "bar" Queue would be automatically created with no configuration necessary.
-
-[Download](downloads.html) TomEE and you're minutes away from a functioning JMS application on Tomcat.
-
-{include:apache-tomee.mdtext}
\ No newline at end of file
diff --git a/src/main/jbake/content/tomcat-jpa.adoc b/src/main/jbake/content/tomcat-jpa.adoc
new file mode 100644
index 0000000..a9337e1
--- /dev/null
+++ b/src/main/jbake/content/tomcat-jpa.adoc
@@ -0,0 +1,67 @@
+= Tomcat JPA
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+With TomEE you get Tomcat with JPA added and integrated and ready to go!
+
+In a plain Servlet, Filter or Listener you can do fun things like injection of JPA EntityManager or EntityManagerFactory:
+
+....
+import javax.annotation.Resource;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.servlet.http.HttpServlet;
+import javax.transaction.UserTransaction;
+
+public class MyServet extends HttpServlet {
+
+    @Resource
+    private UserTransaction userTransaction;
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        //...
+
+        userTransaction.begin();
+
+        try {
+            entityManager.persist(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+            entityManager.persist(new Movie("Joel Coen", "Fargo", 1996));
+            entityManager.persist(new Movie("Joel Coen", "The Big Lebowski", 1998));
+        } finally {
+            userTransaction.commit();
+        }
+
+        //...
+    }
+
+}
+....
+
+No need to add even a single library!
+To make the above work all you need is a `WEB-INF/persistence.xml` file in your webapp like the following:
+
+....
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+
+  <persistence-unit name="movie-unit">
+    <jta-data-source>movieDatabase</jta-data-source>
+    <non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
+
+    <properties>
+      <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+    </properties>
+  </persistence-unit>
+</persistence>
+....
+
+DataSources will automatically be created if they haven't be configured explicitly.
+
+xref:download-ng.adoc[Download] TomEE and you're minutes away from a functioning JPA application on Tomcat.
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-jpa.md b/src/main/jbake/content/tomcat-jpa.md
deleted file mode 100644
index 3b75a4d..0000000
--- a/src/main/jbake/content/tomcat-jpa.md
+++ /dev/null
@@ -1,59 +0,0 @@
-Title: Tomcat JPA
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.  With TomEE you get Tomcat with JPA added and integrated and ready to go!
-
-In a plain Servlet, Filter or Listener you can do fun things like injection of JPA EntityManager or EntityManagerFactory:
-
-    import javax.annotation.Resource;
-    import javax.persistence.EntityManager;
-    import javax.persistence.PersistenceContext;
-    import javax.servlet.http.HttpServlet;
-    import javax.transaction.UserTransaction;
-
-    public class MyServet extends HttpServlet {
-
-        @Resource
-        private UserTransaction userTransaction;
-
-        @PersistenceContext
-        private EntityManager entityManager;
-
-
-        @Override
-        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-            //...
-
-            userTransaction.begin();
-
-            try {
-                entityManager.persist(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
-                entityManager.persist(new Movie("Joel Coen", "Fargo", 1996));
-                entityManager.persist(new Movie("Joel Coen", "The Big Lebowski", 1998));
-            } finally {
-                userTransaction.commit();
-            }
-
-            //...
-        }
-
-    }
-
-No need to add even a single library!  To make the above work all you need is a `WEB-INF/persistence.xml` file in your webapp like the following:
-
-    <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
-
-      <persistence-unit name="movie-unit">
-        <jta-data-source>movieDatabase</jta-data-source>
-        <non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
-
-        <properties>
-          <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
-        </properties>
-      </persistence-unit>
-    </persistence>
-
-DataSources will automatically be created if they haven't be configured explicitly.
-
-[Download](downloads.html) TomEE and you're minutes away from a functioning JPA application on Tomcat.
-
-{include:apache-tomee.mdtext}
\ No newline at end of file
diff --git a/src/main/jbake/content/tomcat-jsf.adoc b/src/main/jbake/content/tomcat-jsf.adoc
new file mode 100644
index 0000000..c31db8a
--- /dev/null
+++ b/src/main/jbake/content/tomcat-jsf.adoc
@@ -0,0 +1,8 @@
+= Tomcat CDI
+:jbake-type: page
+:jbake-status: published
+
+Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
+With TomEE you get Tomcat with JSF added and integrated and ready to go!
+
+include::apache-tomee.adoc[leveloffset=+1]
diff --git a/src/main/jbake/content/tomcat-jsf.md b/src/main/jbake/content/tomcat-jsf.md
deleted file mode 100644
index 536c5a4..0000000
--- a/src/main/jbake/content/tomcat-jsf.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Title: Tomcat CDI
-
-Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.  With TomEE you get Tomcat with JSF added and integrated and ready to go!
-
-{include:apache-tomee.mdtext}
\ No newline at end of file
diff --git a/src/main/jbake/content/tomcat-object-factory.adoc b/src/main/jbake/content/tomcat-object-factory.adoc
new file mode 100644
index 0000000..db2bd54
--- /dev/null
+++ b/src/main/jbake/content/tomcat-object-factory.adoc
@@ -0,0 +1,10 @@
+= Tomcat Object Factory
+:index-group: Unrevised
+:jbake-date: 2018-12-05
+:jbake-type: page
+:jbake-status: published
+
+_The TomcatEjbFactory as discussed in the link:http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html[OnJava article "OpenEJB: EJB for Tomcat"]  is no longer required._
+
+As of OpenEJB 3.0 references from Servlets to EJBs happen automatically with usage of the xref:{common-vc}::injection-of-other-ejbs-example.adoc[@EJB annotation]  in the Servlet, Filter or Listener or with the ejb-ref or ejb-local-ref declared in the web.xml.
+See the xref:{common-vc}::tomcat.adoc[Tomcat Integration] page for the most up-to-date details on using OpenEJB inside Tomcat.
diff --git a/src/main/jbake/content/tomcat-object-factory.md b/src/main/jbake/content/tomcat-object-factory.md
deleted file mode 100644
index 1a3c77e..0000000
--- a/src/main/jbake/content/tomcat-object-factory.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: Tomcat Object Factory
-*The TomcatEjbFactory as discussed in the [OnJava article "OpenEJB: EJB for Tomcat"](http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html)
- is no longer required.*
-
-As of OpenEJB 3.0 references from Servlets to EJBs happen automatically
-with usage of the [@EJB annotation](openejbx30:injection-of-other-ejbs-example.html)
- in the Servlet, Filter or Listener or with the <ejb-ref> or
-<ejb-local-ref> declared in the web.xml.
-
-See the [Tomcat Integration](openejbx30:tomcat.html)
- page for the most up-to-date details on using OpenEJB inside Tomcat.
-
diff --git a/src/main/jbake/content/tomcat.adoc b/src/main/jbake/content/tomcat.adoc
new file mode 100644
index 0000000..ebb4449
--- /dev/null
+++ b/src/main/jbake/content/tomcat.adoc
@@ -0,0 +1,98 @@
+= Tomcat
+:jbake-type: page
+:jbake-status: published
+
+== Introduction
+
+The OpenEJB plugin for Tomcat makes all of the OpenEJB features available to Servlets, including:
+
+* @Annotations ** @Resource ** @PersistenceUnit ** @PersistenceContext ** @EJB
+* JPA - Java Persistence Architecture
+* JMS - Java Messaging Service
+* JTA - Transaction Processing ** TransactionManager ** Container Managed Transactions ** XA Support
+* JavaMail
+
+In addition, WAR files can contain EJB modules and JPA persistence units eliminating the annoying construction of .ear files.
+Adding EJBs and JPA Persistence beans to your application is as simple as adding the @Stateless, @Stateful, @MessageDriven or @Entity to a class.
+The packaging is refered to as xref:collapsed-ear.adoc[Collapsed EAR]  style as the war file, ejb jar, and persistence unit files are merged into one archive and share the same classloader.
+
+_Requirements:_
+
+* OpenEJB 3.x
+* Tomcat 6.x or 5.5
+* Java 1.5 or 1.6
+
+== Installation for the Impatient
+
+Assuming you have a xref:tomcat-installation.adoc[normal working Tomcat 6.x or 5.5 installation] :
+
+. Download xref:download-ng.adoc[openejb.war]
+. Copy openejb.war to ${catalina.base}/webapps/openejb.war (Note: the file _must_ be named openejb.war)
+. Start Tomcat if it is not already running
+. (optional) Visit http://localhost:8080/openejb/installer  and click the 'install' button
+
+== Examples, Tutorials and Tests
+
+=== ejb-examples.war
+
+See the webapps/ejb-examples/ directory in the xref:download-ng.adoc[openejb-examples zip] .
+
+== Problems?
+
+=== HTTP Status 403
+
+Did you get a "HTTP Status 403" error page containing the description "Access to the specified resource () has been forbidden." when visiting http://localhost:8080/openejb ?
+
+The openejb.war is protected by a Tomcat valve that restricts access to the application to the computer on which Tomcat is running.
+If your browser is running on the same computer as Tomcat, try accessing OpenEJB using this link instead http://127.0.0.1:8080/openejb .
+
+If you want to access the openejb.war from another computer, you will need to either remove the valve, or modify the IP list in the valve declaration.
+
+The easiest way to remove the valve it to simply delete the webapps/openejb/META-INF/context.xml file and the webapps/openejb.war file _while Tomcat is stopped_.
+Warning that Tomcat keeps a copy of all context.xml files under conf/Catalina/localhost/+++<appname>+++.xml, so you may need to delete the conf/Catalina/localhost/openejb.xml file as well.
+The openejb.war file must be removed because some versions of Tomcat will use the context.xml file packed in the openejb.war file regardless of what is in the unpacked directory.+++</appname>+++
+
+=== DuplicateDeploymentIdException:
+
+If you try to deploy the same ejb in two different web applications, then you will get the following exception (in conf/openejb.log):
+
+ org.apache.openejb.DuplicateDeploymentIdException: Application cannot be deployed as it contains deployment-ids which are in use:
+
+To fix the issue, do the following:
+
+. Create a file named system.properties under the conf directory
+. Add the following to the system.properties file and save
++
+openejb.deploymentId.format=\{moduleId}/\{ejbName}
+
+=== java.lang.OutOfMemoryError: PermGen space
+
+By default, the JVM starts with a small PermGen.
+Tomcat does not increase this limit, so you may encounter this exception by the time Tomcat deploys and executes your application.
+If you get this exception, you should consider increasing the PermGen allocation for the Tomcat JVM.
+You can achieve this by adding "-XX:MaxPermSize=256m" to the CATALINA_OPTS environment variable before starting Tomcat.
+
+=== Other Issues
+
+If you are having problems with the installation, please send a message to the OpenEJB users xref:mailing-lists.adoc[mailing list]  containing any error message(s) and the following information:
+
+* OpenEJB Version
+* Tomcat Version
+* Java Version (execute java -version)
+* Operating System Type and Version
+
+== Limitations
+
+_JavaAgent_ - OpenEJB uses OpenJPA to provide JPA and CMP persistence, and OpenJPA currently requires a JavaAgent to function properly.
+This requirement is something that the OpenJPA project is working on removing.
+Once removed, the OpenEJB plugin for Tomcat will no longer need to modify the startup shell scripts and you will not need to restart Tomcat after the OpenEJB installation.
+
+== Misc
+
+This document is a starting point for using OpenEJB in Tomcat and will evolve based on user contributions.
+If you wish to contribute to this document, feel very welcome to click the 'Edit' link in the lower right and make changes and add new HOWTO's and other docs.
+
+== JSF Injection Support
+
+Now you can inject EJB's into JSF managed beans.
+Currently we have tested with JSF 1.2 RI (Mojarra) and MyFaces v1.2.3 . We would definitely appreciate any feedback on other JSF implementations.
diff --git a/src/main/jbake/content/tomcat.md b/src/main/jbake/content/tomcat.md
deleted file mode 100644
index 517131d..0000000
--- a/src/main/jbake/content/tomcat.md
+++ /dev/null
@@ -1,144 +0,0 @@
-Title: Tomcat
-
-<a name="Tomcat-Introduction"></a>
-# Introduction
-
-The OpenEJB plugin for Tomcat makes all of the OpenEJB features available
-to Servlets, including:
-
- * @Annotations
-   ** @Resource
-   ** @PersistenceUnit
-   ** @PersistenceContext
-   ** @EJB
- * JPA - Java Persistence Architecture
- * JMS - Java Messaging Service
- * JTA - Transaction Processing
-   ** TransactionManager
-   ** Container Managed Transactions
-   ** XA Support
- * JavaMail
-
-In addition, WAR files can contain EJB modules and JPA persistence units
-eliminating the annoying construction of .ear files.  Adding EJBs and JPA
-Persistence beans to your application is as simple as adding the
-@Stateless, @Stateful, @MessageDriven or @Entity to a class.  The packaging
-is refered to as [OPENEJB:Collapsed EAR](openejb:collapsed-ear.html)
- style as the war file, ejb jar, and persistence unit files are merged into
-one archive and share the same classloader.
-
-*Requirements:*
- * OpenEJB 3.x
- * Tomcat 6.x or 5.5
- * Java 1.5 or 1.6
-
-<a name="Tomcat-{anchor:quickinstructions}InstallationfortheImpatient"></a>
-# Installation for the Impatient
-
-Assuming you have a [normal working Tomcat 6.x or 5.5 installation](tomcat-installation.html)
-:
-
-1. Download [openejb.war](openejb:download.html)
-1. Copy openejb.war to $\{catalina.base\}/webapps/openejb.war (Note: the
-file *must* be named openejb.war)
-1. Start Tomcat if it is not already running
-1. (optional) Visit [http://localhost:8080/openejb/installer](http://localhost:8080/openejb/installer)
- and click the 'install' button
-
-<a name="Tomcat-Examples,TutorialsandTests"></a>
-# Examples, Tutorials and Tests
-
-<a name="Tomcat-ejb-examples.war"></a>
-## ejb-examples.war
-
-See the webapps/ejb-examples/ directory in the [openejb-examples zip](openejb:download.html)
-.
-
-<a name="Tomcat-{anchor:problems}Problems?"></a>
-#Problems?
-
-<a name="Tomcat-HTTPStatus403"></a>
-## HTTP Status 403 
-
-Did you get a "HTTP Status 403" error page containing the description
-"Access to the specified resource () has been forbidden." when visiting [http://localhost:8080/openejb](http://localhost:8080/openejb)
-?
-
-The openejb.war is protected by a Tomcat valve that restricts access to the
-application to the computer on which Tomcat is running.  If your browser is
-running on the same computer as Tomcat, try accessing OpenEJB using this
-link instead [http://127.0.0.1:8080/openejb](http://127.0.0.1:8080/openejb)
-.
-
-If you want to access the openejb.war from another computer, you will need
-to either remove the valve, or modify the IP list in the valve declaration.
-
-The easiest way to remove the valve it to simply delete the
-webapps/openejb/META-INF/context.xml file and the webapps/openejb.war file
-*while Tomcat is stopped*.  Warning that Tomcat keeps a copy of all
-context.xml files under conf/Catalina/localhost/<appname>.xml, so you may
-need to delete the conf/Catalina/localhost/openejb.xml file as well.  The
-openejb.war file must be removed because some versions of Tomcat will use
-the context.xml file packed in the openejb.war file regardless of what is
-in the unpacked directory.
-
-<a name="Tomcat-DuplicateDeploymentIdException:"></a>
-## DuplicateDeploymentIdException:
-If you try to deploy the same ejb in two different web applications, then
-you will get the following exception (in conf/openejb.log):
-
-    org.apache.openejb.DuplicateDeploymentIdException: Application cannot be
-deployed as it contains deployment-ids which are in use: 
-
-To fix the issue, do the following:
-1. Create a file named system.properties under the conf directory
-1. Add the following to the system.properties file and save
-
-    openejb.deploymentId.format={moduleId}/{ejbName}
-
-
-<a name="Tomcat-java.lang.OutOfMemoryError:PermGenspace"></a>
-## java.lang.OutOfMemoryError: PermGen space 
-By default, the JVM starts with a small PermGen. Tomcat does not increase
-this limit, so you may encounter this exception by the time Tomcat deploys
-and executes your application. If you get this exception, you should
-consider increasing the PermGen allocation for the Tomcat JVM. You can
-achieve this by adding "-XX:MaxPermSize=256m" to the CATALINA_OPTS
-environment variable before starting Tomcat.
-
-<a name="Tomcat-OtherIssues"></a>
-## Other Issues
-
-If you are having problems with the installation, please send a message to
-the OpenEJB users [mailing list](openejb:mailing-lists.html)
- containing any error message(s) and the following information:
-
-* OpenEJB Version
-* Tomcat Version
-* Java Version (execute java -version)
-* Operating System Type and Version
-
-
-<a name="Tomcat-Limitations"></a>
-# Limitations
-
- *JavaAgent* - OpenEJB uses OpenJPA to provide JPA and CMP persistence, and
-OpenJPA currently requires a JavaAgent to function properly.  This
-requirement is something that the OpenJPA project is working on removing. 
-Once removed, the OpenEJB plugin for Tomcat will no longer need to modify
-the startup shell scripts and you will not need to restart Tomcat after the
-OpenEJB installation.
-
-<a name="Tomcat-Misc"></a>
-# Misc
-
-This document is a starting point for using OpenEJB in Tomcat and will
-evolve based on user contributions. If you wish to contribute to this
-document, feel very welcome to click the 'Edit' link in the lower right and
-make changes and add new HOWTO's and other docs.  
-
-<a name="Tomcat-JSFInjectionSupport"></a>
-# JSF Injection Support
-Now you can inject EJB's into JSF managed beans. Currently we have tested
-with JSF 1.2 RI (Mojarra) and MyFaces v1.2.3 . We would definitely
-appreciate any feedback on other JSF implementations. 
diff --git a/src/main/jbake/content/tomee-1.0.0-beta-1.adoc b/src/main/jbake/content/tomee-1.0.0-beta-1.adoc
new file mode 100644
index 0000000..0e5630a
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.0.0-beta-1.adoc
@@ -0,0 +1,50 @@
+= Downloads
+:jbake-type: page
+:jbake-status: published
+
+* Release Date: October 6th, 2011
+
+== Java EE6 Certified
+
+=== Apache TomEE Web Profile
+
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.tar.gz[apache-tomee-1.0.0-beta-1-webprofile.tar.gz] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.tar.gz.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.tar.gz.md5[md5])
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip[apache-tomee-1.0.0-beta-1-webprofile.zip] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip.md5[md5])
+
+
+
+== NOT Java EE6 Certified
+
+
+
+=== Apache TomEE Plus
+
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.tar.gz[apache-tomee-1.0.0-beta-1-plus.tar.gz] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.tar.gz.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.tar.gz.md5[md5])
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip[apache-tomee-1.0.0-beta-1-plus.zip] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip.md5[md5])
+
+=== Apache Tomcat Drop-in wars
+
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war[openejb-tomcat-webapp-4.0.0-beta-1.war] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war.md5[md5])
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-plus-webapp-4.0.0-beta-1.war[openejb-tomcat-plus-webapp-4.0.0-beta-1.war] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-plus-webapp-4.0.0-beta-1.war.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-plus-webapp-4.0.0-beta-1.war.md5[md5])
+
+=== Apache OpenEJB Standalone Server
+
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz[openejb-standalone-4.0.0-beta-1.tar.gz] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz.md5[md5])
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip[openejb-standalone-4.0.0-beta-1.zip] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip.md5[md5])
+
+=== Source and Examples
+
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip[openejb-4.0.0-beta-1-source-release.zip] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip.md5[md5])
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz[examples-4.0.0-beta-1-src.tar.gz] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz.md5[md5])
+* http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip[examples-4.0.0-beta-1-src.zip] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip.md5[md5])
+
+=== Previous Release
+
+* http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4.zip[openejb-3.1.4.zip]
+* http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4.tar.gz[openejb-3.1.4.tar.gz]
+* http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4-src.tar.gz[openejb-3.1.4-src.tar.gz]
+* http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4-src.zip[openejb-3.1.4-src.zip]
+
+=== Old releases archive
+
+http://archive.apache.org/dist/openejb/[OpenEJB releases archive]
diff --git a/src/main/jbake/content/tomee-1.0.0-beta-1.md b/src/main/jbake/content/tomee-1.0.0-beta-1.md
deleted file mode 100644
index 9b19829..0000000
--- a/src/main/jbake/content/tomee-1.0.0-beta-1.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Title: Downloads
-
-
-
-* Release Date: October 6th, 2011
-
-
-{page-header
-# <small>Java EE6 Certified</small>
-}
-
-## Apache TomEE Web Profile
-
- * [apache-tomee-1.0.0-beta-1-webprofile.tar.gz](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.tar.gz) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.tar.gz.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.tar.gz.md5))
- * [apache-tomee-1.0.0-beta-1-webprofile.zip](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip.md5))
-
-
-{page-header
-# <small>NOT Java EE6 Certified</small>
-}
-
-## Apache TomEE Plus
-
- * [apache-tomee-1.0.0-beta-1-plus.tar.gz](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.tar.gz) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.tar.gz.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.tar.gz.md5))
- * [apache-tomee-1.0.0-beta-1-plus.zip](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip.md5))
-
-## Apache Tomcat Drop-in wars
-
- * [openejb-tomcat-webapp-4.0.0-beta-1.war](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war.md5))
- * [openejb-tomcat-plus-webapp-4.0.0-beta-1.war](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-plus-webapp-4.0.0-beta-1.war) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-plus-webapp-4.0.0-beta-1.war.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-plus-webapp-4.0.0-beta-1.war.md5))
-
-## Apache OpenEJB Standalone Server
-
- * [openejb-standalone-4.0.0-beta-1.tar.gz](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz.md5))
- * [openejb-standalone-4.0.0-beta-1.zip](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip.md5))
-
-
-## Source and Examples
-
- * [openejb-4.0.0-beta-1-source-release.zip](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip.md5))
- * [examples-4.0.0-beta-1-src.tar.gz](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz.md5))
- * [examples-4.0.0-beta-1-src.zip](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip) ([asc](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip.asc) [md5](http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip.md5))
-
-
-## Previous Release
-
- *    [openejb-3.1.4.zip](http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4.zip)
- *    [openejb-3.1.4.tar.gz](http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4.tar.gz)
- *    [openejb-3.1.4-src.tar.gz](http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4-src.tar.gz)
- *    [openejb-3.1.4-src.zip](http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4-src.zip)
-
-## Old releases archive
-[OpenEJB releases archive](http://archive.apache.org/dist/openejb/)
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-1.0.0-beta2-release-notes.adoc b/src/main/jbake/content/tomee-1.0.0-beta2-release-notes.adoc
new file mode 100644
index 0000000..450031a
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.0.0-beta2-release-notes.adoc
@@ -0,0 +1,168 @@
+= Apache TomEE 1.0.0-beta-2 Release Notes
+:jbake-type: page
+:jbake-status: published
+
+
+2012-01-23
+
+== Upgrades
+
+[.compact]
+  * [TOMEE-81] Upgrade HSQLDB to 2.2.4
+  * [TOMEE-109] Upgrade to XBean 3.9
+  * [TOMEE-112] Upgrade wss4j to 1.6.3
+  * [TOMEE-117] Upgrade OpenWebBeans to 1.1.3
+  * [TOMEE-118] Upgrade CXF to 2.5.1
+  * [TOMEE-119] Upgrade ActiveMQ to 5.5.1
+  * [TOMEE-113] Upgrade Commons Fileupload to 1.2.2
+  * [TOMEE-114] Upgrade Commons Discovery to 0.5
+  * [TOMEE-116] Upgrade Commons Pool to 1.5.7
+
+== New Features
+
+[.compact]
+  * [TOMEE-6] Arquillian adapter
+  * [TOMEE-84] TomEE Embedded Container
+  * [TOMEE-86] Implementation of EJBContainer.createEJBContainer for TomEE Embedded
+  * [TOMEE-96] All-in-one TomEE Embedded jar
+  * [TOMEE-95] Command line 'java -jar tomee-embedded.jar myAwesome.war' launching
+  * [TOMEE-58] New concept of persistence-fragment.xml file
+  * [TOMEE-71] Ability to reload Persistence units via JMX
+  * [TOMEE-72] Example: Reloading Persistence unit properties dynamically
+  * [TOMEE-104] Allow custom JAX-RS providers to be used
+  * [TOMEE-99] Example: CDI @Alternative and @Stereotype
+  * [TOMEE-101] Example: CDI Events and @Observes
+  * [TOMEE-97] Beginning documentation for Meta-Annotation support
+  * [TOMEE-37] TomEE webapps based Deployer implementation
+  * [OPENEJB-1454] Meta Annotation Support
+  * [OPENEJB-1691] Dynamic @Proxy beans
+  * [OPENEJB-1430] Scanning an JMX Registration of @ObjectName mbeans in applications
+  * [OPENEJB-1737] Example: Dynamic JMX MBean example
+  * [OPENEJB-1517] EJBContainer.createEJBContainer MODULES supports various org.apache.openejb.jee.* types
+  * [OPENEJB-1571] CDI Injection for clients of EJBContainer and tests using ApplicationComposer
+  * [OPENEJB-1706] CDI Injection support for MDBs
+  * [OPENEJB-1744] Example: MDBs as CDI beans
+  * [OPENEJB-1654] System property overrides for MDB ActivationConfig
+  * [OPENEJB-1690] Ability to define DataSources, Topics, Queues and other resources in applications with a META-INF/resources.xml file
+  * [OPENEJB-1453] Metatyping for EJB and Dependency Injection Annotations
+  * [OWB-621] Alternative configuration method for buggy container or pre servlet api 2.5 container
+
+== Improvements
+
+[.compact]
+  * [TOMEE-102] Cleaned up error handling of closed jars at shutdown
+  * [TOMEE-107] Reduced logging of harmless "Could not install our singleton service" message
+  * [TOMEE-106] Better handling of DataSource "maxWait" property, supports ints
+  * [TOMEE-108] Smarter default of Log4j, Slf4j and JULI logging implementation selection
+  * [TOMEE-100] Trim internal objects from logging
+  * [TOMEE-93] Ensure JAX-RS @HeaderParam matching is case insensitive 
+  * [TOMEE-91] Improved error handling and resolving of REST @Path URLs
+  * [TOMEE-82] SQLLoginModule support for HSQLDB 2.x
+  * [TOMEE-83] Improved ability to imply type of <env-entry>
+  * [TOMEE-87] Expanded scope of Global JNDI
+  * [TOMEE-123] Eliminate webapp lib scanning from known libs
+  * [TOMEE-73] Example: JAX-RS example with Application
+  * [TOMEE-60] More Optimization in scanning of webapp libs
+  * [OPENEJB-1746] More helpful information on ConcurrentAccessTimeoutException
+  * [OPENEJB-48] Log the location of the openejb.conf file being used
+  * [OPENEJB-1747] Avoid NPE when a custom mdb container uses badly defined activation properties
+  * [OPENEJB-1749] Better logging of @Stateful @PreDestroy exceptions
+  * [OPENEJB-1701] Improved Multipoint and Multicast discovery logging
+  * [OPENEJB-1750] Improved documentation on Windows Service installer
+  * [OPENEJB-1700] deploying rest ejb as ejb when it is returned by Application.getClasses()/getSingletons()
+  * [OPENEJB-1754] Reduce logging of failed security checks due to being unauthorized
+  * [OPENEJB-1753] New 'openejb.descriptors.output.folder' property for location of generated descriptors
+  * [OPENEJB-1722] manage JtaPlatform instead of TransactionManagerLookup when hibernate 4 as JPA provider
+  * [OPENEJB-1752] Tolerate toString() issues with ejb method return values when logging on DEBUG
+  * [OPENEJB-1751] Ability to deactivate all internal JMX MBeans
+  * [OPENEJB-1742] Respect 'openjpa.Specification' persistence.xml property
+  * [OPENEJB-1743] Better MDB/CDI support 
+  * [OPENEJB-1741] Faster jar scanning at deploy
+  * [OPENEJB-1699] managing @ApplicationPath for rest
+  * [OPENEJB-1738] MDB Queue/Topic name defaults to MappedName
+  * [OPENEJB-1715] Add ServiceTracker in Activator class to wait till we find the ServiceManagerProxy
+  * [OWB-623] Relax check on @AroundInvoke Interceptors 'throws Exception' 
+  * [OWB-627] Automatically destroy @Dependent contextual instances created with Instance<T>
+  * [OWB-475] support for optional beans
+
+== Bugs
+
+[.compact]
+  * [TOMEE-56] jsp group properties order not respected
+  * [TOMEE-103] Further reduction of possible LinkageError in log files
+  * [TOMEE-105] fixing contextroot in TomcatWebAppBuilder for windows
+  * [TOMEE-51] Deployment without web.xml not possible. With web.xml, tests do not run.
+  * [TOMEE-11] conf/logging.properties conflicts with juli configuration for Tomcat
+  * [TOMEE-10] JNDI Browser in the openejb.war does not show @LocalBean views as EJBs
+  * [TOMEE-94] context.xml ignored in internally created Tomcat StandardContexts
+  * [TOMEE-90] Fixed REST Service undeployment issue
+  * [TOMEE-98] Possible name conflict with internal "Comp" bean
+  * [TOMEE-47] ServletContext.getResource(path).getInputStream() fails
+  * [TOMEE-43] library-directory ignored
+  * [TOMEE-42] TCCL.getResources() returns duplicated when deploying with OpenEJB deployer
+  * [TOMEE-80] Avoid hibernate HHH015010 at startup
+  * [TOMEE-89] Fixed lifecycle issue in CDI BeforeBeanDiscovery
+  * [TOMEE-85] Fixed issues with rootUrl in persistence units of webapps
+  * [TOMEE-39] context.xml of WAR not loaded
+  * [TOMEE-88] Possible EL related issue prevents startup
+  * [TOMEE-30] OpenEJBLifecycle.startApplication brutly cast Object in StartupObject
+  * [TOMEE-33] seam-international-timeanddate fails to deploy
+  * [TOMEE-34] seam-remoting-helloworld fails to deploy
+  * [TOMEE-35] Unable to lookup BeanManager from JNDI
+  * [TOMEE-36] NullPointerException when Missing required persistence.xml for @PersistenceUnit
+  * [TOMEE-120] Fixed issue preventing serveral Web Service applications from being deployed simultaneously
+  * [TOMEE-77] Ignore REST Applications without default constructor
+  * [TOMEE-1] TomEE Beta 1.0.0 doesn't start with MyFaces CODI
+  * [TOMEE-27] UnknownModuleTypeException thrown when no-web.xml webapp deployed
+  * [TOMEE-76] Avoid NullPointerException in no-web.xml applications
+  * [TOMEE-29] Applications always seem to be refreshed/redployed
+  * [TOMEE-74] Fixed serialization issue with ValidationFactory references
+  * [TOMEE-79] Fixed "no root logger" warning
+  * [TOMEE-78] Issue finding openejb.war in Tomcat
+  * [TOMEE-110] Fixed Tomcat issue with JSF code/prelude ordering
+  * [TOMEE-111] Avoid overriting files in Tomcat installer if already installed
+  * [TOMEE-61] allow ROOT to contain rest service
+  * [TOMEE-115] Issue in OWB preventing CDI Extensions from adding Interceptors to EJBs
+  * [OPENEJB-1523] TomEE 6.0.26 / 3.1.4: NPE in org.apache.catalina.startup.HostConfig.manageApp
+  * [OPENEJB-1730] Reliability of multipoint discovery heartrates less than 1 second
+  * [OPENEJB-1745] Fix null pointer in discardInstance when releaseInstance has already been called
+  * [OPENEJB-1748] Fixed undeploy race condition
+  * [OPENEJB-1710] ClassCastException when deploying ear files containing persistence.xml
+  * [OPENEJB-1709] TomEE webapps (See rest-example) doesn't work under Windows (Path - Problem with backslash "\")
+  * [OPENEJB-1708] Servlet Injection
+  * [OPENEJB-1443] EntityManager in non-transactional business methods using queries can be used only once
+  * [OPENEJB-1729] Reliability of Multipoint remove event when last peer disappears
+  * [OPENEJB-1702] Multicast and Multipoint 'heart_rate' property ignored
+  * [OPENEJB-1704] undeploy or shutdown call ejbCreate() on stateless session beans
+  * [OPENEJB-1711] Multithreaded filling of @Stateless pools to PoolMin at bean startup
+  * [OPENEJB-1733] Parameters are not always available in custom interceptor when the bean is a webservice
+  * [OWB-620] any disabled bean of passivating scope will wrongly be detected as 'not passivatable'
+  * [OWB-622] beanmanager injection in afterBeanDiscovery method parameter
+  * [OWB-624] AnnotatedTypes registered in BeforeBeanDiscovery might get processed twice
+  * [OWB-615] remove @Overrides for interfaces to be java5 compatible
+  * [OWB-597] StackOverFlow when injecting product in same bean where @Produces is placed
+  * [OWB-589] " ... requires a passivation capable dependency ..." for producer method with return type String and non serializable injected dependency
+  * [OWB-616] javax.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
+  * [OWB-619] @New beans must only exist if there is at least one injection point for them 
+  * [OWB-618] we sometimes invoke a dispose method without having created the bean upfront
+  * [OWB-562] non-enabled alternative beans with passivating scope fail validation during deployment
+  * [OWB-630] AmbiguousResolutionException thrown for Decorators that Decorate multiple beans where any of those beans are passivation capable.
+  * [OWB-631] openwebbeans-resource misses openwebbeans.properties
+  * [OWB-565] missing check for producer methods
+  * [OWB-625] BeanManager.resolve throw java.util.NoSuchElementException with an empty set parameter
+  * [OWB-629] NoClassDefFoundError for optional dependencies
+  * [OWB-515] interceptors don't support inheritance without an overridden method annotated with @AroundInvoke
+
+== Tasks & Sub-Tasks
+
+[.compact]
+  * [TOMEE-31] upgrade hsqldb to version 2.2.4
+  * [TOMEE-122] WebService subcontext mapping adjustable with tomee.jaxws.subcontext property
+  * [TOMEE-121] WebServices mapped into /<webappcontext>/webservices/<name>
+  * [TOMEE-75] Resolve default persistence provider before Assembly
+  * [OPENEJB-1638] Add Readme.md files for examples 
+  * [OPENEJB-1723] Unit tests and changes for ActivationConfigOverride
+  * [OPENEJB-1755] Repackaging LocalInitialContextFactory into org.apache.openejb.core
+  * [OPENEJB-1697] TomEE related renaming
+  * [OPENEJB-1705] Example: Simple CDI Interceptor
+
diff --git a/src/main/jbake/content/tomee-1.5.0-release-notes.adoc b/src/main/jbake/content/tomee-1.5.0-release-notes.adoc
new file mode 100644
index 0000000..a8e571f
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.5.0-release-notes.adoc
@@ -0,0 +1,280 @@
+= Apache TomEE 1.5.0 Release Notes
+:jbake-type: page
+:jbake-status: published
+
+== Upgrades
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-243[TOMEE-243] HSQLDB 2.2.8
+* link:https://issues.apache.org/jira/browse/TOMEE-431[TOMEE-431] Shrinkwrap Descriptor 2.0.0-alpha-3
+* link:https://issues.apache.org/jira/browse/TOMEE-378[TOMEE-378] Quartz 2.1.6
+* link:https://issues.apache.org/jira/browse/TOMEE-271[TOMEE-271] Tomcat 7.0.30
+* link:https://issues.apache.org/jira/browse/TOMEE-365[TOMEE-365] OpenWebBeans 1.1.6
+* link:https://issues.apache.org/jira/browse/TOMEE-426[TOMEE-426] ActiveMQ 5.6.0
+* link:https://issues.apache.org/jira/browse/TOMEE-428[TOMEE-428] MyFaces 2.1.9
+* link:https://issues.apache.org/jira/browse/TOMEE-215[TOMEE-215] CXF 2.6.2
+* link:https://issues.apache.org/jira/browse/TOMEE-214[TOMEE-214] Arquillian 1.0.1
+* link:https://issues.apache.org/jira/browse/TOMEE-458[TOMEE-458] BVal 0.5
+* link:https://issues.apache.org/jira/browse/OPENEJB-1894[OPENEJB-1894] karaf 2.2.9
+
+== New Features
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-347[TOMEE-347] Allow switching datasource connection pool
+* link:https://issues.apache.org/jira/browse/TOMEE-331[TOMEE-331] Optimized scanning via exclusions.list in WEB-INF allows
+* link:https://issues.apache.org/jira/browse/TOMEE-266[TOMEE-266] Internal EJBs can be secured
+* link:https://issues.apache.org/jira/browse/TOMEE-264[TOMEE-264] Filter APIs we already provide if they are in a webapp
+* link:https://issues.apache.org/jira/browse/TOMEE-399[TOMEE-399] Expose Quartz through JMX
+* link:https://issues.apache.org/jira/browse/TOMEE-259[TOMEE-259] Mojarra integration
+* link:https://issues.apache.org/jira/browse/TOMEE-250[TOMEE-250] Element <Service> for declaring services generically in the tomee.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-386[TOMEE-386] Support for META-INF/module.properties file and overriding
+* link:https://issues.apache.org/jira/browse/TOMEE-387[TOMEE-387] Support for META-INF/application.properties file and overriding
+* link:https://issues.apache.org/jira/browse/TOMEE-280[TOMEE-280] Deploy-time JPA Enhancement
+* link:https://issues.apache.org/jira/browse/TOMEE-187[TOMEE-187] New TomEE JAX-RS Distribution
+* link:https://issues.apache.org/jira/browse/TOMEE-377[TOMEE-377] Configuration of CXF Bus
+* link:https://issues.apache.org/jira/browse/TOMEE-421[TOMEE-421] JMX management of DataSources
+* link:https://issues.apache.org/jira/browse/OPENEJB-1228[OPENEJB-1228] ShrinkWrap Deployment Support
+* link:https://issues.apache.org/jira/browse/OPENEJB-1899[OPENEJB-1899] Mockito integration
+
+== Improvements
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-235[TOMEE-235] ability to provide a custom server.xml using arquillian adapters
+* link:https://issues.apache.org/jira/browse/TOMEE-194[TOMEE-194] managing pathparam at class level
+* link:https://issues.apache.org/jira/browse/TOMEE-346[TOMEE-346] providing log4j in a webapp needs to set openejb.skip.log4j=false
+* link:https://issues.apache.org/jira/browse/TOMEE-191[TOMEE-191] can't use DataSourceRealm with a DataSource defined in tomee.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-348[TOMEE-348] propagate all cxf endpoint properties to the SOAP endpoint
+* link:https://issues.apache.org/jira/browse/TOMEE-190[TOMEE-190] Duplicate Libraries in distribution
+* link:https://issues.apache.org/jira/browse/TOMEE-146[TOMEE-146] Trim unused code
+* link:https://issues.apache.org/jira/browse/TOMEE-241[TOMEE-241] close webappclasslaoder after undeployment
+* link:https://issues.apache.org/jira/browse/TOMEE-336[TOMEE-336] ability to skip dbcp pool for @DataSourceDefinition
+* link:https://issues.apache.org/jira/browse/TOMEE-130[TOMEE-130] Improve openejb webapp console to match current site look and feel
+* link:https://issues.apache.org/jira/browse/TOMEE-230[TOMEE-230] tomee.sh uses old lib folder
+* link:https://issues.apache.org/jira/browse/TOMEE-332[TOMEE-332] yank tomee version from arquillian adapter config and use LATEST
+* link:https://issues.apache.org/jira/browse/TOMEE-330[TOMEE-330] more relevant error message when using tomee < tomee+ and webservice injection are done
+* link:https://issues.apache.org/jira/browse/TOMEE-269[TOMEE-269] use a maven specific logger when running tomee:run from tomee maven plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-328[TOMEE-328] Re organise Arquillian sub modules versionning
+* link:https://issues.apache.org/jira/browse/TOMEE-4[TOMEE-4] Example demonstrating Arquillian Adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-262[TOMEE-262] since TOMEE-261 is done we can check the needed JtaPlatform for hibernate is in the webapp
+* link:https://issues.apache.org/jira/browse/TOMEE-260[TOMEE-260] Validate: REST Service has no non-public resources
+* link:https://issues.apache.org/jira/browse/TOMEE-398[TOMEE-398] Unified Executor configuration options (@Asynchronous, @Timeout)
+* link:https://issues.apache.org/jira/browse/TOMEE-397[TOMEE-397] META-INF/resources.xml always needs qualified names
+* link:https://issues.apache.org/jira/browse/TOMEE-391[TOMEE-391] config for retry attemps on timer methods
+* link:https://issues.apache.org/jira/browse/TOMEE-257[TOMEE-257] replace deployment listener and webdeployementlistener by our brand new observer api
+* link:https://issues.apache.org/jira/browse/TOMEE-251[TOMEE-251] extract jpa provide integration in a jar to be able to use it from a war
+* link:https://issues.apache.org/jira/browse/TOMEE-252[TOMEE-252] engine name needs to be Catalina
+* link:https://issues.apache.org/jira/browse/TOMEE-253[TOMEE-253] updatechecker doesn't handle tomee version properly
+* link:https://issues.apache.org/jira/browse/TOMEE-382[TOMEE-382] configuration for asynch task pool
+* link:https://issues.apache.org/jira/browse/TOMEE-385[TOMEE-385] Complete application properties scoping
+* link:https://issues.apache.org/jira/browse/TOMEE-205[TOMEE-205] Create the skeleton of the new Tomee UI
+* link:https://issues.apache.org/jira/browse/TOMEE-208[TOMEE-208] add servlets to httpcontext (arquillian adapters)
+* link:https://issues.apache.org/jira/browse/TOMEE-204[TOMEE-204] Don't fail app deployment if a TLD class cannot be loaded
+* link:https://issues.apache.org/jira/browse/TOMEE-203[TOMEE-203] Ensure all tomee-* jars and archives use the TomEE version number
+* link:https://issues.apache.org/jira/browse/TOMEE-406[TOMEE-406] Support Duration syntax in all known time related properties
+* link:https://issues.apache.org/jira/browse/TOMEE-282[TOMEE-282] logging tomee is downloaded from arquillian adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-402[TOMEE-402] ScriptLoginModule
+* link:https://issues.apache.org/jira/browse/TOMEE-281[TOMEE-281] ignore endorsed lib for java 7
+* link:https://issues.apache.org/jira/browse/TOMEE-184[TOMEE-184] using cxf (and not our repackaged version)
+* link:https://issues.apache.org/jira/browse/TOMEE-183[TOMEE-183] Optimize Arquillian Adapter by avoiding intermediate jar creation
+* link:https://issues.apache.org/jira/browse/TOMEE-189[TOMEE-189] EAR and CDI is not well integrated
+* link:https://issues.apache.org/jira/browse/TOMEE-372[TOMEE-372] don't load webapp enrichment classes directly from system classloader even if available
+* link:https://issues.apache.org/jira/browse/TOMEE-374[TOMEE-374] Embedded TomEE use same defaults as Embedded OpenEJB
+* link:https://issues.apache.org/jira/browse/TOMEE-41[TOMEE-41] Overzealous class scanning
+* link:https://issues.apache.org/jira/browse/TOMEE-274[TOMEE-274] allowing the user to override the folder where retrieved tomee are cache in arquillian adapters (by default m2 repo is not used to avoid to corrupt it)
+* link:https://issues.apache.org/jira/browse/TOMEE-277[TOMEE-277] better model to be able to filter cdi beans
+* link:https://issues.apache.org/jira/browse/TOMEE-276[TOMEE-276] allow to define the same interceptor/decorator/alternative in multiple beans.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-270[TOMEE-270] don't stop deployment during deployment if a noclassdeffound if thrown on a field
+* link:https://issues.apache.org/jira/browse/TOMEE-273[TOMEE-273] solder @Requires doesn't work
+* link:https://issues.apache.org/jira/browse/TOMEE-171[TOMEE-171] TomEE automatically directs embedded (@DataSourceDefinition) h2 datasource to hsqldb
+* link:https://issues.apache.org/jira/browse/TOMEE-279[TOMEE-279] using tomcat default host instead of hardcoded "localhost"
+* link:https://issues.apache.org/jira/browse/TOMEE-278[TOMEE-278] AnnotatedType can be null so dont put it in a map
+* link:https://issues.apache.org/jira/browse/TOMEE-220[TOMEE-220] revisit runnable tomee-embedded cli
+* link:https://issues.apache.org/jira/browse/TOMEE-361[TOMEE-361] skip JSF startup even if our internal faces-config.xml is found (but no more)
+* link:https://issues.apache.org/jira/browse/TOMEE-224[TOMEE-224] Create Servlet that loads the "JNDI" panel data
+* link:https://issues.apache.org/jira/browse/TOMEE-418[TOMEE-418] ability to use fast session generation for dev environment in arquillian adapters (remote) + tomee mvn plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-225[TOMEE-225] Create Servlet that loads the "Saved Objects" panel data
+* link:https://issues.apache.org/jira/browse/TOMEE-368[TOMEE-368] better handling of myfaces container listener
+* link:https://issues.apache.org/jira/browse/TOMEE-369[TOMEE-369] be sure to not exclude too much in tempclassloader (in particular with myfaces)
+* link:https://issues.apache.org/jira/browse/TOMEE-366[TOMEE-366] delete temp file in arquillian tomee adapter even if deployer lookup fail
+* link:https://issues.apache.org/jira/browse/TOMEE-367[TOMEE-367] create webapp classloader even for embedded deployment
+* link:https://issues.apache.org/jira/browse/TOMEE-427[TOMEE-427] Shortcurt to debug with tomee maven plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-23[TOMEE-23] Ignore .DS_Store files when deploying in Tomcat
+* link:https://issues.apache.org/jira/browse/TOMEE-350[TOMEE-350] allow to customize TempClassLoader force skip/load with multiple packages
+* link:https://issues.apache.org/jira/browse/TOMEE-359[TOMEE-359] taking into account filtering even for fragments
+* link:https://issues.apache.org/jira/browse/TOMEE-213[TOMEE-213] close webappclassloader after undeployment and not in its middle
+* link:https://issues.apache.org/jira/browse/TOMEE-219[TOMEE-219] Make jaxrs services managed by cdi when possible
+* link:https://issues.apache.org/jira/browse/TOMEE-358[TOMEE-358] activating back MyFacesContainerInitializer and adding StartupServletContextListener by default
+* link:https://issues.apache.org/jira/browse/TOMEE-417[TOMEE-417] ability to provide jaxrs providers, interceptors in the webapp
+* link:https://issues.apache.org/jira/browse/TOMEE-414[TOMEE-414] support to provide slf4j in the application
+* link:https://issues.apache.org/jira/browse/TOMEE-415[TOMEE-415] use by default openejb classloader to create quartz scheduler
+* link:https://issues.apache.org/jira/browse/OPENEJB-1900[OPENEJB-1900] @LocalBean package and friendly scoped methods
+* link:https://issues.apache.org/jira/browse/OPENEJB-1901[OPENEJB-1901] @LocalClient doesn't work with EJBContainer
+* link:https://issues.apache.org/jira/browse/OPENEJB-1853[OPENEJB-1853] expose basicdatasource writable config through jmx
+* link:https://issues.apache.org/jira/browse/OPENEJB-1791[OPENEJB-1791] managing a conf.d folder as under unix for services
+* link:https://issues.apache.org/jira/browse/OPENEJB-1843[OPENEJB-1843] support @before @after @beforeclass @afterclass in embedded arquillian adapter (classloader is not correct so "BeanManagerProvider" can't work)
+* link:https://issues.apache.org/jira/browse/OPENEJB-1795[OPENEJB-1795] support @Inject for synamic EJB (interface only)
+* link:https://issues.apache.org/jira/browse/OPENEJB-1845[OPENEJB-1845] look in web-inf/classes/meta-inf for persistence.xml for embedded arquillian adapter and check classloaderasset get a better root url
+* link:https://issues.apache.org/jira/browse/OPENEJB-1863[OPENEJB-1863] no need to create a thread we are waiting to create an entitymanagerfactory
+* link:https://issues.apache.org/jira/browse/OPENEJB-1864[OPENEJB-1864] remove openejb-javaagent from openejb-core test since it is not mandatory and buggy (due to openjpa-javaagen) with java 7
+* link:https://issues.apache.org/jira/browse/OPENEJB-1576[OPENEJB-1576] Example: CDI Decorators
+* link:https://issues.apache.org/jira/browse/OPENEJB-1860[OPENEJB-1860] openejb.descriptors.output logging and functional improvements
+* link:https://issues.apache.org/jira/browse/OPENEJB-1858[OPENEJB-1858] be more tolerant on the tx manager type for managedconnection factory
+* link:https://issues.apache.org/jira/browse/OPENEJB-1823[OPENEJB-1823] allow to undeploy resources linked to an app with the app undeployment
+* link:https://issues.apache.org/jira/browse/OPENEJB-1420[OPENEJB-1420] Classloading issue in OSGI
+* link:https://issues.apache.org/jira/browse/OPENEJB-1840[OPENEJB-1840] managing request/session scopes in standalone
+* link:https://issues.apache.org/jira/browse/OPENEJB-1734[OPENEJB-1734] Shell to query and invoke EJBs through commands interactively
+* link:https://issues.apache.org/jira/browse/OPENEJB-1117[OPENEJB-1117] ServiceManager does not work in OSGi environment
+* link:https://issues.apache.org/jira/browse/OPENEJB-1889[OPENEJB-1889] when an EJB implements too many interfaces it fails with the message "TODO"
+* link:https://issues.apache.org/jira/browse/OPENEJB-1887[OPENEJB-1887] <ServiceProvider> inheritance to reduce redundant config in service-jar.xml files
+* link:https://issues.apache.org/jira/browse/OPENEJB-1888[OPENEJB-1888] add a way to hide log messages which are not relevant for openejb/tomee
+* link:https://issues.apache.org/jira/browse/OPENEJB-1896[OPENEJB-1896] Slightly reduce memory footprint of EJBs
+* link:https://issues.apache.org/jira/browse/OPENEJB-1892[OPENEJB-1892] embedded logging format is not applied to OpenJPA
+* link:https://issues.apache.org/jira/browse/OPENEJB-1891[OPENEJB-1891] get duration time of the query when logging sql
+* link:https://issues.apache.org/jira/browse/OPENEJB-1890[OPENEJB-1890] make openejb embedded arquillian adapter working with shrinkwrap maven and libraries which are not on classpath
+* link:https://issues.apache.org/jira/browse/OPENEJB-1761[OPENEJB-1761] improve default JUL logging
+* link:https://issues.apache.org/jira/browse/OPENEJB-1763[OPENEJB-1763] Allow EjbModule to be returned as a part of in-class configuration in ApplicationComposer (@Module)
+* link:https://issues.apache.org/jira/browse/OPENEJB-1271[OPENEJB-1271] Add pofiles to allow JPA provider to be changed
+* link:https://issues.apache.org/jira/browse/OPENEJB-1867[OPENEJB-1867] ability to configure the default job scheduler
+* link:https://issues.apache.org/jira/browse/OPENEJB-1277[OPENEJB-1277] RemoteInitialContextFactory .close() method to logout
+* link:https://issues.apache.org/jira/browse/OPENEJB-1868[OPENEJB-1868] allow to set a ejbtimerservice by ejb
+* link:https://issues.apache.org/jira/browse/OPENEJB-1865[OPENEJB-1865] add lib folder to classpath in openejb standalone like in tomee
+* link:https://issues.apache.org/jira/browse/OPENEJB-1866[OPENEJB-1866] add openejb-jpa-integration to ear libs
+* link:https://issues.apache.org/jira/browse/OPENEJB-1871[OPENEJB-1871] don't use webbeanslogger
+* link:https://issues.apache.org/jira/browse/OPENEJB-1870[OPENEJB-1870] allow to provide server event listener in apps
+* link:https://issues.apache.org/jira/browse/OPENEJB-1875[OPENEJB-1875] New LoginModule based on ServiceProvider
+* link:https://issues.apache.org/jira/browse/OPENEJB-1874[OPENEJB-1874] remove openejb-jsf
+* link:https://issues.apache.org/jira/browse/OPENEJB-1872[OPENEJB-1872] refactor a bit the way we hide internal beans (Comp) since now we have the structure to do it
+* link:https://issues.apache.org/jira/browse/OPENEJB-1877[OPENEJB-1877] refactor datasourcefactory and jdbc package to split it in subpackages for consistency
+* link:https://issues.apache.org/jira/browse/OPENEJB-1878[OPENEJB-1878] ability to create an entitymanager at startup
+* link:https://issues.apache.org/jira/browse/OPENEJB-1881[OPENEJB-1881] Multipoint "broadcast" attribute
+* link:https://issues.apache.org/jira/browse/OPENEJB-1883[OPENEJB-1883] rewrite ScopeHelper to use ContextsService
+* link:https://issues.apache.org/jira/browse/OPENEJB-1780[OPENEJB-1780] Application relative EJB WebService addresses
+* link:https://issues.apache.org/jira/browse/OPENEJB-1850[OPENEJB-1850] groovy jpa test
+* link:https://issues.apache.org/jira/browse/OPENEJB-1851[OPENEJB-1851] groovy spock sample
+* link:https://issues.apache.org/jira/browse/OPENEJB-1849[OPENEJB-1849] adding groovy cdi sample
+* link:https://issues.apache.org/jira/browse/OPENEJB-1841[OPENEJB-1841] basic console colors
+* link:https://issues.apache.org/jira/browse/OPENEJB-1897[OPENEJB-1897] easy way to mock beans injections
+* link:https://issues.apache.org/jira/browse/OPENEJB-1772[OPENEJB-1772] maven plugin to be able to dump info tree and avoid to create it when starting the app
+* link:https://issues.apache.org/jira/browse/OPENEJB-1514[OPENEJB-1514] Example: @Schedule Methods
+* link:https://issues.apache.org/jira/browse/OPENEJB-1649[OPENEJB-1649] Arquillian Tests
+* link:https://issues.apache.org/jira/browse/OWB-695[OWB-695] Cause missing in AnnotationDB$CrossReferenceException
+* link:https://issues.apache.org/jira/browse/OWB-704[OWB-704] use method filter in javassist proxies instead of "manual" filtering
+* link:https://issues.apache.org/jira/browse/OWB-702[OWB-702] Add serialization unit tests to openwebbeans-web to catch future regressions
+* link:https://issues.apache.org/jira/browse/OWB-701[OWB-701] Support ASM for Bean Proxies
+
+== Bugs
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-12[TOMEE-12] org.apache.openejb.config.AnnotationDeployer throws InstantiationException on com.sun.jersey.api.core.ApplicationAdapter
+* link:https://issues.apache.org/jira/browse/TOMEE-193[TOMEE-193] soap webservices are now deployed by default in the webapp context but what if the webservice is not in a webapp?
+* link:https://issues.apache.org/jira/browse/TOMEE-199[TOMEE-199] tomcat deployer doesnt work well for cdi apps
+* link:https://issues.apache.org/jira/browse/TOMEE-197[TOMEE-197] When running TomEE embedded in Eclipse jsp files do not hot deploy
+* link:https://issues.apache.org/jira/browse/TOMEE-10[TOMEE-10] JNDI Browser in the openejb.war does not show @LocalBean views as EJBs
+* link:https://issues.apache.org/jira/browse/TOMEE-198[TOMEE-198] JAX-RS and JAX-WS does not work when together in a single application
+* link:https://issues.apache.org/jira/browse/TOMEE-345[TOMEE-345] make EjbTimerServiceImpl serializable
+* link:https://issues.apache.org/jira/browse/TOMEE-141[TOMEE-141] when using OpenEJBListener with dropinwar approach we should try to fnid the war of the webapp too\...
+* link:https://issues.apache.org/jira/browse/TOMEE-249[TOMEE-249] NPE on DatatypeConverter
+* link:https://issues.apache.org/jira/browse/TOMEE-349[TOMEE-349] ability to use redeploy from tomcat
+* link:https://issues.apache.org/jira/browse/TOMEE-242[TOMEE-242] @ManagedBean for rest services
+* link:https://issues.apache.org/jira/browse/TOMEE-240[TOMEE-240] wrap tomcat realm in tomeerealm to manage request.login even in a single request
+* link:https://issues.apache.org/jira/browse/TOMEE-339[TOMEE-339] @Context Providers is not supported
+* link:https://issues.apache.org/jira/browse/TOMEE-237[TOMEE-237] New gui is broken in IE
+* link:https://issues.apache.org/jira/browse/TOMEE-434[TOMEE-434] when using DeployerEjb the JNDI tree is the DeployerEjb one and not the deployed app one
+* link:https://issues.apache.org/jira/browse/TOMEE-267[TOMEE-267] Default 'type' ignored in+++<JndiProvider>+++and related elements</li>
+* link:https://issues.apache.org/jira/browse/TOMEE-395[TOMEE-395] TomEEDataSourceCreator.ContantHashCodeHandler will change the Exception throwed by the original method
+* link:https://issues.apache.org/jira/browse/TOMEE-392[TOMEE-392] EJB properties overriding from system.properties, application.properties or module.properties
+* link:https://issues.apache.org/jira/browse/TOMEE-394[TOMEE-394] pojo webservice undeployment doesn't clean eveything \-> it prevents redeployment
+* link:https://issues.apache.org/jira/browse/TOMEE-258[TOMEE-258] pojo webservices doesnt get injections
+* link:https://issues.apache.org/jira/browse/TOMEE-383[TOMEE-383] pojo @WebService deployment without sei fails (NPE)
+* link:https://issues.apache.org/jira/browse/TOMEE-200[TOMEE-200] CDI injections in Pojo JAXRS webservices can lead to memory leak
+* link:https://issues.apache.org/jira/browse/TOMEE-380[TOMEE-380] tomeeshutdownport is not respected by tomee maven plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-388[TOMEE-388] Use case "Faces Request Generates Non-Faces Response" locks conversation forever (\-> BusyConversationException)
+* link:https://issues.apache.org/jira/browse/TOMEE-207[TOMEE-207] postcontruct is called before injections in pojo rest services
+* link:https://issues.apache.org/jira/browse/TOMEE-389[TOMEE-389] quartz prevent tomee to shutdown properly
+* link:https://issues.apache.org/jira/browse/TOMEE-403[TOMEE-403] jaxrs subresource are not working
+* link:https://issues.apache.org/jira/browse/TOMEE-401[TOMEE-401] don't filter http method (PATCH was not valid in rest for instance)
+* link:https://issues.apache.org/jira/browse/TOMEE-185[TOMEE-185] JAXB context can't be created from package
+* link:https://issues.apache.org/jira/browse/TOMEE-362[TOMEE-362] service MBeans are not unregistered
+* link:https://issues.apache.org/jira/browse/TOMEE-360[TOMEE-360] NPE in BeanManagerImpl scope is null
+* link:https://issues.apache.org/jira/browse/TOMEE-222[TOMEE-222] LocalBean can't be serializable
+* link:https://issues.apache.org/jira/browse/TOMEE-221[TOMEE-221] IllegalArgumentException: Class 'java.lang.Object' is not annotated with Path
+* link:https://issues.apache.org/jira/browse/TOMEE-419[TOMEE-419] JAR/WAR module-name not used
+* link:https://issues.apache.org/jira/browse/TOMEE-422[TOMEE-422] JAXRS @Context for HttpServletResponse and ServletConfig
+* link:https://issues.apache.org/jira/browse/TOMEE-424[TOMEE-424] [JAXRS] Custom @Context not supported
+* link:https://issues.apache.org/jira/browse/TOMEE-211[TOMEE-211] tomee:start command (tomee maven plugin) stay up while tomee is up
+* link:https://issues.apache.org/jira/browse/TOMEE-409[TOMEE-409] JAXRS @Context for HttpServletRequest and ServletRequest
+* link:https://issues.apache.org/jira/browse/TOMEE-212[TOMEE-212] calling request.login() and ejbcontext.getCallerPrincipal() in the same request is not consistent
+* link:https://issues.apache.org/jira/browse/TOMEE-407[TOMEE-407] JavaMail javax.mail.Session resources do not work with authentication
+* link:https://issues.apache.org/jira/browse/TOMEE-218[TOMEE-218] RESOURCE_LOCAL entitymanager shouldn't be injected
+* link:https://issues.apache.org/jira/browse/TOMEE-217[TOMEE-217] log4j integration issue
+* link:https://issues.apache.org/jira/browse/TOMEE-216[TOMEE-216] Changes to InjectionTarget in ProcessInjectionTarget event ignored
+* link:https://issues.apache.org/jira/browse/TOMEE-410[TOMEE-410] web.xml validation rejects load-on-startup values having extraneous white spaces
+* link:https://issues.apache.org/jira/browse/TOMEE-411[TOMEE-411] Accept spaces in load-on-startup
+* link:https://issues.apache.org/jira/browse/TOMEE-154[TOMEE-154] Deployment fails in ear when injections are done between ejbmodule and webmodule (classloading exception because the webapp classloader is known later)
+* link:https://issues.apache.org/jira/browse/OPENEJB-1848[OPENEJB-1848] Multipoint Automatic Reconnect fails in some situations
+* link:https://issues.apache.org/jira/browse/OPENEJB-1847[OPENEJB-1847] When deploying two ear files in openejb only the first one gets deployed correctly
+* link:https://issues.apache.org/jira/browse/OPENEJB-1844[OPENEJB-1844] annotatedtype are not usable from processAnnotatedType if not already processed
+* link:https://issues.apache.org/jira/browse/OPENEJB-1720[OPENEJB-1720] NPE at at org.apache.openejb.util.AnnotationFinder
+* link:https://issues.apache.org/jira/browse/OPENEJB-1862[OPENEJB-1862] boolean type re not well managed in org.apache.openejb.config.AnnotationDeployer.DiscoverAnnotatedBeans#process
+* link:https://issues.apache.org/jira/browse/OPENEJB-1855[OPENEJB-1855] LinkageError on Mac OS with "sun/security/pkcs11/SunPKCS11"
+* link:https://issues.apache.org/jira/browse/OPENEJB-1717[OPENEJB-1717] When openejb-osgi bundle is restarted, we get an exception (ServiceManager is already initialized)
+* link:https://issues.apache.org/jira/browse/OPENEJB-1727[OPENEJB-1727] couldn't start owb context
+* link:https://issues.apache.org/jira/browse/OPENEJB-958[OPENEJB-958] logging.properties: DOS line ends and category instead of logger
+* link:https://issues.apache.org/jira/browse/OPENEJB-1728[OPENEJB-1728] Karaf is blocked
+* link:https://issues.apache.org/jira/browse/OPENEJB-1382[OPENEJB-1382] Provide interceptor/thread based context for OWB rather than classloader based context
+* link:https://issues.apache.org/jira/browse/OPENEJB-1698[OPENEJB-1698] EntityBean conflict when a persistent property exists called "deleted"
+* link:https://issues.apache.org/jira/browse/OPENEJB-1603[OPENEJB-1603] InitialContext instantiation fails with ERROR - CDI Beans module deployment failed
+* link:https://issues.apache.org/jira/browse/OPENEJB-1551[OPENEJB-1551] ejb-jar.xml should be optional.
+* link:https://issues.apache.org/jira/browse/OPENEJB-1837[OPENEJB-1837] WebBeansLogger uses java.util.logging directly and doesn't obey system property openejb.log.factory
+* link:https://issues.apache.org/jira/browse/OPENEJB-967[OPENEJB-967] NullPointerException during injection into a POJO webservice
+* link:https://issues.apache.org/jira/browse/OPENEJB-1397[OPENEJB-1397] After upgrade to 3.1.3 web services fail with exception
+* link:https://issues.apache.org/jira/browse/OPENEJB-1643[OPENEJB-1643] @Dispose not called
+* link:https://issues.apache.org/jira/browse/OPENEJB-1438[OPENEJB-1438] Wrong jar required for remote client in docs
+* link:https://issues.apache.org/jira/browse/OPENEJB-1893[OPENEJB-1893] @LocalBean references did not survive passivation
+* link:https://issues.apache.org/jira/browse/OPENEJB-1595[OPENEJB-1595] [BUILD FAILED]Compilation error occurs while building openejb trunk
+* link:https://issues.apache.org/jira/browse/OPENEJB-1126[OPENEJB-1126] SAAJ-related test cases no longer work with IBM's SDK
+* link:https://issues.apache.org/jira/browse/OPENEJB-1876[OPENEJB-1876] <ejb-jar id="foo"> id ignored when ejb-jar contains no child elements
+* link:https://issues.apache.org/jira/browse/OPENEJB-1879[OPENEJB-1879] usage of OWBInjector shall be reworked
+* link:https://issues.apache.org/jira/browse/OPENEJB-1882[OPENEJB-1882] this can't be use in localbeans constructor
+* link:https://issues.apache.org/jira/browse/OPENEJB-1648[OPENEJB-1648] persistence.xml files in WEB-INF/classes/META-INF/ incorrect root url
+* link:https://issues.apache.org/jira/browse/OPENEJB-1884[OPENEJB-1884] EJBContainer.createEJBContainer(); doesn't register the WebBeansContext correctly
+* link:https://issues.apache.org/jira/browse/OPENEJB-1886[OPENEJB-1886] statsinterceptor should be added before starting the timer if necessary
+* link:https://issues.apache.org/jira/browse/OWB-709[OWB-709] webbeans-tomcat6 must honour WEB-INF/classes/META-INF/beans.xml
+* link:https://issues.apache.org/jira/browse/OWB-694[OWB-694] Misleading exception message "Wrong termination object"
+* link:https://issues.apache.org/jira/browse/OWB-708[OWB-708] PrincipalBean doesnt get found
+* link:https://issues.apache.org/jira/browse/OWB-670[OWB-670] ProcessInjectionTarget event fired a bit late
+* link:https://issues.apache.org/jira/browse/OWB-707[OWB-707] tomcat-sample and tomcat7-sample are just broken.
+* link:https://issues.apache.org/jira/browse/OWB-703[OWB-703] getBeans cache key algorithm must be unique
+* link:https://issues.apache.org/jira/browse/OWB-650[OWB-650] ContextFactory#destroy*Context have to reset the proxy cache
+* link:https://issues.apache.org/jira/browse/OWB-559[OWB-559] Method-Injection for methods with more than one parameter fails with OWBInjector
+* link:https://issues.apache.org/jira/browse/OWB-699[OWB-699] Passivation leads to NPE
+* link:https://issues.apache.org/jira/browse/OWB-698[OWB-698] InjectableBeanManager not serializable
+* link:https://issues.apache.org/jira/browse/OWB-697[OWB-697] Non-Static Loggers leads to NonSerizializableException
+* link:https://issues.apache.org/jira/browse/OWB-696[OWB-696] check for unproxyable API types should get moved to the validateBeans phase </ul>
+
+== Tasks & Sub-Tasks
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-342[TOMEE-342] webservice with configured deployment url example
+* link:https://issues.apache.org/jira/browse/TOMEE-335[TOMEE-335] Create a new JIRA saying: checking and closing JIRAs
+* link:https://issues.apache.org/jira/browse/TOMEE-129[TOMEE-129] Tweak TCK setup for JAX-RS tests
+* link:https://issues.apache.org/jira/browse/TOMEE-371[TOMEE-371] add an arquillian test using hibernate
+* link:https://issues.apache.org/jira/browse/TOMEE-275[TOMEE-275] review OWB integration to see if some stuff should be pushed to OWB
+* link:https://issues.apache.org/jira/browse/TOMEE-272[TOMEE-272] add notice for jaxrs tomee distribution
+* link:https://issues.apache.org/jira/browse/OPENEJB-1688[OPENEJB-1688] Build the Arquillian adapters as part of the main OpenEJB build
+* link:https://issues.apache.org/jira/browse/OPENEJB-1687[OPENEJB-1687] Consolidate tests and run against all Arquillian adapter
+* link:https://issues.apache.org/jira/browse/OPENEJB-1861[OPENEJB-1861] remove OWB JMSManager usage from OpenEJB
+* link:https://issues.apache.org/jira/browse/OPENEJB-1859[OPENEJB-1859] cucumber-jvm example
+* link:https://issues.apache.org/jira/browse/OPENEJB-1857[OPENEJB-1857] Example using cdi-query
+* link:https://issues.apache.org/jira/browse/OPENEJB-1895[OPENEJB-1895] Refactored @Asynchronous support
+* link:https://issues.apache.org/jira/browse/OPENEJB-1869[OPENEJB-1869] server event example
+* link:https://issues.apache.org/jira/browse/OPENEJB-1873[OPENEJB-1873] Upgrade to OpenWebBeans-1.1.5
+* link:https://issues.apache.org/jira/browse/OPENEJB-1885[OPENEJB-1885] Simplify EJB proxy code
+* link:https://issues.apache.org/jira/browse/OPENEJB-1614[OPENEJB-1614] Example: @Produces and @Disposes within a @RequestScoped context
+* link:https://issues.apache.org/jira/browse/OPENEJB-1406[OPENEJB-1406] Example: Lookup of EJBs
+* link:https://issues.apache.org/jira/browse/OPENEJB-1407[OPENEJB-1407] Example: Lookup of EJBs with descriptor
+* link:https://issues.apache.org/jira/browse/OPENEJB-1606[OPENEJB-1606] Example: CDI @Decorator and @Delegate
+* link:https://issues.apache.org/jira/browse/OPENEJB-361[OPENEJB-361] Example: Bean-Managed Transactions
+* link:https://issues.apache.org/jira/browse/OPENEJB-352[OPENEJB-352] Example: Stateful Bean with Callbacks
+* link:https://issues.apache.org/jira/browse/OPENEJB-351[OPENEJB-351] Example: Stateless Bean with Callbacks
+* link:https://issues.apache.org/jira/browse/OPENEJB-1653[OPENEJB-1653] Arquillian: JSF Managed Bean Tests+++</JndiProvider>+++
diff --git a/src/main/jbake/content/tomee-1.5.0-release-notes.md b/src/main/jbake/content/tomee-1.5.0-release-notes.md
deleted file mode 100644
index ea59173..0000000
--- a/src/main/jbake/content/tomee-1.5.0-release-notes.md
+++ /dev/null
@@ -1,290 +0,0 @@
-Title: Apache TomEE 1.5.0 Release Notes
-
-<h2>Upgrades</h2>
-
-<ul>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-243">TOMEE-243</a> HSQLDB 2.2.8</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-431">TOMEE-431</a> Shrinkwrap Descriptor 2.0.0-alpha-3</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-378">TOMEE-378</a> Quartz 2.1.6</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-271">TOMEE-271</a> Tomcat 7.0.30</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-365">TOMEE-365</a> OpenWebBeans 1.1.6</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-426">TOMEE-426</a> ActiveMQ 5.6.0</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-428">TOMEE-428</a> MyFaces 2.1.9</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-215">TOMEE-215</a> CXF 2.6.2</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-214">TOMEE-214</a> Arquillian 1.0.1</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-458">TOMEE-458</a> BVal 0.5</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1894">OPENEJB-1894</a> karaf 2.2.9</li>
-</ul>
-
-<h2>New Features</h2>
-
-<ul>
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-347">TOMEE-347</a> Allow switching datasource connection pool</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-331">TOMEE-331</a> Optimized scanning via exclusions.list in WEB-INF allows</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-266">TOMEE-266</a> Internal EJBs can be secured</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-264">TOMEE-264</a> Filter APIs we already provide if they are in a webapp</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-399">TOMEE-399</a> Expose Quartz through JMX</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-259">TOMEE-259</a> Mojarra integration</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-250">TOMEE-250</a> Element &lt;Service&gt; for declaring services generically in the tomee.xml</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-386">TOMEE-386</a> Support for META-INF/module.properties file and overriding</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-387">TOMEE-387</a> Support for META-INF/application.properties file and overriding</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-280">TOMEE-280</a> Deploy-time JPA Enhancement</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-187">TOMEE-187</a> New TomEE JAX-RS Distribution</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-377">TOMEE-377</a> Configuration of CXF Bus</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-421">TOMEE-421</a> JMX management of DataSources</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1228">OPENEJB-1228</a> ShrinkWrap Deployment Support</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1899">OPENEJB-1899</a> Mockito integration</li>
-</ul>
-
-<h2>Improvements</h2>
-
-<ul>
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-235">TOMEE-235</a> ability to provide a custom server.xml using arquillian adapters</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-194">TOMEE-194</a> managing pathparam at class level</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-346">TOMEE-346</a> providing log4j in a webapp needs to set openejb.skip.log4j=false</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-191">TOMEE-191</a> can't use DataSourceRealm with a DataSource defined in tomee.xml</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-348">TOMEE-348</a> propagate all cxf endpoint properties to the SOAP endpoint</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-190">TOMEE-190</a> Duplicate Libraries in distribution</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-146">TOMEE-146</a> Trim unused code</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-241">TOMEE-241</a> close webappclasslaoder after undeployment</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-336">TOMEE-336</a> ability to skip dbcp pool for @DataSourceDefinition</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-130">TOMEE-130</a> Improve openejb webapp console to match current site look and feel</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-230">TOMEE-230</a> tomee.sh uses old lib folder</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-332">TOMEE-332</a> yank tomee version from arquillian adapter config and use LATEST</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-330">TOMEE-330</a> more relevant error message when using tomee < tomee+ and webservice injection are done</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-269">TOMEE-269</a> use a maven specific logger when running tomee:run from tomee maven plugin</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-328">TOMEE-328</a> Re organise Arquillian sub modules versionning</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-4">TOMEE-4</a> Example demonstrating Arquillian Adapter</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-262">TOMEE-262</a> since TOMEE-261 is done we can check the needed JtaPlatform for hibernate is in the webapp</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-260">TOMEE-260</a> Validate: REST Service has no non-public resources</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-398">TOMEE-398</a> Unified Executor configuration options (@Asynchronous, @Timeout)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-397">TOMEE-397</a> META-INF/resources.xml always needs qualified names</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-391">TOMEE-391</a> config for retry attemps on timer methods</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-257">TOMEE-257</a> replace deployment listener and webdeployementlistener by our brand new observer api</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-251">TOMEE-251</a> extract jpa provide integration in a jar to be able to use it from a war</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-252">TOMEE-252</a> engine name needs to be Catalina</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-253">TOMEE-253</a> updatechecker doesn't handle tomee version properly</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-382">TOMEE-382</a> configuration for asynch task pool</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-385">TOMEE-385</a> Complete application properties scoping</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-205">TOMEE-205</a> Create the skeleton of the new Tomee UI </li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-208">TOMEE-208</a> add servlets to httpcontext (arquillian adapters)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-204">TOMEE-204</a> Don't fail app deployment if a TLD class cannot be loaded</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-203">TOMEE-203</a> Ensure all tomee-* jars and archives use the TomEE version number</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-406">TOMEE-406</a> Support Duration syntax in all known time related properties</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-282">TOMEE-282</a> logging tomee is downloaded from arquillian adapter</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-402">TOMEE-402</a> ScriptLoginModule</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-281">TOMEE-281</a> ignore endorsed lib for java 7</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-184">TOMEE-184</a> using cxf (and not our repackaged version)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-183">TOMEE-183</a> Optimize Arquillian Adapter by avoiding intermediate jar creation</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-189">TOMEE-189</a> EAR and CDI is not well integrated</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-372">TOMEE-372</a> don't load webapp enrichment classes directly from system classloader even if available</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-374">TOMEE-374</a> Embedded TomEE use same defaults as Embedded OpenEJB</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-41">TOMEE-41</a> Overzealous class scanning</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-274">TOMEE-274</a> allowing the user to override the folder where retrieved tomee are cache in arquillian adapters (by default m2 repo is not used to avoid to corrupt it)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-277">TOMEE-277</a> better model to be able to filter cdi beans</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-276">TOMEE-276</a> allow to define the same interceptor/decorator/alternative in multiple beans.xml</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-270">TOMEE-270</a> don't stop deployment during deployment if a noclassdeffound if thrown on a field</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-273">TOMEE-273</a> solder @Requires doesn't work</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-171">TOMEE-171</a> TomEE automatically directs embedded (@DataSourceDefinition) h2 datasource to hsqldb</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-279">TOMEE-279</a> using tomcat default host instead of hardcoded "localhost"</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-278">TOMEE-278</a> AnnotatedType can be null so dont put it in a map</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-220">TOMEE-220</a> revisit runnable tomee-embedded cli</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-361">TOMEE-361</a> skip JSF startup even if our internal faces-config.xml is found (but no more)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-224">TOMEE-224</a> Create Servlet that loads the "JNDI" panel data</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-418">TOMEE-418</a> ability to use fast session generation for dev environment in arquillian adapters (remote) + tomee mvn plugin</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-225">TOMEE-225</a> Create Servlet that loads the "Saved Objects" panel data</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-368">TOMEE-368</a> better handling of myfaces container listener</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-369">TOMEE-369</a> be sure to not exclude too much in tempclassloader (in particular with myfaces)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-366">TOMEE-366</a> delete temp file in arquillian tomee adapter even if deployer lookup fail</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-367">TOMEE-367</a> create webapp classloader even for embedded deployment</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-427">TOMEE-427</a> Shortcurt to debug with tomee maven plugin</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-23">TOMEE-23</a> Ignore .DS_Store files when deploying in Tomcat</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-350">TOMEE-350</a> allow to customize TempClassLoader force skip/load with multiple packages</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-359">TOMEE-359</a> taking into account filtering even for fragments</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-213">TOMEE-213</a> close webappclassloader after undeployment and not in its middle</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-219">TOMEE-219</a> Make jaxrs services managed by cdi when possible</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-358">TOMEE-358</a> activating back MyFacesContainerInitializer and adding StartupServletContextListener by default</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-417">TOMEE-417</a> ability to provide jaxrs providers, interceptors... in the webapp</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-414">TOMEE-414</a> support to provide slf4j in the application</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-415">TOMEE-415</a> use by default openejb classloader to create quartz scheduler</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1900">OPENEJB-1900</a> @LocalBean package and friendly scoped methods</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1901">OPENEJB-1901</a> @LocalClient doesn't work with EJBContainer</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1853">OPENEJB-1853</a> expose basicdatasource writable config through jmx</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1791">OPENEJB-1791</a> managing a conf.d folder as under unix for services</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1843">OPENEJB-1843</a> support @before @after @beforeclass @afterclass in embedded arquillian adapter (classloader is not correct so "BeanManagerProvider" can't work)</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1795">OPENEJB-1795</a> support @Inject for synamic EJB (interface only)</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1845">OPENEJB-1845</a> look in web-inf/classes/meta-inf for persistence.xml for embedded arquillian adapter and check classloaderasset get a better root url</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1863">OPENEJB-1863</a> no need to create a thread we are waiting to create an entitymanagerfactory</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1864">OPENEJB-1864</a> remove openejb-javaagent from openejb-core test since it is not mandatory and buggy (due to openjpa-javaagen) with java 7</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1576">OPENEJB-1576</a> Example: CDI Decorators</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1860">OPENEJB-1860</a> openejb.descriptors.output logging and functional improvements</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1858">OPENEJB-1858</a> be more tolerant on the tx manager type for managedconnection factory</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1823">OPENEJB-1823</a> allow to undeploy resources linked to an app with the app undeployment</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1420">OPENEJB-1420</a> Classloading issue in OSGI</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1840">OPENEJB-1840</a> managing request/session scopes in standalone</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1734">OPENEJB-1734</a> Shell to query and invoke EJBs through commands interactively</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1117">OPENEJB-1117</a> ServiceManager does not work in OSGi environment</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1889">OPENEJB-1889</a> when an EJB implements too many interfaces it fails with the message "TODO"</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1887">OPENEJB-1887</a> &lt;ServiceProvider&gt; inheritance to reduce redundant config in service-jar.xml files</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1888">OPENEJB-1888</a> add a way to hide log messages which are not relevant for openejb/tomee</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1896">OPENEJB-1896</a> Slightly reduce memory footprint of EJBs</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1892">OPENEJB-1892</a> embedded logging format is not applied to OpenJPA</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1891">OPENEJB-1891</a> get duration time of the query when logging sql</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1890">OPENEJB-1890</a> make openejb embedded arquillian adapter working with shrinkwrap maven and libraries which are not on classpath</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1761">OPENEJB-1761</a> improve default JUL logging</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1763">OPENEJB-1763</a> Allow EjbModule to be returned as a part of in-class configuration in ApplicationComposer (@Module)</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1271">OPENEJB-1271</a> Add pofiles to allow JPA provider to be changed</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1867">OPENEJB-1867</a> ability to configure the default job scheduler</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1277">OPENEJB-1277</a> RemoteInitialContextFactory .close() method to logout</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1868">OPENEJB-1868</a> allow to set a ejbtimerservice by ejb</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1865">OPENEJB-1865</a> add lib folder to classpath in openejb standalone like in tomee</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1866">OPENEJB-1866</a> add openejb-jpa-integration to ear libs</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1871">OPENEJB-1871</a> don't use webbeanslogger</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1870">OPENEJB-1870</a> allow to provide server event listener in apps</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1875">OPENEJB-1875</a> New LoginModule based on ServiceProvider</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1874">OPENEJB-1874</a> remove openejb-jsf</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1872">OPENEJB-1872</a> refactor a bit the way we hide internal beans (Comp) since now we have the structure to do it</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1877">OPENEJB-1877</a> refactor datasourcefactory and jdbc package to split it in subpackages for consistency</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1878">OPENEJB-1878</a> ability to create an entitymanager at startup</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1881">OPENEJB-1881</a> Multipoint "broadcast" attribute</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1883">OPENEJB-1883</a> rewrite ScopeHelper to use ContextsService</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1780">OPENEJB-1780</a> Application relative EJB WebService addresses</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1850">OPENEJB-1850</a> groovy jpa test</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1851">OPENEJB-1851</a> groovy spock sample</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1849">OPENEJB-1849</a> adding groovy cdi sample</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1841">OPENEJB-1841</a> basic console colors</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1897">OPENEJB-1897</a> easy way to mock beans injections</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1772">OPENEJB-1772</a> maven plugin to be able to dump info tree and avoid to create it when starting the app</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1514">OPENEJB-1514</a> Example: @Schedule Methods</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1649">OPENEJB-1649</a> Arquillian Tests</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-695">OWB-695</a> Cause missing in AnnotationDB$CrossReferenceException </li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-704">OWB-704</a> use method filter in javassist proxies instead of "manual" filtering</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-702">OWB-702</a> Add serialization unit tests to openwebbeans-web to catch future regressions</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-701">OWB-701</a> Support ASM for Bean Proxies</li>
-</ul>
-
-<h2>Bugs</h2>
-
-<ul>
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-12">TOMEE-12</a> org.apache.openejb.config.AnnotationDeployer throws InstantiationException on com.sun.jersey.api.core.ApplicationAdapter</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-193">TOMEE-193</a> soap webservices are now deployed by default in the webapp context but what if the webservice is not in a webapp?</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-199">TOMEE-199</a> tomcat deployer doesnt work well for cdi apps</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-197">TOMEE-197</a> When running TomEE embedded in Eclipse jsp files do not hot deploy</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-10">TOMEE-10</a> JNDI Browser in the openejb.war does not show @LocalBean views as EJBs</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-198">TOMEE-198</a> JAX-RS and JAX-WS does not work when together in a single application</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-345">TOMEE-345</a> make EjbTimerServiceImpl serializable</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-141">TOMEE-141</a> when using OpenEJBListener with dropinwar approach we should try to fnid the war of the webapp too...</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-249">TOMEE-249</a> NPE on DatatypeConverter</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-349">TOMEE-349</a> ability to use redeploy from tomcat</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-242">TOMEE-242</a> @ManagedBean for rest services</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-240">TOMEE-240</a> wrap tomcat realm in tomeerealm to manage request.login even in a single request</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-339">TOMEE-339</a> @Context Providers is not supported</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-237">TOMEE-237</a> New gui is broken in IE</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-434">TOMEE-434</a> when using DeployerEjb the JNDI tree is the DeployerEjb one and not the deployed app one</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-267">TOMEE-267</a> Default 'type' ignored in <JndiProvider> and related elements</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-395">TOMEE-395</a> TomEEDataSourceCreator.ContantHashCodeHandler  will change the Exception throwed by the original method</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-392">TOMEE-392</a> EJB properties overriding from system.properties, application.properties or module.properties</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-394">TOMEE-394</a> pojo webservice undeployment doesn't clean eveything -> it prevents redeployment</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-258">TOMEE-258</a> pojo webservices doesnt get injections</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-383">TOMEE-383</a> pojo @WebService deployment without sei fails (NPE)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-200">TOMEE-200</a> CDI injections in Pojo JAXRS webservices can lead to memory leak</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-380">TOMEE-380</a> tomeeshutdownport is not respected by tomee maven plugin</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-388">TOMEE-388</a> Use case "Faces Request Generates Non-Faces Response" locks conversation forever (-> BusyConversationException)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-207">TOMEE-207</a> postcontruct is called before injections in pojo rest services</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-389">TOMEE-389</a> quartz prevent tomee to shutdown properly</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-403">TOMEE-403</a> jaxrs subresource are not working</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-401">TOMEE-401</a> don't filter http method (PATCH was not valid in rest for instance)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-185">TOMEE-185</a> JAXB context can't be created from package</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-362">TOMEE-362</a> service MBeans are not unregistered</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-360">TOMEE-360</a> NPE in BeanManagerImpl scope is null</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-222">TOMEE-222</a> LocalBean can't be serializable</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-221">TOMEE-221</a> IllegalArgumentException: Class 'java.lang.Object' is not annotated with Path</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-419">TOMEE-419</a> JAR/WAR module-name not used</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-422">TOMEE-422</a> JAXRS @Context for HttpServletResponse and ServletConfig</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-424">TOMEE-424</a> [JAXRS] Custom @Context not supported</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-211">TOMEE-211</a> tomee:start command (tomee maven plugin) stay up while tomee is up</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-409">TOMEE-409</a> JAXRS @Context for HttpServletRequest and ServletRequest</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-212">TOMEE-212</a> calling request.login() and ejbcontext.getCallerPrincipal() in the same request is not consistent</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-407">TOMEE-407</a> JavaMail javax.mail.Session resources do not work with authentication</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-218">TOMEE-218</a> RESOURCE_LOCAL entitymanager shouldn't be injected</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-217">TOMEE-217</a> log4j integration issue</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-216">TOMEE-216</a> Changes to InjectionTarget in ProcessInjectionTarget event ignored</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-410">TOMEE-410</a> web.xml validation rejects load-on-startup values having extraneous white spaces</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-411">TOMEE-411</a> Accept spaces in load-on-startup </li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-154">TOMEE-154</a> Deployment fails in ear when injections are done between ejbmodule and webmodule (classloading exception because the webapp classloader is known later)</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1848">OPENEJB-1848</a> Multipoint Automatic Reconnect fails in some situations</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1847">OPENEJB-1847</a> When deploying two ear files in openejb only the first one gets deployed correctly</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1844">OPENEJB-1844</a> annotatedtype are not usable from processAnnotatedType if not already processed</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1720">OPENEJB-1720</a> NPE at at org.apache.openejb.util.AnnotationFinder</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1862">OPENEJB-1862</a> boolean type re not well managed in org.apache.openejb.config.AnnotationDeployer.DiscoverAnnotatedBeans#process</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1855">OPENEJB-1855</a> LinkageError on Mac OS with "sun/security/pkcs11/SunPKCS11"</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1717">OPENEJB-1717</a> When openejb-osgi bundle is restarted, we get an exception (ServiceManager is already initialized)</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1727">OPENEJB-1727</a> couldn't start owb context</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-958">OPENEJB-958</a> logging.properties: DOS line ends and category instead of logger</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1728">OPENEJB-1728</a> Karaf is blocked</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1382">OPENEJB-1382</a> Provide interceptor/thread based context for OWB rather than classloader based context</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1698">OPENEJB-1698</a> EntityBean conflict when a persistent property exists called "deleted"</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1603">OPENEJB-1603</a> InitialContext instantiation fails with ERROR - CDI Beans module deployment failed</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1551">OPENEJB-1551</a> ejb-jar.xml should be optional. </li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1837">OPENEJB-1837</a> WebBeansLogger uses java.util.logging directly and doesn't obey system property openejb.log.factory</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-967">OPENEJB-967</a> NullPointerException during injection into a POJO webservice</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1397">OPENEJB-1397</a> After upgrade to 3.1.3 web services fail with exception</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1643">OPENEJB-1643</a> @Dispose not called</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1438">OPENEJB-1438</a> Wrong jar required for remote client in docs</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1893">OPENEJB-1893</a> @LocalBean references did not survive passivation</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1595">OPENEJB-1595</a> [BUILD FAILED]Compilation error occurs while building openejb trunk</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1126">OPENEJB-1126</a> SAAJ-related test cases no longer work with IBM's SDK</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1876">OPENEJB-1876</a> <ejb-jar id="foo"/> id ignored when ejb-jar contains no child elements</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1879">OPENEJB-1879</a> usage of OWBInjector shall be reworked</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1882">OPENEJB-1882</a> this can't be use in localbeans constructor</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1648">OPENEJB-1648</a> persistence.xml files in WEB-INF/classes/META-INF/ incorrect root url</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1884">OPENEJB-1884</a>  EJBContainer.createEJBContainer(); doesn't register the WebBeansContext correctly</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1886">OPENEJB-1886</a> statsinterceptor should be added before starting the timer if necessary</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-709">OWB-709</a> webbeans-tomcat6 must honour WEB-INF/classes/META-INF/beans.xml</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-694">OWB-694</a> Misleading exception message "Wrong termination object"</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-708">OWB-708</a> PrincipalBean doesnt get found</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-670">OWB-670</a> ProcessInjectionTarget event fired a bit late</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-707">OWB-707</a> tomcat-sample and tomcat7-sample are just broken.</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-703">OWB-703</a> getBeans cache key algorithm must be unique</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-650">OWB-650</a> ContextFactory#destroy*Context have to reset the proxy cache</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-559">OWB-559</a> Method-Injection for methods with more than one parameter fails with OWBInjector</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-699">OWB-699</a> Passivation leads to NPE</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-698">OWB-698</a> InjectableBeanManager not serializable</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-697">OWB-697</a> Non-Static Loggers leads to NonSerizializableException</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-696">OWB-696</a> check for unproxyable API types should get moved to the validateBeans phase</li>
-</ul>
-
-<h2>Tasks & Sub-Tasks</h2>
-
-<ul>
-
-
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-342">TOMEE-342</a> webservice with configured deployment url example</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-335">TOMEE-335</a> Create a new JIRA saying: checking and closing JIRAs</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-129">TOMEE-129</a> Tweak TCK setup for JAX-RS tests</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-371">TOMEE-371</a> add an arquillian test using hibernate</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-275">TOMEE-275</a> review OWB integration to see if some stuff should be pushed to OWB</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-272">TOMEE-272</a> add notice for jaxrs tomee distribution</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1688">OPENEJB-1688</a> Build the Arquillian adapters as part of the main OpenEJB build</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1687">OPENEJB-1687</a> Consolidate tests and run against all Arquillian adapter</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1861">OPENEJB-1861</a> remove OWB JMSManager usage from OpenEJB</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1859">OPENEJB-1859</a> cucumber-jvm example</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1857">OPENEJB-1857</a> Example using cdi-query</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1895">OPENEJB-1895</a> Refactored @Asynchronous support</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1869">OPENEJB-1869</a> server event example</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1873">OPENEJB-1873</a> Upgrade to OpenWebBeans-1.1.5</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1885">OPENEJB-1885</a> Simplify EJB proxy code</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1614">OPENEJB-1614</a> Example: @Produces and @Disposes within a @RequestScoped context</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1406">OPENEJB-1406</a> Example: Lookup of EJBs</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1407">OPENEJB-1407</a> Example: Lookup of EJBs with descriptor</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1606">OPENEJB-1606</a> Example: CDI @Decorator and @Delegate</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-361">OPENEJB-361</a> Example: Bean-Managed Transactions</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-352">OPENEJB-352</a> Example: Stateful Bean with Callbacks</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-351">OPENEJB-351</a> Example: Stateless Bean with Callbacks</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1653">OPENEJB-1653</a> Arquillian: JSF Managed Bean Tests</li>
-
-</ul>
diff --git a/src/main/jbake/content/tomee-1.5.0.adoc b/src/main/jbake/content/tomee-1.5.0.adoc
new file mode 100644
index 0000000..0260a33
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.5.0.adoc
@@ -0,0 +1,19 @@
+= Apache TomEE 1.5 Released!
+:jbake-type: page
+:jbake-status: published
+
+We are excited to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.5].
+The volume of feedback on the 1.0.0 Final drove such an impressive number of fixes and features into TomEE that the release number has been updated to reflect xref:tomee-1.5.0-release-notes.adoc[the changes].
+
+The team is proud to announce certification of a new Apache TomEE stack that includes the Web Profile plus JAX-RS for RESTful Web Services.
+The new 'TomEE JAXRS' distribution shows TomEE's commitment to progressing its certification efforts beyond the Web Profile and is a great alternative to the TomEE Plus distribution.
+See the http://tomee.apache.org/comparison.html[comparison] for a view of all Apache TomEE distributions.
+
+Another great feature is the extended support for database connection pools.
+In addition to the previously supported Apache Commons-DBCP, the 1.5 release adds transaction support to the native Apache Tomcat and BoneCP connection pools.
+The two additional pools offer great alternatives to applications under heavy load.
+JMX instrumentation and statistics have also been added generically to all pools and provide a great level of monitoring and management.
+
+Other major features include deploy-time enhancement for JPA Entities via Apache OpenJPA, support including JPA providers in webapps, ability to mock and inject mocks in unit tests and a powerful new xref:{tomee-latest-vc}::maven/index.adoc[TomEE Maven Plugin] which can provision servers, install libraries, deploy webapps and more.
+
+We'd like to thank everyone who gave feedback and contibuted to improve Apache TomEE on a daily basis!
diff --git a/src/main/jbake/content/tomee-1.5.0.md b/src/main/jbake/content/tomee-1.5.0.md
deleted file mode 100644
index 64d00c1..0000000
--- a/src/main/jbake/content/tomee-1.5.0.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Apache TomEE 1.5 Released!
-
-We are excited to announce the release of [Apache TomEE 1.5](http://tomee.apache.org/downloads.html).  The volume of
-feedback on the 1.0.0 Final drove such an impressive number of fixes and features into TomEE that the release number
-has been updated to reflect [the changes](tomee-1.5.0-release-notes.html).
-
-The team is proud to announce certification of a new Apache TomEE stack that includes the Web Profile plus JAX-RS for
-RESTful Web Services. The new 'TomEE JAXRS' distribution shows TomEE's commitment to progressing its certification
-efforts beyond the Web Profile and is a great alternative to the TomEE Plus distribution.  See the
-[comparison](http://tomee.apache.org/comparison.html) for a view of all Apache TomEE distributions.
-
-Another great feature is the extended support for database connection pools.  In addition to the previously
-supported Apache Commons-DBCP, the 1.5 release adds transaction support to the native Apache Tomcat and BoneCP
-connection pools.  The two additional pools offer great alternatives to applications under heavy load.  JMX
-instrumentation and statistics have also been added generically to all pools and provide a great level of
-monitoring and management.
-
-Other major features include deploy-time enhancement for JPA Entities via Apache OpenJPA, support including JPA providers in webapps,
-ability to mock and inject mocks in unit tests and a powerful new [TomEE Maven Plugin](maven/index.html) which can
-provision servers, install libraries, deploy webapps and more.
-
-We’d like to thank everyone who gave feedback and contibuted to improve Apache TomEE on a daily basis!
-
diff --git a/src/main/jbake/content/tomee-1.5.1-release-notes.adoc b/src/main/jbake/content/tomee-1.5.1-release-notes.adoc
new file mode 100644
index 0000000..30b4c23
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.5.1-release-notes.adoc
@@ -0,0 +1,420 @@
+= Apache TomEE 1.5.1 Release Notes
+:jbake-type: page
+:jbake-status: published
+
+== Upgrades
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-571[TOMEE-571] Update to OWB 1.1.7
+* link:https://issues.apache.org/jira/browse/TOMEE-629[TOMEE-629] myfaces 2.1.10
+* link:https://issues.apache.org/jira/browse/TOMEE-472[TOMEE-472] XBean 3.12
+* link:https://issues.apache.org/jira/browse/TOMEE-516[TOMEE-516] ShrinkWrap 1.1.1-alpha-1
+* link:https://issues.apache.org/jira/browse/TOMEE-513[TOMEE-513] arquillian 1.0.3.Final
+* link:https://issues.apache.org/jira/browse/TOMEE-512[TOMEE-512] Shrinkwrap Descriptors 2.0.0.alpha-4
+* link:https://issues.apache.org/jira/browse/TOMEE-511[TOMEE-511] Arquilliant Transaction 1.0.0.Alpha2
+* link:https://issues.apache.org/jira/browse/TOMEE-494[TOMEE-494] Slf4j 1.7.2
+* link:https://issues.apache.org/jira/browse/TOMEE-453[TOMEE-453] Tomcat 7.0.34
+* link:https://issues.apache.org/jira/browse/TOMEE-457[TOMEE-457] cxf 2.6.3
+* link:https://issues.apache.org/jira/browse/TOMEE-455[TOMEE-455] Was not able to use CXF SOAP client with SalesForce until JAXB upgraded to 2.2.6
+* link:https://issues.apache.org/jira/browse/TOMEE-454[TOMEE-454] ActiveMQ 5.7.0
+* link:https://issues.apache.org/jira/browse/OPENEJB-1927[OPENEJB-1927] Hibernate 4.1.8.Final
+
+== New Features
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-630[TOMEE-630] add a maven archetype to start a project with tomee
+* link:https://issues.apache.org/jira/browse/TOMEE-440[TOMEE-440] add a tomee test enricher for arquillian tomee adapters
+* link:https://issues.apache.org/jira/browse/TOMEE-600[TOMEE-600] ability to inject remote initial context in tomee clients
+* link:https://issues.apache.org/jira/browse/TOMEE-473[TOMEE-473] ability to customize a bit more the classloaders
+* link:https://issues.apache.org/jira/browse/TOMEE-460[TOMEE-460] allow tomee maven plugin to reload application (war)
+* link:https://issues.apache.org/jira/browse/TOMEE-566[TOMEE-566] ability to let openejb/tomee scan entities instead of letting the jpa provider doing it
+* link:https://issues.apache.org/jira/browse/OPENEJB-1902[OPENEJB-1902] support shrinkwrap archive as library in openejb arquillian embedded adapter
+* link:https://issues.apache.org/jira/browse/OPENEJB-1906[OPENEJB-1906] active by default karaf webconsole in KarafEE
+* link:https://issues.apache.org/jira/browse/OPENEJB-1929[OPENEJB-1929] add an openejb lightweight web module to be able to write web tests more easily in embedded mode
+* link:https://issues.apache.org/jira/browse/OPENEJB-1931[OPENEJB-1931] support servlet deployment in embedded mode
+* link:https://issues.apache.org/jira/browse/AMQ-4005[AMQ-4005] Implement pluggable broker lockers
+* link:https://issues.apache.org/jira/browse/AMQ-3787[AMQ-3787] useCompression on server side specially on network of brokers
+* link:https://issues.apache.org/jira/browse/AMQ-3880[AMQ-3880] WSS transport
+* link:https://issues.apache.org/jira/browse/AMQ-3298[AMQ-3298] Cannot create bridge to WebSphere queue using default messaging provider
+* link:https://issues.apache.org/jira/browse/AMQ-3894[AMQ-3894] Add support for Broker based redelivery
+* link:https://issues.apache.org/jira/browse/AMQ-2106[AMQ-2106] Allow broker to evenly distribute message groups among consumers
+* link:https://issues.apache.org/jira/browse/AMQ-3917[AMQ-3917] ActiveMQ should support multiple durable subscriptions per Stomp client
+* link:https://issues.apache.org/jira/browse/AMQ-3924[AMQ-3924] Allow REST API to connect to the secured broker
+* link:https://issues.apache.org/jira/browse/AMQ-4065[AMQ-4065] Add optional destination suffix for the IndividualDeadLetterStrategy
+* link:https://issues.apache.org/jira/browse/CXF-4460[CXF-4460] Support static claims globally and per endpoint
+* link:https://issues.apache.org/jira/browse/MYFACES-3612[MYFACES-3612] [perf] compress/remove spaces for facelets html markup
+* link:https://issues.apache.org/jira/browse/MYFACES-3636[MYFACES-3636] Add new Web Context Parameter to set Resource Buffer Size
+
+== Improvements
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-633[TOMEE-633] More understandable 'tomee.autoconfig' property to control automatic creation of resources
+* link:https://issues.apache.org/jira/browse/TOMEE-488[TOMEE-488] Js JNDI Panel
+* link:https://issues.apache.org/jira/browse/TOMEE-486[TOMEE-486] ability to override properties values (system.properties + services) by environment
+* link:https://issues.apache.org/jira/browse/TOMEE-481[TOMEE-481] RemoteServer should stop tomcat with Bootstrap stop and not with only the socket
+* link:https://issues.apache.org/jira/browse/TOMEE-482[TOMEE-482] Split the "dangerous" parts of the tomee webapp into a secure subdir
+* link:https://issues.apache.org/jira/browse/TOMEE-480[TOMEE-480] deploy SOAP webservices using the classloader of the app/webapp containing it
+* link:https://issues.apache.org/jira/browse/TOMEE-500[TOMEE-500] tomee-jdbc doesn't handle passwordcipher
+* link:https://issues.apache.org/jira/browse/TOMEE-447[TOMEE-447] Using Handlebars
+* link:https://issues.apache.org/jira/browse/TOMEE-627[TOMEE-627] when an @Resource injection can't be statisfied the error message is not always explicit
+* link:https://issues.apache.org/jira/browse/TOMEE-476[TOMEE-476] Update Bootstrap
+* link:https://issues.apache.org/jira/browse/TOMEE-477[TOMEE-477] In Arquillian TomEE ensure test class is useable when using our custom enricher (not only load it)
+* link:https://issues.apache.org/jira/browse/TOMEE-478[TOMEE-478] JS should load WebServiceHelperImpl info
+* link:https://issues.apache.org/jira/browse/TOMEE-474[TOMEE-474] not persistent amq brokers shouldnt need to specify an empty Datasource parameter in AMQ RA
+* link:https://issues.apache.org/jira/browse/TOMEE-470[TOMEE-470] Use less.js
+* link:https://issues.apache.org/jira/browse/TOMEE-559[TOMEE-559] TomEE should be able to support the tomee. prefix for properties
+* link:https://issues.apache.org/jira/browse/TOMEE-617[TOMEE-617] Have a look if warning due to load webapp classes from tempclassloader couldnt be avoided
+* link:https://issues.apache.org/jira/browse/TOMEE-514[TOMEE-514] JSONProvider - default setting of serializeAsArray is true, leading to marshaling error in out-of-the-box CXF configuration
+* link:https://issues.apache.org/jira/browse/TOMEE-510[TOMEE-510] shade javax.management.* from mbean annotation api to openejb-api to be able to use it even in OSGi and show it is not (yet) standard
+* link:https://issues.apache.org/jira/browse/TOMEE-596[TOMEE-596] provide a way to limit package took into account when using openejb to scan jpa entities
+* link:https://issues.apache.org/jira/browse/TOMEE-462[TOMEE-462] avoid to reload classes from appclassloader in tempclassloader
+* link:https://issues.apache.org/jira/browse/TOMEE-464[TOMEE-464] lazystopclassloader should call stop after destroyapplication to allow reload without memory leak
+* link:https://issues.apache.org/jira/browse/TOMEE-468[TOMEE-468] skip sub folders properly when synchronizing conf/lib/bin in arquillian adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-467[TOMEE-467] ability to specify CATALINA_OPTS in arquillian.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-498[TOMEE-498] tomee maven plugin can't use removeDefaultWebapps if adding a custom webapp
+* link:https://issues.apache.org/jira/browse/TOMEE-569[TOMEE-569] cdi resolution in ear are not complete from webapp
+* link:https://issues.apache.org/jira/browse/TOMEE-499[TOMEE-499] OpenEJBContextConfig doesn't handle correctly ROOT webapp
+* link:https://issues.apache.org/jira/browse/TOMEE-565[TOMEE-565] set tomee serverinfo
+* link:https://issues.apache.org/jira/browse/TOMEE-567[TOMEE-567] Check for invalid attributes in tomee.xml file
+* link:https://issues.apache.org/jira/browse/TOMEE-560[TOMEE-560] allow to use a custom bean validation impl in webapps
+* link:https://issues.apache.org/jira/browse/TOMEE-525[TOMEE-525] set openejb.jmx.active to false by default
+* link:https://issues.apache.org/jira/browse/TOMEE-490[TOMEE-490] Use regular xmlhttp requests is the browser does not support websockets
+* link:https://issues.apache.org/jira/browse/TOMEE-561[TOMEE-561] Rethink arquillian-tomee-webapp-remote adapter to reflect user experience with installer
+* link:https://issues.apache.org/jira/browse/TOMEE-563[TOMEE-563] better mapping of openejb bootstrap in tomee.sh (to get cipher command\...)
+* link:https://issues.apache.org/jira/browse/TOMEE-495[TOMEE-495] if a bean is @Local and @LocalBean local business interface are ignored in CDI resolution
+* link:https://issues.apache.org/jira/browse/TOMEE-496[TOMEE-496] expose a Single Line Formatter useable with arquillian tomee remote adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-497[TOMEE-497] arquillian tomee remote should expose a simpleLog attribute to get more readable log (embedded mode like)
+* link:https://issues.apache.org/jira/browse/TOMEE-452[TOMEE-452] resource in context.xml not available
+* link:https://issues.apache.org/jira/browse/TOMEE-612[TOMEE-612] use javax.persistence.validation.mode is validationMode is not set in persistence.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-615[TOMEE-615] ear cdi and specializations/alternatives
+* link:https://issues.apache.org/jira/browse/TOMEE-611[TOMEE-611] if validation mode of jpa is none we shouldn't pass the validation factory to the emf
+* link:https://issues.apache.org/jira/browse/OPENEJB-1924[OPENEJB-1924] in arquillian-openejb-embedded release creational context of test class
+* link:https://issues.apache.org/jira/browse/OPENEJB-1925[OPENEJB-1925] don't suppose openejb (embedded) is started from app classloader for JULI classes
+* link:https://issues.apache.org/jira/browse/OPENEJB-1926[OPENEJB-1926] ignore org.scalatest interfaces
+* link:https://issues.apache.org/jira/browse/OPENEJB-1920[OPENEJB-1920] [KARAFEE] imported services in cdi should only be the service on the deployed bundle
+* link:https://issues.apache.org/jira/browse/OPENEJB-1903[OPENEJB-1903] managing ShrinkWrap resources in embedded openejb adapter
+* link:https://issues.apache.org/jira/browse/OPENEJB-1921[OPENEJB-1921] [KARAFEE] getResources should aggregate instead of returning the first value
+* link:https://issues.apache.org/jira/browse/OPENEJB-1908[OPENEJB-1908] [KarafEE] use a transaction manager from OSGi registry
+* link:https://issues.apache.org/jira/browse/OPENEJB-1909[OPENEJB-1909] try etc folder if conf folder is not available
+* link:https://issues.apache.org/jira/browse/OPENEJB-1911[OPENEJB-1911] ProxyEJB shouldnt add IvmProxy and Serializable interface for all localbean proxies
+* link:https://issues.apache.org/jira/browse/OPENEJB-1912[OPENEJB-1912] KarafEE logs
+* link:https://issues.apache.org/jira/browse/OPENEJB-1933[OPENEJB-1933] When implicitely creating a non jta or jta datasource for a persistence unit the max initial size should be 5 and not the same than the model to avoid too much netweork bandwith usage
+* link:https://issues.apache.org/jira/browse/OPENEJB-1915[OPENEJB-1915] ignore net.sourceforge.cobertura.coveragedata.HasBeenInstrumented for ejb interfaces
+* link:https://issues.apache.org/jira/browse/OPENEJB-1916[OPENEJB-1916] KarafEE distribution should come with its bundle in system repo
+* link:https://issues.apache.org/jira/browse/OPENEJB-1913[OPENEJB-1913] avoid NPE in OSGi Deployer
+* link:https://issues.apache.org/jira/browse/OPENEJB-1932[OPENEJB-1932] basic filter + servletcontextinitializer support for applicationcomposer
+* link:https://issues.apache.org/jira/browse/OPENEJB-1914[OPENEJB-1914] revisit slightly the way bundle are retrieved in felix (karafee)
+* link:https://issues.apache.org/jira/browse/OPENEJB-1956[OPENEJB-1956] try to get rootUrl for persistence units even with ApplicationComposer
+* link:https://issues.apache.org/jira/browse/AMQ-4003[AMQ-4003] Add option to PooledConnectionFactory to control if connection should be created on startup or not
+* link:https://issues.apache.org/jira/browse/AMQ-4004[AMQ-4004] activemq-pool - Rename maximumActive option maximumActiveSessionPerConnection
+* link:https://issues.apache.org/jira/browse/AMQ-4008[AMQ-4008] Tomcat WARN on shutdown about ThreadLocal not cleared from log4j
+* link:https://issues.apache.org/jira/browse/AMQ-3986[AMQ-3986] Allow optimizeDurableTopicPrefetch to be set using resource adapter properties
+* link:https://issues.apache.org/jira/browse/AMQ-3983[AMQ-3983] Fix osgi dependency
+* link:https://issues.apache.org/jira/browse/AMQ-3980[AMQ-3980] Websocket transport: support increasing the max size of websocket messages
+* link:https://issues.apache.org/jira/browse/AMQ-3696[AMQ-3696] Slave broker cannot be stopped in a JDBC Master/Slave configuration within OSGi
+* link:https://issues.apache.org/jira/browse/AMQ-3890[AMQ-3890] Turn dependency on fusemq-leveldb optional
+* link:https://issues.apache.org/jira/browse/AMQ-3893[AMQ-3893] Adjust topic policy entry in default configuration
+* link:https://issues.apache.org/jira/browse/AMQ-3991[AMQ-3991] Output version number in started log line to be consistent
+* link:https://issues.apache.org/jira/browse/AMQ-4027[AMQ-4027] Add support for java 7 in AbstractJmxCommand
+* link:https://issues.apache.org/jira/browse/AMQ-4026[AMQ-4026] Refactor logic to shutdown thread pools using a single API to ensure better shutdown and offer logging et all
+* link:https://issues.apache.org/jira/browse/AMQ-4029[AMQ-4029] Unregistering mbean should handle null mbean names
+* link:https://issues.apache.org/jira/browse/AMQ-4028[AMQ-4028] Add support for testing secured web sockets
+* link:https://issues.apache.org/jira/browse/AMQ-3861[AMQ-3861] Offer a way to not set a transaction manager in activemq-camel
+* link:https://issues.apache.org/jira/browse/AMQ-4012[AMQ-4012] Use english locale for introspection support when discovering setter/getter method names
+* link:https://issues.apache.org/jira/browse/AMQ-4011[AMQ-4011] Refactor IntrospectionSupport to avoid using java bean property editors
+* link:https://issues.apache.org/jira/browse/AMQ-4010[AMQ-4010] Use pre compiled patterns for JMX ObjectName encoder
+* link:https://issues.apache.org/jira/browse/AMQ-4019[AMQ-4019] Make better use of commons-pool in activemq-pool
+* link:https://issues.apache.org/jira/browse/AMQ-4016[AMQ-4016] org.apache.activemq.ActiveMQConnectionFactory - Seems like static thread pool is not used
+* link:https://issues.apache.org/jira/browse/AMQ-4015[AMQ-4015] Add uptime to broker mbean and when stopping broker to report its uptime
+* link:https://issues.apache.org/jira/browse/AMQ-3877[AMQ-3877] Add ability to set a timeout for the calls made to Broker MBeans
+* link:https://issues.apache.org/jira/browse/AMQ-3878[AMQ-3878] Reset stats automatically without dependancy on JMX / Java APIs
+* link:https://issues.apache.org/jira/browse/AMQ-3224[AMQ-3224] Redelivery per destination
+* link:https://issues.apache.org/jira/browse/AMQ-3770[AMQ-3770] Generalize LDAP group processing / LDAP group expansion
+* link:https://issues.apache.org/jira/browse/AMQ-3534[AMQ-3534] Fixes to poms to allow eclipse indigo and m2eclipse to not show errors.
+* link:https://issues.apache.org/jira/browse/AMQ-3902[AMQ-3902] Documentation for JMS Bridge With Oracle AQ
+* link:https://issues.apache.org/jira/browse/AMQ-3813[AMQ-3813] limit the number of producers and consumers created by a Connection
+* link:https://issues.apache.org/jira/browse/AMQ-3815[AMQ-3815] Hybrid Master Slave Architecture
+* link:https://issues.apache.org/jira/browse/AMQ-3918[AMQ-3918] Expose transport connector URIs in uniform fashion
+* link:https://issues.apache.org/jira/browse/AMQ-3913[AMQ-3913] Stomp Spec allows for stomp headers to have spaces in key or value we currently trim.
+* link:https://issues.apache.org/jira/browse/AMQ-3914[AMQ-3914] Add support for MS SQL JDBC driver 4.0
+* link:https://issues.apache.org/jira/browse/AMQ-3940[AMQ-3940] REST API - support application/json response type
+* link:https://issues.apache.org/jira/browse/AMQ-4049[AMQ-4049] Polish the AMQ start|stop logging
+* link:https://issues.apache.org/jira/browse/AMQ-3847[AMQ-3847] Optional import for org.apache.activemq.pool in activemq-camel should be required
+* link:https://issues.apache.org/jira/browse/AMQ-3060[AMQ-3060] java.lang.ClassCastException: org.apache.activemq.broker.region.QueueSubscription cannot be cast to org.apache.activemq.broker.region.DurableTopicSubscription
+* link:https://issues.apache.org/jira/browse/AMQ-3950[AMQ-3950] Blueprint version should be [0.3,2)
+* link:https://issues.apache.org/jira/browse/AMQ-3859[AMQ-3859] To tight version range in activemq features file
+* link:https://issues.apache.org/jira/browse/AMQ-3822[AMQ-3822] The current sslContext element does not provide the ability to define the keystore key password key.
+* link:https://issues.apache.org/jira/browse/AMQ-3960[AMQ-3960] Update 5.7 to use Apache Camel 2.10.x
+* link:https://issues.apache.org/jira/browse/AMQ-4069[AMQ-4069] Upgrade Maven Plugins
+* link:https://issues.apache.org/jira/browse/AMQ-4066[AMQ-4066] Cleanup of old deprecated methods and classes from the code base.
+* link:https://issues.apache.org/jira/browse/AMQ-4067[AMQ-4067] Prefix Thread names with ActiveMQ
+* link:https://issues.apache.org/jira/browse/AMQ-3554[AMQ-3554] activemq:create command should use name as argument in place of option
+* link:https://issues.apache.org/jira/browse/AMQ-4063[AMQ-4063] Trim RAR to not included Derby JAR
+* link:https://issues.apache.org/jira/browse/AMQ-4060[AMQ-4060] activemq-optional - Upgrade Spring OXM to Spring 3 version
+* link:https://issues.apache.org/jira/browse/AMQ-3972[AMQ-3972] Add an 'isDisposed' check before calling 'propagateFailureToExceptionListener' in FailoverTransport
+* link:https://issues.apache.org/jira/browse/AMQ-3444[AMQ-3444] Fail Fast or Warn on using fileCursors/fileQueueCursors when+++<broker persistent="false">+++</li>
+* link:https://issues.apache.org/jira/browse/AMQ-4057[AMQ-4057] activemq-option - Upgrade to http client 4.2
+* link:https://issues.apache.org/jira/browse/CXF-4488[CXF-4488] Making importing com.sun.tools* packages by cxf-rf-databinding-jaxb optional in CXF 2.6
+* link:https://issues.apache.org/jira/browse/CXF-4485[CXF-4485] Provide optional support for inheriting WADL resource parameters
+* link:https://issues.apache.org/jira/browse/CXF-4501[CXF-4501] AtomPojoProvider should be able to get the entry content directly from POJO
+* link:https://issues.apache.org/jira/browse/CXF-4497[CXF-4497] Configure WSDL generation to ignore jaxb.index and ObjectFactory
+* link:https://issues.apache.org/jira/browse/CXF-4495[CXF-4495] Extend SimpleAuthorizingInterceptor to check only configured roles
+* link:https://issues.apache.org/jira/browse/CXF-4490[CXF-4490] cxf-codegen-plugin does not detect changes in WSDL loaded from classpath
+* link:https://issues.apache.org/jira/browse/CXF-4506[CXF-4506] support to set the username and password on the wsn service configuration
+* link:https://issues.apache.org/jira/browse/CXF-4521[CXF-4521] Optimization for other stax implementations
+* link:https://issues.apache.org/jira/browse/CXF-4519[CXF-4519] Make it possible to specify schemas specific to individual types
+* link:https://issues.apache.org/jira/browse/CXF-3813[CXF-3813] Possibiblity to only validate requests and/or responses
+* link:https://issues.apache.org/jira/browse/CXF-4515[CXF-4515] maven java2ws plugin address configuration
+* link:https://issues.apache.org/jira/browse/CXF-4479[CXF-4479] Improve "No namespace on "\{0}" element" error message.
+* link:https://issues.apache.org/jira/browse/CXF-4532[CXF-4532] Java First @Policy support bean references
+* link:https://issues.apache.org/jira/browse/CXF-4431[CXF-4431] Add support for OAuth2 'mac' token type
+* link:https://issues.apache.org/jira/browse/MYFACES-3623[MYFACES-3623] [perf] avoid use HashSet for check empty html elements in HtmlResponseWriterImpl
+* link:https://issues.apache.org/jira/browse/MYFACES-3635[MYFACES-3635] [perf] Improvements over #\{cc} and #{cc.attrs} evaluation
+* link:https://issues.apache.org/jira/browse/MYFACES-3619[MYFACES-3619] Define a special property to specify when a component is created by facelets ( oam.vf.addedByHandler )
+* link:https://issues.apache.org/jira/browse/MYFACES-3628[MYFACES-3628] [perf] do not calculate facelets view mappings and context suffixes if not necessary
+* link:https://issues.apache.org/jira/browse/MYFACES-3645[MYFACES-3645] review/refactor/document ViewState handling </ul>
+
+== Bugs
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-578[TOMEE-578] Tomee Drop-in WARs installer "install" button points to a bad path
+* link:https://issues.apache.org/jira/browse/TOMEE-487[TOMEE-487] deployerejb uses home to create unique file, it should be base if temp dir is not writable
+* link:https://issues.apache.org/jira/browse/TOMEE-483[TOMEE-483] plus and jaxrs webapp doesn't have classes in web-inf/classes
+* link:https://issues.apache.org/jira/browse/TOMEE-441[TOMEE-441] TomEE doesn't stop with arquillian adapter (remote) under windows
+* link:https://issues.apache.org/jira/browse/TOMEE-444[TOMEE-444] tomee webapp enricher suppose tomee libs are in+++<tomee>+++/lib folder (not the case when using tomcat+tomee webapp)</li>
+* link:https://issues.apache.org/jira/browse/TOMEE-443[TOMEE-443] MyFaces does not integrate with OWB EL resolver
+* link:https://issues.apache.org/jira/browse/TOMEE-446[TOMEE-446] Failed to service TomEE as a service on Windows
+* link:https://issues.apache.org/jira/browse/TOMEE-445[TOMEE-445] @RequestScoped @Stateful EJB beans are not destroyed after request completes
+* link:https://issues.apache.org/jira/browse/TOMEE-479[TOMEE-479] Can't use custom typed resource references and factories
+* link:https://issues.apache.org/jira/browse/TOMEE-475[TOMEE-475] tomcat request.isCallerInRole doesn't work
+* link:https://issues.apache.org/jira/browse/TOMEE-436[TOMEE-436] Getting SEVERE: OpenEJBContextConfig.processAnnotationsFile: failed. on Windows
+* link:https://issues.apache.org/jira/browse/TOMEE-515[TOMEE-515] NoClassDefFoundError Exception while marshaling data in CXF RS to JSON
+* link:https://issues.apache.org/jira/browse/TOMEE-508[TOMEE-508] EntityManager dependency considered not passivation capable (CDI spec violation)
+* link:https://issues.apache.org/jira/browse/TOMEE-461[TOMEE-461] faces-config.xml can't be empty
+* link:https://issues.apache.org/jira/browse/TOMEE-466[TOMEE-466] "Activation failed" messages for @ConversationScoped @Stateful bean
+* link:https://issues.apache.org/jira/browse/TOMEE-624[TOMEE-624] ?hen webapp is ROOT rest services can't find the webapp
+* link:https://issues.apache.org/jira/browse/TOMEE-598[TOMEE-598] (cdi) appscope and singleton are not well destroyed
+* link:https://issues.apache.org/jira/browse/TOMEE-469[TOMEE-469] Hotkeys listener
+* link:https://issues.apache.org/jira/browse/TOMEE-568[TOMEE-568] TomEE doesn't support WARDirContext
+* link:https://issues.apache.org/jira/browse/TOMEE-564[TOMEE-564] Installation page for drop war does not work (old style web ui)
+* link:https://issues.apache.org/jira/browse/TOMEE-524[TOMEE-524] EARs not re-unpacked on startup when changed
+* link:https://issues.apache.org/jira/browse/TOMEE-493[TOMEE-493] Regression on TomEE vs Tomcat 7 on Windows native library loading
+* link:https://issues.apache.org/jira/browse/TOMEE-521[TOMEE-521] EAR modules' default name should not contain the .jar or .war extension
+* link:https://issues.apache.org/jira/browse/TOMEE-523[TOMEE-523] EAR war file context path should default to /+++<ear-name>+++/+++<module-name>+++/+++<servlets>+++*</li>
+* link:https://issues.apache.org/jira/browse/TOMEE-522[TOMEE-522] EAR modules'+++<module-name>+++ignored</li>
+* link:https://issues.apache.org/jira/browse/TOMEE-451[TOMEE-451] CDI injection in servlet of a webapp included in an ear doesn't work
+* link:https://issues.apache.org/jira/browse/TOMEE-456[TOMEE-456] some jndi names are not unbound
+* link:https://issues.apache.org/jira/browse/TOMEE-459[TOMEE-459] exclusions.list not working properly
+* link:https://issues.apache.org/jira/browse/TOMEE-610[TOMEE-610] when using <Deployment \...> TomcatJndiBinder doesn't find webcontext in general
+* link:https://issues.apache.org/jira/browse/OPENEJB-1905[OPENEJB-1905] karafee version is not well filtered in rebranding module
+* link:https://issues.apache.org/jira/browse/OPENEJB-1923[OPENEJB-1923] openejb main doesn't support parameter with -D inside (A-D for instance)
+* link:https://issues.apache.org/jira/browse/OPENEJB-1907[OPENEJB-1907] revisit KarafEE import package and shade
+* link:https://issues.apache.org/jira/browse/OPENEJB-1928[OPENEJB-1928] avoid to load openejb classes with multiple classloader in karafee
+* link:https://issues.apache.org/jira/browse/OPENEJB-1930[OPENEJB-1930] serialization of timerdata is too strict for manual timers
+* link:https://issues.apache.org/jira/browse/OPENEJB-1938[OPENEJB-1938] Embedded ActiveMQ broker startup and shutdown fails to observe configured timeout
+* link:https://issues.apache.org/jira/browse/OPENEJB-1910[OPENEJB-1910] IvmProxy shouldnt be used when creating ejb as OSGi services in KarafEE
+* link:https://issues.apache.org/jira/browse/OPENEJB-1934[OPENEJB-1934] arquillian-openejb-embedded-4 doesn't manage properly war libraries regarding cdi
+* link:https://issues.apache.org/jira/browse/OPENEJB-1954[OPENEJB-1954] Arquillian tests don't fail immediately if Test cannot be enriched
+* link:https://issues.apache.org/jira/browse/OPENEJB-1959[OPENEJB-1959] DeploymentListenerObserver should be public
+* link:https://issues.apache.org/jira/browse/OPENEJB-1961[OPENEJB-1961] Classloader memory leak by Threads which is started by org.apache.openejb.loader.Files
+* link:https://issues.apache.org/jira/browse/OWB-719[OWB-719] @Named qualifier is not adhering to CDI spec default naming conventions
+* link:https://issues.apache.org/jira/browse/OWB-718[OWB-718] Decorator can't call two methods of the delegate object in the same method
+* link:https://issues.apache.org/jira/browse/OWB-711[OWB-711] Specialization does not deactivate Observer methods in parent class
+* link:https://issues.apache.org/jira/browse/OWB-720[OWB-720] injections using generic not well managed
+* link:https://issues.apache.org/jira/browse/OWB-732[OWB-732] ClassLoader leak in WebBeansUtil.isScopeTypeNormalCache
+* link:https://issues.apache.org/jira/browse/OWB-713[OWB-713] Static observer methods of superclasses are not called when a method with the same name and parameters exists in the subclass
+* link:https://issues.apache.org/jira/browse/OWB-725[OWB-725] Beans containing a producerMethod are using the wrong CreationalContext
+* link:https://issues.apache.org/jira/browse/OWB-734[OWB-734] CLONE - AbstractProducer stores CreationalContext
+* link:https://issues.apache.org/jira/browse/OWB-724[OWB-724] Ambiguous producer methods and fields are not detected due to bug in AbstractProducerBean equals and hashCode
+* link:https://issues.apache.org/jira/browse/OWB-722[OWB-722] @Typed not respected for beans using generics
+* link:https://issues.apache.org/jira/browse/AMQ-4001[AMQ-4001] activemq karaf feature uses different commons-lang than pom
+* link:https://issues.apache.org/jira/browse/AMQ-4002[AMQ-4002] Instance of BlobTransferPolicy and its URL are being shared among multiple messages
+* link:https://issues.apache.org/jira/browse/AMQ-4007[AMQ-4007] BrokerService TempUsage and StoreUsage Default Values Are Incorrect
+* link:https://issues.apache.org/jira/browse/AMQ-3785[AMQ-3785] ActiveMQSslConnectionFactory does not detect ssl request in failover URIs when creating transports
+* link:https://issues.apache.org/jira/browse/AMQ-3989[AMQ-3989] ActiveMQSslConnectionFactory.setKeyAndTrustManagers does not work with failover enabled using 5.7 snapshot Jars
+* link:https://issues.apache.org/jira/browse/AMQ-3988[AMQ-3988] PooledSession throw Exception at closing
+* link:https://issues.apache.org/jira/browse/AMQ-3987[AMQ-3987] For JMSUsecaseTest, incompatible types found : javax.jms.Message required: org.apache.activemq.Message
+* link:https://issues.apache.org/jira/browse/AMQ-3985[AMQ-3985] ActiveMQConnection temp advisory consumer should use asyncDispatch - can cause deadlock with slow consumers
+* link:https://issues.apache.org/jira/browse/AMQ-3882[AMQ-3882] Broker should not send advisories for slow consumers or fast producers if the destination in question is an advisory destination already.
+* link:https://issues.apache.org/jira/browse/AMQ-3881[AMQ-3881] Handy diagnostic script for troubleshooting ActiveMQ problems
+* link:https://issues.apache.org/jira/browse/AMQ-3982[AMQ-3982] Overlapping PList iterators can read wrong data or throw exceptions about chunk streams not existing.
+* link:https://issues.apache.org/jira/browse/AMQ-3981[AMQ-3981] ActiveMQSslConnectionFactory.java now has apache commons dependency
+* link:https://issues.apache.org/jira/browse/AMQ-3885[AMQ-3885] ActiveMQ java client doesn't scale to thousands of queues
+* link:https://issues.apache.org/jira/browse/AMQ-3889[AMQ-3889] Body Preview of BytesMessages change when browsed multiple times from QueueViewMbean
+* link:https://issues.apache.org/jira/browse/AMQ-3887[AMQ-3887] Occasional Null Pointer Exception during NetworkConnector connection
+* link:https://issues.apache.org/jira/browse/AMQ-3791[AMQ-3791] Flexibility, concurrency, security, and compatibility issues in CachedLDAPAuthorizationMap
+* link:https://issues.apache.org/jira/browse/AMQ-3797[AMQ-3797] org.apache.activemq.util.StringArrayEditor causes classloader leaks
+* link:https://issues.apache.org/jira/browse/AMQ-3998[AMQ-3998] Incorrect reporting of pendingQueueSize of durable subs after reconnect with unacked
+* link:https://issues.apache.org/jira/browse/AMQ-3997[AMQ-3997] Memory leak in activemq-pool
+* link:https://issues.apache.org/jira/browse/AMQ-3999[AMQ-3999] Unsubscribing durable subs can be blocked on calls to determine store size, contending with active subs
+* link:https://issues.apache.org/jira/browse/AMQ-3994[AMQ-3994] DefaultDatabaseLocker will leak pooled connections on link failure
+* link:https://issues.apache.org/jira/browse/AMQ-3891[AMQ-3891] Durable subscribers receiving duplicate messages
+* link:https://issues.apache.org/jira/browse/AMQ-3995[AMQ-3995] PListTest.testSerialAddIterate runs for over 30 minutes on Hudson nodes
+* link:https://issues.apache.org/jira/browse/AMQ-3895[AMQ-3895] Broker sends a STOMP RECEIPT frame although the subscription fails
+* link:https://issues.apache.org/jira/browse/AMQ-3992[AMQ-3992] Zero Prefetch consumers increment the Enqueue Counter when the pull times out
+* link:https://issues.apache.org/jira/browse/AMQ-3897[AMQ-3897] Stomp 1.1 keep alive does not work with stomp+nio
+* link:https://issues.apache.org/jira/browse/AMQ-3896[AMQ-3896] AMQ3622Test throws NumberFormatException on ec2/ubuntu 10.04
+* link:https://issues.apache.org/jira/browse/AMQ-3669[AMQ-3669] Pending producer with qMirror, messages are not spooled to disk
+* link:https://issues.apache.org/jira/browse/AMQ-3664[AMQ-3664] Not all messages will be acknowledged when optimizeAcknowledge is true
+* link:https://issues.apache.org/jira/browse/AMQ-3860[AMQ-3860] doAddMessageReference missing setting priority into prepared statement therefore using wrong index for message itself
+* link:https://issues.apache.org/jira/browse/AMQ-3868[AMQ-3868] ActiveMQ 5.6 - RAR deployment is not working on JBoss6
+* link:https://issues.apache.org/jira/browse/AMQ-3867[AMQ-3867] Unable to delete messages whose original destination is virtual topic from web console
+* link:https://issues.apache.org/jira/browse/AMQ-3865[AMQ-3865] AjaxTest fails all tests due to line ending differences
+* link:https://issues.apache.org/jira/browse/AMQ-3863[AMQ-3863] XA session is returned twice to the pool
+* link:https://issues.apache.org/jira/browse/AMQ-4017[AMQ-4017] Demand Forwarding Bridge uses value of asyncDispatch for advisory consumers
+* link:https://issues.apache.org/jira/browse/AMQ-3871[AMQ-3871] Problem in OrderPendingList can lead to message not being deliver after durable sub reconnect.
+* link:https://issues.apache.org/jira/browse/AMQ-3870[AMQ-3870] ArrayIndexOutOfBoundsException when using Multi kahaDB (mKahaDB) adapter, per-destination adapters and Topics
+* link:https://issues.apache.org/jira/browse/AMQ-3879[AMQ-3879] Temporary queues may be deleted by the wrong connection
+* link:https://issues.apache.org/jira/browse/AMQ-3873[AMQ-3873] Occasional deadlock during startup
+* link:https://issues.apache.org/jira/browse/AMQ-3872[AMQ-3872] Implement "exactly once" delivery with JDBC and XA in the event of a failure post prepare
+* link:https://issues.apache.org/jira/browse/AMQ-2521[AMQ-2521] Some JMX operations fail with SecurityException with secured broker
+* link:https://issues.apache.org/jira/browse/AMQ-3654[AMQ-3654] JDBC Master/Slave : Slave cannot acquire lock when the master loose database connection.
+* link:https://issues.apache.org/jira/browse/AMQ-3633[AMQ-3633] [OSGi] activemq-web-console: exception after restart container
+* link:https://issues.apache.org/jira/browse/AMQ-2453[AMQ-2453] start/control-script is not suitable for professional environments
+* link:https://issues.apache.org/jira/browse/AMQ-4090[AMQ-4090] Missing svn:ignores
+* link:https://issues.apache.org/jira/browse/AMQ-4084[AMQ-4084] Linux/Unix Files Have Incorrect EOL When Packaged
+* link:https://issues.apache.org/jira/browse/AMQ-3807[AMQ-3807] MBeans are not unregistered under WebSphere
+* link:https://issues.apache.org/jira/browse/AMQ-3908[AMQ-3908] StompSslAuthTest.testSubscribeWithReceiptNotAuthorized() fails
+* link:https://issues.apache.org/jira/browse/AMQ-2656[AMQ-2656] ActiveMQInitialConnectionFactory cannot return an XAConnectionFactory
+* link:https://issues.apache.org/jira/browse/AMQ-3909[AMQ-3909] Messages sometimes not received by active topic subscriptions
+* link:https://issues.apache.org/jira/browse/AMQ-3903[AMQ-3903] Failed to fire fast producer advisory, reason: java.lang.NullPointerException
+* link:https://issues.apache.org/jira/browse/AMQ-3905[AMQ-3905] Karaf: activemq:create-broker results in only locally visible broker
+* link:https://issues.apache.org/jira/browse/AMQ-3912[AMQ-3912] Durable subs store messages in error with broker attribute persistent="false"
+* link:https://issues.apache.org/jira/browse/AMQ-4081[AMQ-4081] favicon should be handled as binary file in assembly
+* link:https://issues.apache.org/jira/browse/AMQ-4083[AMQ-4083] Consumers in Client Ack sessions can fail to ack expired messages in some cases
+* link:https://issues.apache.org/jira/browse/AMQ-4076[AMQ-4076] sizePrefixDisabled and/or maxFrameSize change in AcriveMq 5.6 broke FilePendingMessageCursor for big messages
+* link:https://issues.apache.org/jira/browse/AMQ-3919[AMQ-3919] getDestinationMap does not return temp destinations
+* link:https://issues.apache.org/jira/browse/AMQ-3915[AMQ-3915] JMX connector does not bind to a specific host when a connectHost is specified on the managementContext
+* link:https://issues.apache.org/jira/browse/AMQ-2665[AMQ-2665] Durable subscription re-activation failed when keepDurableSubsActive=true.
+* link:https://issues.apache.org/jira/browse/AMQ-3727[AMQ-3727] activemq-web-console: AjaxServlet not working in OSGi container
+* link:https://issues.apache.org/jira/browse/AMQ-3921[AMQ-3921] Duplicated durable subscriptions after broker retart with option keepDurableSubsActive=true
+* link:https://issues.apache.org/jira/browse/AMQ-3920[AMQ-3920] Performance issue with delay policy in DestinationBridge.onMessage
+* link:https://issues.apache.org/jira/browse/AMQ-3923[AMQ-3923] Webconsole should import javax.servlet.* too
+* link:https://issues.apache.org/jira/browse/AMQ-3925[AMQ-3925] Advisory messages/topics not generated for ActiveMQ.Advisory.FULL or ActiveMQ.Advisory.FastProducer.Queue
+* link:https://issues.apache.org/jira/browse/AMQ-3927[AMQ-3927] can't connect to stomp protocol 1.1 using telnet
+* link:https://issues.apache.org/jira/browse/AMQ-3929[AMQ-3929] STOMP multiple header handling incorrect per the 1.1 spec
+* link:https://issues.apache.org/jira/browse/AMQ-2488[AMQ-2488] Unable to access Serializable class when receiving ObjectMessage in OSGi environment
+* link:https://issues.apache.org/jira/browse/AMQ-3934[AMQ-3934] QueueViewMBean.getMessage throws NullPointerException when message not found
+* link:https://issues.apache.org/jira/browse/AMQ-3932[AMQ-3932] receiveNoWait hangs when broker is down, using failover and prefetch=0
+* link:https://issues.apache.org/jira/browse/AMQ-3931[AMQ-3931] Memory problems with large transactions
+* link:https://issues.apache.org/jira/browse/AMQ-3935[AMQ-3935] JConsole browse() function does not work if useCache=false
+* link:https://issues.apache.org/jira/browse/AMQ-3936[AMQ-3936] activemq status return codes should be LSB compliant
+* link:https://issues.apache.org/jira/browse/AMQ-3939[AMQ-3939] FailoverTransport never closes backup connections
+* link:https://issues.apache.org/jira/browse/AMQ-3841[AMQ-3841] mKahaDB causes ArrayIndexOutOfBoundsException on restart after deleting existing queues
+* link:https://issues.apache.org/jira/browse/AMQ-3845[AMQ-3845] CachedLDAPAuthorizationMap doesn't handle the ldap connectino dying
+* link:https://issues.apache.org/jira/browse/AMQ-3846[AMQ-3846] The JMX message move, copy and remove operation do not take messages in FIFO order
+* link:https://issues.apache.org/jira/browse/AMQ-3943[AMQ-3943] Connect to ActiveMQ server's jmx feature,but failed.
+* link:https://issues.apache.org/jira/browse/AMQ-4042[AMQ-4042] Rest MessageServlet on osgi failes to start
+* link:https://issues.apache.org/jira/browse/AMQ-3848[AMQ-3848] Messages Are Not Read With Multiple Consumers
+* link:https://issues.apache.org/jira/browse/AMQ-4043[AMQ-4043] Web demo - Receive a message page renders an error page
+* link:https://issues.apache.org/jira/browse/AMQ-3849[AMQ-3849] Typos in protobuf specs + generated Java code for KahaDB
+* link:https://issues.apache.org/jira/browse/AMQ-4047[AMQ-4047] activemq-optional - Should include the JARs it needs
+* link:https://issues.apache.org/jira/browse/AMQ-4044[AMQ-4044] Shutting down AcitveMQ broker started in foreground logs 2 times
+* link:https://issues.apache.org/jira/browse/AMQ-3852[AMQ-3852] Stomp transport allows durable topic subscriber to subscribe to a queue
+* link:https://issues.apache.org/jira/browse/AMQ-3853[AMQ-3853] Missing import in activemq-web-console
+* link:https://issues.apache.org/jira/browse/AMQ-3856[AMQ-3856] MessageServlet assumes TextMessages contain Text
+* link:https://issues.apache.org/jira/browse/AMQ-3857[AMQ-3857] MessageServlet get messages does not return JMS Message Properties
+* link:https://issues.apache.org/jira/browse/AMQ-3854[AMQ-3854] Referencing old spring xsd in configuration files
+* link:https://issues.apache.org/jira/browse/AMQ-3855[AMQ-3855] MQTT doesn't translate wildcards to ActiveMQ wildcards
+* link:https://issues.apache.org/jira/browse/AMQ-3955[AMQ-3955] WebSocket Transport - Race condition starting transport
+* link:https://issues.apache.org/jira/browse/AMQ-3956[AMQ-3956] KahaDB pagefile (db.data) steady growth - BTreeIndex page leak
+* link:https://issues.apache.org/jira/browse/AMQ-3953[AMQ-3953] org.apache.activemq.util.URISupport.isCompositeURI doesn't work properly.
+* link:https://issues.apache.org/jira/browse/AMQ-3954[AMQ-3954] Intended delivery mode for JMSUsecaseTest is not tested
+* link:https://issues.apache.org/jira/browse/AMQ-3951[AMQ-3951] LDAP Connection Timeouts in CachedLDAPAuthorizationMap
+* link:https://issues.apache.org/jira/browse/AMQ-3958[AMQ-3958] META-INF/spring.schemas does not contain a reference to 5.6.0 schema
+* link:https://issues.apache.org/jira/browse/AMQ-4030[AMQ-4030] Tomcat7 with ActiveMQ-5.6 or ActiveMQ-5.7 starts with error
+* link:https://issues.apache.org/jira/browse/AMQ-4031[AMQ-4031] BrokerFactoryBean logs error when starting a non persistent broker
+* link:https://issues.apache.org/jira/browse/AMQ-3858[AMQ-3858] Failure to resolve local jmx url for sunJvm can result in npe
+* link:https://issues.apache.org/jira/browse/AMQ-4033[AMQ-4033] AMQ Broker - Uses custom RMIServerSocketFactory class which cannot be unloaded due socket reuse
+* link:https://issues.apache.org/jira/browse/AMQ-4035[AMQ-4035] Null pointer in class KahaDBStore programmed
+* link:https://issues.apache.org/jira/browse/AMQ-4070[AMQ-4070] catstomp.rb does not work anymore
+* link:https://issues.apache.org/jira/browse/AMQ-3961[AMQ-3961] Durable subscriber only receives part of the persisted messages on re-connect
+* link:https://issues.apache.org/jira/browse/AMQ-3962[AMQ-3962] Memory leak bacause of InactivityMonitor thread
+* link:https://issues.apache.org/jira/browse/AMQ-2170[AMQ-2170] Incoherent documentation / strange property names for advisory messages
+* link:https://issues.apache.org/jira/browse/AMQ-3965[AMQ-3965] Expired msgs not getting acked to broker causing consumer to fill up its prefetch and not getting more msgs.
+* link:https://issues.apache.org/jira/browse/AMQ-3594[AMQ-3594] Stuck messages in topic after restart of ActiveMQ
+* link:https://issues.apache.org/jira/browse/AMQ-3557[AMQ-3557] Performance of consumption with JDBC persistance and Microsoft SQL Server
+* link:https://issues.apache.org/jira/browse/AMQ-4062[AMQ-4062] durableTopicPrefetch attribute in policyEntry in activemq.xml dont take effect
+* link:https://issues.apache.org/jira/browse/AMQ-3828[AMQ-3828] URISupport incorrectly handles parenthesis
+* link:https://issues.apache.org/jira/browse/AMQ-3451[AMQ-3451] Tomcat 6.0.32 complains that ActiveMQ 5.5 doesn't shutdown a thread
+* link:https://issues.apache.org/jira/browse/AMQ-3827[AMQ-3827] The SslContext definition is not used by the https transport protocol.
+* link:https://issues.apache.org/jira/browse/AMQ-3832[AMQ-3832] Upgrade maven-bundle-plugin
+* link:https://issues.apache.org/jira/browse/AMQ-3831[AMQ-3831] Exit code is not properly returned when using RUN_AS_USER
+* link:https://issues.apache.org/jira/browse/AMQ-3973[AMQ-3973] data.db size is not included in calculation to monitor systemUsage settings
+* link:https://issues.apache.org/jira/browse/AMQ-3976[AMQ-3976] ActiveMQMessageProducer::send uses == instead of equals to compare destinations
+* link:https://issues.apache.org/jira/browse/AMQ-3979[AMQ-3979] AjaxServlet preventing Tomcat Container from shutting down.
+* link:https://issues.apache.org/jira/browse/AMQ-4058[AMQ-4058] http transport should remove options in uri
+* link:https://issues.apache.org/jira/browse/AMQ-4052[AMQ-4052] When consumers was killed and restarted frequently, some messages could not be consumed by consumer but they were still in pending messages.
+* link:https://issues.apache.org/jira/browse/AMQ-3837[AMQ-3837] BrokerFacade returns more connections than expect when call getConnections by connector name
+* link:https://issues.apache.org/jira/browse/AMQ-3836[AMQ-3836] STOMP 1.0 protocol (SUBSCRIBE destination) broken on ActiveMQ 5.6.0
+* link:https://issues.apache.org/jira/browse/CXF-4541[CXF-4541] idl2wsdl not finding properly scoped structure elements
+* link:https://issues.apache.org/jira/browse/CXF-4542[CXF-4542] @XmlJavaTypeAdapter ignored on exception classes
+* link:https://issues.apache.org/jira/browse/CXF-4540[CXF-4540] Colon character in the password is not hanled properly in AbstractHTTPDestination class
+* link:https://issues.apache.org/jira/browse/CXF-4545[CXF-4545] ut_sign + sign_enc samples broken in last releases
+* link:https://issues.apache.org/jira/browse/CXF-4484[CXF-4484] Claims to SAML attribute encoding wrong
+* link:https://issues.apache.org/jira/browse/CXF-4487[CXF-4487] cxf-codegen-plugin: Error resolving component warnings for imported types
+* link:https://issues.apache.org/jira/browse/CXF-4481[CXF-4481] unable to generate WADL to java
+* link:https://issues.apache.org/jira/browse/CXF-4500[CXF-4500] Evaluate jaxrs:schemaLocations after jaxrs:providers
+* link:https://issues.apache.org/jira/browse/CXF-4539[CXF-4539] WS-Security inbound performance regression
+* link:https://issues.apache.org/jira/browse/CXF-4537[CXF-4537] XmlAdapter Not Being Used
+* link:https://issues.apache.org/jira/browse/CXF-4552[CXF-4552] typical HTML form payload does not seem to work when HTML form is used
+* link:https://issues.apache.org/jira/browse/CXF-4499[CXF-4499] wrong charset encoding in FormEncodingProvider
+* link:https://issues.apache.org/jira/browse/CXF-4496[CXF-4496] find of ResponseExceptionMapper do not handle runtime exceptions
+* link:https://issues.apache.org/jira/browse/CXF-4494[CXF-4494] JMSDestination need set binary mode if server send MTOM message back
+* link:https://issues.apache.org/jira/browse/CXF-4493[CXF-4493] If javax.jws.Oneway annotation is specified for a SOAP interface method a NPE occurs
+* link:https://issues.apache.org/jira/browse/CXF-4511[CXF-4511] WS-RM Sequence header should have mustUnderstand attribute
+* link:https://issues.apache.org/jira/browse/CXF-4503[CXF-4503] TransformOutInterceptor may lose namespace declarations in some elements
+* link:https://issues.apache.org/jira/browse/CXF-4505[CXF-4505] Invalid WS-RM messages may not be correctly rejected by WS-RM destination
+* link:https://issues.apache.org/jira/browse/CXF-4507[CXF-4507] bug in SchemaJavascriptBuilder while deserializing an Array
+* link:https://issues.apache.org/jira/browse/CXF-4508[CXF-4508] @Context fails to inject SearchContext into JAX-RS resource bean
+* link:https://issues.apache.org/jira/browse/CXF-4523[CXF-4523] Unclosed XMLStreamReader/Writer causes leaking
+* link:https://issues.apache.org/jira/browse/CXF-4522[CXF-4522] The logicalHandler could not modify the soap:body content if provider uses the SOAPMessage
+* link:https://issues.apache.org/jira/browse/CXF-4520[CXF-4520] XMLStreamException about namespace has not been bound to a prefix with other stax implemenation
+* link:https://issues.apache.org/jira/browse/CXF-4518[CXF-4518] CXF bundle jax-ws-catalog.xml doesn't include mapping of "http://www.w3.org/2006/03/addressing"
+* link:https://issues.apache.org/jira/browse/CXF-4517[CXF-4517] ClassCastException in WS-RM when RMP 200702 assertions are used
+* link:https://issues.apache.org/jira/browse/CXF-4514[CXF-4514] JAXRS client ignores enum properties when populating request URI from beans
+* link:https://issues.apache.org/jira/browse/CXF-4476[CXF-4476] Content-Disposition header may be incorrectly set in MTOM under windows
+* link:https://issues.apache.org/jira/browse/CXF-4475[CXF-4475] LoggingInInterceptor throws when pretty printing MTOM messages
+* link:https://issues.apache.org/jira/browse/CXF-4477[CXF-4477] [WADL2JAVA] Generate incorrect primitive parameter type
+* link:https://issues.apache.org/jira/browse/CXF-4533[CXF-4533] Encoding error in CachedOutputStream when double-byte char is on 1024 byte boundary
+* link:https://issues.apache.org/jira/browse/CXF-4535[CXF-4535] SOAP fault XML is invalid when a details element exists
+* link:https://issues.apache.org/jira/browse/CXF-4534[CXF-4534] SortedMap is returned as HashMap
+* link:https://issues.apache.org/jira/browse/CXF-4526[CXF-4526] PolicyAnnotationListener throws NPE in jar
+* link:https://issues.apache.org/jira/browse/CXF-4528[CXF-4528] WebApplicationExceptionMapper is too shy
+* link:https://issues.apache.org/jira/browse/MYFACES-3620[MYFACES-3620] jsf.js: @this results in a javascript error
+* link:https://issues.apache.org/jira/browse/MYFACES-3638[MYFACES-3638] NPE in ServerSideStateCacheImpl
+* link:https://issues.apache.org/jira/browse/MYFACES-3646[MYFACES-3646] remove unused src/main/old from core-impl
+* link:https://issues.apache.org/jira/browse/MYFACES-3637[MYFACES-3637] jsf.js: All Script Tags are Evaluated (wrong behavior)
+* link:https://issues.apache.org/jira/browse/MYFACES-3649[MYFACES-3649] myfaces-shaded-impl always unpacks myfaces-2.1.1
+* link:https://issues.apache.org/jira/browse/MYFACES-3630[MYFACES-3630] PartialViewContextImpl.findHeadComponent and findBodyComponent does not take into account h:head or h:body inside child of UIViewRoot
+* link:https://issues.apache.org/jira/browse/MYFACES-3617[MYFACES-3617] NullPointerException occurs when using an EL Expression in f:viewParam name attribute
+* link:https://issues.apache.org/jira/browse/MYFACES-3641[MYFACES-3641] ViewDeclarationLanguageFactoryImpl.getViewDeclarationLanguage(String viewId) should not throw exception if no associate VDL can be found
+* link:https://issues.apache.org/jira/browse/MYFACES-3618[MYFACES-3618] jsf.js: ajax response is missing a param in the error handing of replaceHtmlItem
+* link:https://issues.apache.org/jira/browse/MYFACES-3616[MYFACES-3616] Javascript: Method call with wrong argument size after error in AJAX request/response
+* link:https://issues.apache.org/jira/browse/MYFACES-3613[MYFACES-3613] NPE in composite component when ActionListener is missing in the source
+* link:https://issues.apache.org/jira/browse/MYFACES-3626[MYFACES-3626] f:ajax execute '@none' submitted as explicit request param, firing source listeners
+* link:https://issues.apache.org/jira/browse/MYFACES-3632[MYFACES-3632] resource bundle name with bean property collition when trying to set value
+* link:https://issues.apache.org/jira/browse/MYFACES-3631[MYFACES-3631] Malformed Ajax XML Response with duplicated IDs
+* link:https://issues.apache.org/jira/browse/MYFACES-3627[MYFACES-3627] jsf.js: DomExperimental.js isMultipartCandidate fails on older IE Versions </ul>
+
+== Tasks & Sub-Tasks
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-442[TOMEE-442] valid using hostname in webapp id is fine
+* link:https://issues.apache.org/jira/browse/TOMEE-439[TOMEE-439] refactor DeployerEjb to be able to deploy war as Tomcat
+* link:https://issues.apache.org/jira/browse/OPENEJB-1922[OPENEJB-1922] [KARAFEE] see how to take into account cdi dependencies
+* link:https://issues.apache.org/jira/browse/AMQ-4006[AMQ-4006] activemq-pool - Upgrade to commons-pool 1.6.0
+* link:https://issues.apache.org/jira/browse/AMQ-3784[AMQ-3784] Download page lists lots of releases; they are not in order and most of the pages point to the wrong location
+* link:https://issues.apache.org/jira/browse/AMQ-4013[AMQ-4013] Upgrade to xbean 3.11
+* link:https://issues.apache.org/jira/browse/AMQ-4041[AMQ-4041] Upgrade ActiveMQ karaf feature
+* link:https://issues.apache.org/jira/browse/AMQ-4045[AMQ-4045] Unit test shows NPE in BrokerService
+* link:https://issues.apache.org/jira/browse/AMQ-4038[AMQ-4038] Favor using JARs from Maven central
+* link:https://issues.apache.org/jira/browse/AMQ-4039[AMQ-4039] Upgrade 3rd party dependency JARs and align with SMX/Camel
+* link:https://issues.apache.org/jira/browse/AMQ-4056[AMQ-4056] Remove activemq-jmdns module
+* link:https://issues.apache.org/jira/browse/AMQ-4053[AMQ-4053] Cleanup duplicate JARs in ActiveMQ distro
+* link:https://issues.apache.org/jira/browse/AMQ-3945[AMQ-3945] QueueBrowser missing messages on first browse.
+* link:https://issues.apache.org/jira/browse/AMQ-3947[AMQ-3947] ActiveMQConnectionFactory doesn't set the nestedMapAndListEnabled property on new Connections
+* link:https://issues.apache.org/jira/browse/AMQ-3967[AMQ-3967] ActiveMQJmsHeaderRouteTest doesn't work with Apache Camel 2.10
+* link:https://issues.apache.org/jira/browse/AMQ-3969[AMQ-3969] ActiveMQJmsHeaderRouteTest doesn't work with Apache Camel 2.10
+* link:https://issues.apache.org/jira/browse/AMQ-3968[AMQ-3968] ActiveMQJmsHeaderRouteTest doesn't work with Apache Camel 2.10
+* link:https://issues.apache.org/jira/browse/AMQ-3970[AMQ-3970] ActiveMQJmsHeaderRouteTest doesn't work with Apache Camel 2.10+++</module-name>++++++</servlets>++++++</module-name>++++++</ear-name>++++++</tomee>++++++</broker>+++
diff --git a/src/main/jbake/content/tomee-1.5.1-release-notes.md b/src/main/jbake/content/tomee-1.5.1-release-notes.md
deleted file mode 100644
index a56c4cb..0000000
--- a/src/main/jbake/content/tomee-1.5.1-release-notes.md
+++ /dev/null
@@ -1,430 +0,0 @@
-Title: Apache TomEE 1.5.1 Release Notes
-
-<h2>Upgrades</h2>
-
-<ul>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-571">TOMEE-571</a> Update to OWB 1.1.7</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-629">TOMEE-629</a> myfaces 2.1.10</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-472">TOMEE-472</a> XBean 3.12</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-516">TOMEE-516</a> ShrinkWrap 1.1.1-alpha-1</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-513">TOMEE-513</a> arquillian 1.0.3.Final</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-512">TOMEE-512</a> Shrinkwrap Descriptors 2.0.0.alpha-4</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-511">TOMEE-511</a> Arquilliant Transaction 1.0.0.Alpha2</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-494">TOMEE-494</a> Slf4j 1.7.2</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-453">TOMEE-453</a> Tomcat 7.0.34</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-457">TOMEE-457</a> cxf 2.6.3</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-455">TOMEE-455</a> Was not able to use CXF SOAP client with SalesForce until JAXB upgraded to 2.2.6</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-454">TOMEE-454</a> ActiveMQ 5.7.0</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1927">OPENEJB-1927</a> Hibernate 4.1.8.Final</li>
-</ul>
-
-<h2>New Features</h2>
-
-<ul>
-
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-630">TOMEE-630</a> add a maven archetype to start a project with tomee</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-440">TOMEE-440</a> add a tomee test enricher for arquillian tomee adapters</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-600">TOMEE-600</a> ability to inject remote initial context in tomee clients</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-473">TOMEE-473</a> ability to customize a bit more the classloaders</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-460">TOMEE-460</a> allow tomee maven plugin to reload application (war)</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-566">TOMEE-566</a> ability to let openejb/tomee scan entities instead of letting the jpa provider doing it</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1902">OPENEJB-1902</a> support shrinkwrap archive as library in openejb arquillian embedded adapter</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1906">OPENEJB-1906</a> active by default karaf webconsole in KarafEE</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1929">OPENEJB-1929</a> add an openejb lightweight web module to be able to write web tests more easily in embedded mode</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1931">OPENEJB-1931</a> support servlet deployment in embedded mode</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4005">AMQ-4005</a> Implement pluggable broker lockers</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3787">AMQ-3787</a> useCompression on server side specially on network of brokers</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3880">AMQ-3880</a> WSS transport</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3298">AMQ-3298</a> Cannot create bridge to WebSphere queue using default messaging provider</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3894">AMQ-3894</a> Add support for Broker based redelivery</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-2106">AMQ-2106</a> Allow broker to evenly distribute message groups among consumers</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3917">AMQ-3917</a> ActiveMQ should support multiple durable subscriptions per Stomp client</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3924">AMQ-3924</a> Allow REST API to connect to the secured broker</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4065">AMQ-4065</a> Add optional destination suffix for the IndividualDeadLetterStrategy</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4460">CXF-4460</a> Support static claims globally and per endpoint</li>
-    <li><a href="https://issues.apache.org/jira/browse/MYFACES-3612">MYFACES-3612</a> [perf] compress/remove spaces for facelets html markup</li>
-    <li><a href="https://issues.apache.org/jira/browse/MYFACES-3636">MYFACES-3636</a> Add new Web Context Parameter to set Resource Buffer Size</li>
-</ul>
-
-<h2>Improvements</h2>
-
-<ul>
-
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-633">TOMEE-633</a> More understandable 'tomee.autoconfig' property to control automatic creation of resources</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-488">TOMEE-488</a> Js JNDI Panel</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-486">TOMEE-486</a> ability to override properties values (system.properties + services) by environment</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-481">TOMEE-481</a> RemoteServer should stop tomcat with Bootstrap stop and not with only the socket</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-482">TOMEE-482</a> Split the "dangerous" parts of the tomee webapp into a secure subdir</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-480">TOMEE-480</a> deploy SOAP webservices using the classloader of the app/webapp containing it</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-500">TOMEE-500</a> tomee-jdbc doesn't handle passwordcipher</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-447">TOMEE-447</a> Using Handlebars</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-627">TOMEE-627</a> when an @Resource injection can't be statisfied the error message is not always explicit</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-476">TOMEE-476</a> Update Bootstrap</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-477">TOMEE-477</a> In Arquillian TomEE ensure test class is useable when using our custom enricher (not only load it)</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-478">TOMEE-478</a> JS should load WebServiceHelperImpl info</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-474">TOMEE-474</a> not persistent amq brokers shouldnt need to specify an empty Datasource parameter in AMQ RA</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-470">TOMEE-470</a> Use less.js</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-559">TOMEE-559</a> TomEE should be able to support the tomee. prefix for properties</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-617">TOMEE-617</a> Have a look if warning due to load webapp classes from tempclassloader couldnt be avoided</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-514">TOMEE-514</a> JSONProvider - default setting of serializeAsArray is true, leading to marshaling error in out-of-the-box CXF configuration</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-510">TOMEE-510</a> shade javax.management.* from mbean annotation api to openejb-api to be able to use it even in OSGi and show it is not (yet) standard</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-596">TOMEE-596</a> provide a way to limit package took into account when using openejb to scan jpa entities</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-462">TOMEE-462</a> avoid to reload classes from appclassloader in tempclassloader</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-464">TOMEE-464</a> lazystopclassloader should call stop after destroyapplication to allow reload without memory leak</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-468">TOMEE-468</a> skip sub folders properly when synchronizing conf/lib/bin in arquillian adapter</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-467">TOMEE-467</a> ability to specify CATALINA_OPTS in arquillian.xml</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-498">TOMEE-498</a> tomee maven plugin can't use removeDefaultWebapps if adding a custom webapp</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-569">TOMEE-569</a> cdi resolution in ear are not complete from webapp</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-499">TOMEE-499</a> OpenEJBContextConfig doesn't handle correctly ROOT webapp</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-565">TOMEE-565</a> set tomee serverinfo</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-567">TOMEE-567</a> Check for invalid attributes in tomee.xml file</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-560">TOMEE-560</a> allow to use a custom bean validation impl in webapps</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-525">TOMEE-525</a> set openejb.jmx.active to false by default</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-490">TOMEE-490</a> Use regular xmlhttp requests is the browser does not support websockets</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-561">TOMEE-561</a> Rethink arquillian-tomee-webapp-remote adapter to reflect user experience with installer</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-563">TOMEE-563</a> better mapping of openejb bootstrap in tomee.sh (to get cipher command...)</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-495">TOMEE-495</a> if a bean is @Local and @LocalBean local business interface are ignored in CDI resolution</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-496">TOMEE-496</a> expose a Single Line Formatter useable with arquillian tomee remote adapter</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-497">TOMEE-497</a> arquillian tomee remote should expose a simpleLog attribute to get more readable log (embedded mode like)</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-452">TOMEE-452</a> resource in context.xml not available</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-612">TOMEE-612</a> use javax.persistence.validation.mode is validationMode is not set in persistence.xml</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-615">TOMEE-615</a> ear cdi and specializations/alternatives</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-611">TOMEE-611</a> if validation mode of jpa is none we shouldn't pass the validation factory to the emf</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1924">OPENEJB-1924</a> in arquillian-openejb-embedded release creational context of test class</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1925">OPENEJB-1925</a> don't suppose openejb (embedded) is started from app classloader for JULI classes</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1926">OPENEJB-1926</a> ignore org.scalatest interfaces</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1920">OPENEJB-1920</a> [KARAFEE] imported services in cdi should only be the service on the deployed bundle</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1903">OPENEJB-1903</a> managing ShrinkWrap resources in embedded openejb adapter</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1921">OPENEJB-1921</a> [KARAFEE] getResources should aggregate instead of returning the first value</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1908">OPENEJB-1908</a> [KarafEE] use a transaction manager from OSGi registry</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1909">OPENEJB-1909</a> try etc folder if conf folder is not available</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1911">OPENEJB-1911</a> ProxyEJB shouldnt add IvmProxy and Serializable interface for all localbean proxies</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1912">OPENEJB-1912</a> KarafEE logs</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1933">OPENEJB-1933</a> When implicitely creating a non jta or jta datasource for a persistence unit the max initial size should be 5 and not the same than the model to avoid too much netweork bandwith usage</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1915">OPENEJB-1915</a> ignore net.sourceforge.cobertura.coveragedata.HasBeenInstrumented for ejb interfaces</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1916">OPENEJB-1916</a> KarafEE distribution should come with its bundle in system repo</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1913">OPENEJB-1913</a> avoid NPE in OSGi Deployer</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1932">OPENEJB-1932</a> basic filter + servletcontextinitializer support for applicationcomposer</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1914">OPENEJB-1914</a> revisit slightly the way bundle are retrieved in felix (karafee)</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1956">OPENEJB-1956</a> try to get rootUrl for persistence units even with ApplicationComposer</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4003">AMQ-4003</a> Add option to PooledConnectionFactory to control if connection should be created on startup or not</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4004">AMQ-4004</a> activemq-pool - Rename maximumActive option maximumActiveSessionPerConnection</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4008">AMQ-4008</a> Tomcat WARN on shutdown about ThreadLocal not cleared from log4j</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3986">AMQ-3986</a> Allow optimizeDurableTopicPrefetch to be set using resource adapter properties</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3983">AMQ-3983</a> Fix osgi dependency</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3980">AMQ-3980</a> Websocket transport: support increasing the max size of websocket messages</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3696">AMQ-3696</a> Slave broker cannot be stopped in a JDBC Master/Slave configuration within OSGi</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3890">AMQ-3890</a> Turn dependency on fusemq-leveldb optional</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3893">AMQ-3893</a> Adjust topic policy entry in default configuration</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3991">AMQ-3991</a> Output version number in started log line to be consistent</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4027">AMQ-4027</a> Add support for java 7 in AbstractJmxCommand</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4026">AMQ-4026</a> Refactor logic to shutdown thread pools using a single API to ensure better shutdown and offer logging et all</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4029">AMQ-4029</a> Unregistering mbean should handle null mbean names</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4028">AMQ-4028</a> Add support for testing secured web sockets</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3861">AMQ-3861</a> Offer a way to not set a transaction manager in activemq-camel</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4012">AMQ-4012</a> Use english locale for introspection support when discovering setter/getter method names</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4011">AMQ-4011</a> Refactor IntrospectionSupport to avoid using java bean property editors</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4010">AMQ-4010</a> Use pre compiled patterns for JMX ObjectName encoder</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4019">AMQ-4019</a> Make better use of commons-pool in activemq-pool</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4016">AMQ-4016</a> org.apache.activemq.ActiveMQConnectionFactory - Seems like static thread pool is not used</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4015">AMQ-4015</a> Add uptime to broker mbean and when stopping broker to report its uptime</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3877">AMQ-3877</a> Add ability to set a timeout for the calls made to Broker MBeans</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3878">AMQ-3878</a> Reset stats automatically without dependancy on JMX / Java APIs</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3224">AMQ-3224</a> Redelivery per destination</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3770">AMQ-3770</a> Generalize LDAP group processing / LDAP group expansion</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3534">AMQ-3534</a> Fixes to poms to allow eclipse indigo and m2eclipse to not show errors.</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3902">AMQ-3902</a> Documentation for JMS Bridge With Oracle AQ </li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3813">AMQ-3813</a> limit the number of producers and consumers created by a Connection</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3815">AMQ-3815</a> Hybrid Master Slave Architecture</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3918">AMQ-3918</a> Expose transport connector URIs in uniform fashion</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3913">AMQ-3913</a> Stomp Spec allows for stomp headers to have spaces in key or value we currently trim.</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3914">AMQ-3914</a> Add support for MS SQL JDBC driver 4.0</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3940">AMQ-3940</a> REST API - support application/json response type</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4049">AMQ-4049</a> Polish the AMQ start|stop logging</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3847">AMQ-3847</a> Optional import for org.apache.activemq.pool in activemq-camel should be required</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3060">AMQ-3060</a> java.lang.ClassCastException: org.apache.activemq.broker.region.QueueSubscription cannot be cast to org.apache.activemq.broker.region.DurableTopicSubscription</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3950">AMQ-3950</a> Blueprint version should be [0.3,2)</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3859">AMQ-3859</a> To tight version range in activemq features file</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3822">AMQ-3822</a> The current sslContext element does not provide the ability to define the keystore key password key.</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3960">AMQ-3960</a> Update 5.7 to use Apache Camel 2.10.x</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4069">AMQ-4069</a> Upgrade Maven Plugins</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4066">AMQ-4066</a> Cleanup of old deprecated methods and classes from the code base.</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4067">AMQ-4067</a> Prefix Thread names with ActiveMQ</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3554">AMQ-3554</a> activemq:create command should use name as argument in place of option</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4063">AMQ-4063</a> Trim RAR to not included Derby JAR</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4060">AMQ-4060</a> activemq-optional - Upgrade Spring OXM to Spring 3 version</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3972">AMQ-3972</a> Add an 'isDisposed' check before calling 'propagateFailureToExceptionListener' in FailoverTransport</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3444">AMQ-3444</a> Fail Fast or Warn on using fileCursors/fileQueueCursors when <broker persistent="false"></li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4057">AMQ-4057</a> activemq-option - Upgrade to http client 4.2</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4488">CXF-4488</a> Making importing com.sun.tools* packages by cxf-rf-databinding-jaxb optional in CXF 2.6</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4485">CXF-4485</a> Provide optional support for inheriting WADL resource parameters</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4501">CXF-4501</a> AtomPojoProvider should be able to get the entry content directly from POJO</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4497">CXF-4497</a> Configure WSDL generation to ignore jaxb.index and ObjectFactory</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4495">CXF-4495</a> Extend SimpleAuthorizingInterceptor to check only configured roles</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4490">CXF-4490</a> cxf-codegen-plugin does not detect changes in WSDL loaded from classpath</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4506">CXF-4506</a> support to set the username and password on the wsn service configuration</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4521">CXF-4521</a> Optimization for other stax implementations</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4519">CXF-4519</a> Make it possible to specify schemas specific to individual types</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-3813">CXF-3813</a> Possibiblity to only validate requests and/or responses</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4515">CXF-4515</a> maven java2ws plugin address configuration</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4479">CXF-4479</a> Improve "No namespace on "{0}" element" error message.</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4532">CXF-4532</a> Java First @Policy support bean references</li>
-    <li><a href="https://issues.apache.org/jira/browse/CXF-4431">CXF-4431</a> Add support for OAuth2 'mac' token type</li>
-    <li><a href="https://issues.apache.org/jira/browse/MYFACES-3623">MYFACES-3623</a> [perf] avoid use HashSet for check empty html elements in HtmlResponseWriterImpl</li>
-    <li><a href="https://issues.apache.org/jira/browse/MYFACES-3635">MYFACES-3635</a> [perf] Improvements over #{cc} and #{cc.attrs} evaluation</li>
-    <li><a href="https://issues.apache.org/jira/browse/MYFACES-3619">MYFACES-3619</a> Define a special property to specify when a component is created by facelets  ( oam.vf.addedByHandler )</li>
-    <li><a href="https://issues.apache.org/jira/browse/MYFACES-3628">MYFACES-3628</a> [perf] do not calculate facelets view mappings and context suffixes if not necessary</li>
-    <li><a href="https://issues.apache.org/jira/browse/MYFACES-3645">MYFACES-3645</a> review/refactor/document ViewState handling</li>
-</ul>
-
-<h2>Bugs</h2>
-
-<ul>
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-578">TOMEE-578</a> Tomee Drop-in WARs installer "install" button points to a bad path </li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-487">TOMEE-487</a> deployerejb uses home to create unique file, it should be base if temp dir is not writable</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-483">TOMEE-483</a> plus and jaxrs webapp doesn't have classes in web-inf/classes</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-441">TOMEE-441</a> TomEE doesn't stop with arquillian adapter (remote) under windows</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-444">TOMEE-444</a> tomee webapp enricher suppose tomee libs are in <tomee>/lib folder (not the case when using tomcat+tomee webapp)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-443">TOMEE-443</a> MyFaces does not integrate with OWB EL resolver</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-446">TOMEE-446</a> Failed to service TomEE as a service on Windows</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-445">TOMEE-445</a> @RequestScoped @Stateful EJB beans are not destroyed after request completes</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-479">TOMEE-479</a> Can't use custom typed resource references and factories</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-475">TOMEE-475</a> tomcat request.isCallerInRole doesn't work</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-436">TOMEE-436</a> Getting SEVERE: OpenEJBContextConfig.processAnnotationsFile: failed. on Windows</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-515">TOMEE-515</a> NoClassDefFoundError Exception while marshaling data in CXF RS to JSON </li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-508">TOMEE-508</a> EntityManager dependency considered not passivation capable (CDI spec violation)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-461">TOMEE-461</a> faces-config.xml can't be empty</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-466">TOMEE-466</a> "Activation failed" messages for @ConversationScoped @Stateful bean</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-624">TOMEE-624</a> ?hen webapp is ROOT rest services can't find the webapp</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-598">TOMEE-598</a> (cdi) appscope and singleton are not well destroyed</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-469">TOMEE-469</a> Hotkeys listener</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-568">TOMEE-568</a> TomEE doesn't support WARDirContext</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-564">TOMEE-564</a> Installation page for drop war does not work (old style web ui)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-524">TOMEE-524</a> EARs not re-unpacked on startup when changed</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-493">TOMEE-493</a> Regression on TomEE vs Tomcat 7 on Windows native library loading</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-521">TOMEE-521</a> EAR modules' default name should not contain the .jar or .war extension</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-523">TOMEE-523</a> EAR war file context path should default to /<ear-name>/<module-name>/<servlets>*</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-522">TOMEE-522</a> EAR modules' <module-name> ignored</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-451">TOMEE-451</a> CDI injection in servlet of a webapp included in an ear doesn't work</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-456">TOMEE-456</a> some jndi names are not unbound</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-459">TOMEE-459</a> exclusions.list not working properly</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-610">TOMEE-610</a> when using <Deployment ...> TomcatJndiBinder doesn't find webcontext in general</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1905">OPENEJB-1905</a> karafee version is not well filtered in rebranding module</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1923">OPENEJB-1923</a> openejb main doesn't support parameter with -D inside (A-D for instance)</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1907">OPENEJB-1907</a> revisit KarafEE import package and shade</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1928">OPENEJB-1928</a> avoid to load openejb classes with multiple classloader in karafee</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1930">OPENEJB-1930</a> serialization of timerdata is too strict for manual timers</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1938">OPENEJB-1938</a> Embedded ActiveMQ broker startup and shutdown fails to observe configured timeout</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1910">OPENEJB-1910</a> IvmProxy shouldnt be used when creating ejb as OSGi services in KarafEE</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1934">OPENEJB-1934</a> arquillian-openejb-embedded-4 doesn't manage properly war libraries regarding cdi</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1954">OPENEJB-1954</a> Arquillian tests don't fail immediately if Test cannot be enriched</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1959">OPENEJB-1959</a> DeploymentListenerObserver should be public</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-1961">OPENEJB-1961</a> Classloader memory leak by Threads which is started by org.apache.openejb.loader.Files</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-719">OWB-719</a> @Named qualifier is not adhering to CDI spec default naming conventions</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-718">OWB-718</a> Decorator can't call two methods of the delegate object in the same method</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-711">OWB-711</a> Specialization does not deactivate Observer methods in parent class</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-720">OWB-720</a> injections using generic not well managed</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-732">OWB-732</a> ClassLoader leak in WebBeansUtil.isScopeTypeNormalCache</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-713">OWB-713</a> Static observer methods of superclasses are not called when a method with the same name and parameters exists in the subclass</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-725">OWB-725</a> Beans containing a producerMethod are using the wrong CreationalContext</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-734">OWB-734</a> CLONE - AbstractProducer stores CreationalContext</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-724">OWB-724</a> Ambiguous producer methods and fields are not detected due to bug in AbstractProducerBean equals and hashCode</li>
-<li><a href="https://issues.apache.org/jira/browse/OWB-722">OWB-722</a> @Typed not respected for beans using generics</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4001">AMQ-4001</a> activemq karaf feature uses different commons-lang than pom</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4002">AMQ-4002</a> Instance of BlobTransferPolicy and its URL are being shared among multiple messages</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4007">AMQ-4007</a> BrokerService TempUsage and StoreUsage Default Values Are Incorrect</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3785">AMQ-3785</a> ActiveMQSslConnectionFactory does not detect ssl request in failover URIs when creating transports</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3989">AMQ-3989</a> ActiveMQSslConnectionFactory.setKeyAndTrustManagers does not work with failover enabled using 5.7 snapshot Jars</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3988">AMQ-3988</a> PooledSession throw Exception at closing</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3987">AMQ-3987</a> For JMSUsecaseTest, incompatible types found   : javax.jms.Message required: org.apache.activemq.Message </li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3985">AMQ-3985</a> ActiveMQConnection temp advisory consumer should use asyncDispatch - can cause deadlock with slow consumers</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3882">AMQ-3882</a> Broker should not send advisories for slow consumers or fast producers if the destination in question is an advisory destination already.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3881">AMQ-3881</a>  Handy diagnostic script for troubleshooting ActiveMQ problems</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3982">AMQ-3982</a> Overlapping PList iterators can read wrong data or throw exceptions about chunk streams not existing.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3981">AMQ-3981</a> ActiveMQSslConnectionFactory.java now has apache commons dependency</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3885">AMQ-3885</a> ActiveMQ java client doesn't scale to thousands of queues</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3889">AMQ-3889</a> Body Preview of BytesMessages change when browsed multiple times from QueueViewMbean</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3887">AMQ-3887</a> Occasional Null Pointer Exception during NetworkConnector connection</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3791">AMQ-3791</a> Flexibility, concurrency, security, and compatibility issues in CachedLDAPAuthorizationMap</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3797">AMQ-3797</a> org.apache.activemq.util.StringArrayEditor causes classloader leaks</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3998">AMQ-3998</a> Incorrect reporting of pendingQueueSize of durable subs after reconnect with unacked</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3997">AMQ-3997</a> Memory leak in activemq-pool</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3999">AMQ-3999</a> Unsubscribing durable subs can be blocked on calls to determine store size, contending with active subs</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3994">AMQ-3994</a> DefaultDatabaseLocker will leak pooled connections on link failure</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3891">AMQ-3891</a> Durable subscribers receiving duplicate messages</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3995">AMQ-3995</a> PListTest.testSerialAddIterate runs for over 30 minutes on Hudson nodes</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3895">AMQ-3895</a> Broker sends a STOMP RECEIPT frame although the subscription fails</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3992">AMQ-3992</a> Zero Prefetch consumers increment the Enqueue Counter when the pull times out</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3897">AMQ-3897</a> Stomp 1.1 keep alive does not work with stomp+nio</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3896">AMQ-3896</a> AMQ3622Test throws NumberFormatException on ec2/ubuntu 10.04</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3669">AMQ-3669</a> Pending producer with qMirror, messages are not spooled to disk</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3664">AMQ-3664</a> Not all messages will be acknowledged when optimizeAcknowledge is true</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3860">AMQ-3860</a> doAddMessageReference missing setting priority into prepared statement therefore using wrong index for message itself </li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3868">AMQ-3868</a> ActiveMQ 5.6 - RAR deployment is not working on JBoss6</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3867">AMQ-3867</a> Unable to delete messages whose original destination is virtual topic from web console</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3865">AMQ-3865</a> AjaxTest fails all tests due to line ending differences</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3863">AMQ-3863</a> XA session is returned twice to the pool</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4017">AMQ-4017</a> Demand Forwarding Bridge uses value of asyncDispatch for advisory consumers</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3871">AMQ-3871</a> Problem in OrderPendingList can lead to message not being deliver after durable sub reconnect.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3870">AMQ-3870</a> ArrayIndexOutOfBoundsException when using Multi kahaDB (mKahaDB) adapter, per-destination adapters and Topics</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3879">AMQ-3879</a> Temporary queues may be deleted by the wrong connection</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3873">AMQ-3873</a> Occasional deadlock during startup</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3872">AMQ-3872</a> Implement "exactly once" delivery with JDBC and XA in the event of a failure post prepare</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-2521">AMQ-2521</a> Some JMX operations fail with SecurityException with secured broker</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3654">AMQ-3654</a> JDBC Master/Slave : Slave cannot acquire lock when the master loose database connection.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3633">AMQ-3633</a> [OSGi] activemq-web-console: exception after restart container</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-2453">AMQ-2453</a> start/control-script is not suitable for professional environments</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4090">AMQ-4090</a> Missing svn:ignores</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4084">AMQ-4084</a> Linux/Unix Files Have Incorrect EOL When Packaged</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3807">AMQ-3807</a> MBeans are not unregistered under WebSphere</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3908">AMQ-3908</a> StompSslAuthTest.testSubscribeWithReceiptNotAuthorized() fails</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-2656">AMQ-2656</a> ActiveMQInitialConnectionFactory cannot return an XAConnectionFactory</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3909">AMQ-3909</a> Messages sometimes not received by active topic subscriptions</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3903">AMQ-3903</a> Failed to fire fast producer advisory, reason: java.lang.NullPointerException</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3905">AMQ-3905</a> Karaf: activemq:create-broker results in only locally visible broker</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3912">AMQ-3912</a> Durable subs store messages in error with broker attribute persistent="false"</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4081">AMQ-4081</a> favicon should be handled as binary file in assembly</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4083">AMQ-4083</a> Consumers in Client Ack sessions can fail to ack expired messages in some cases</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4076">AMQ-4076</a> sizePrefixDisabled and/or maxFrameSize change in AcriveMq 5.6 broke FilePendingMessageCursor for big messages</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3919">AMQ-3919</a> getDestinationMap does not return temp destinations</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3915">AMQ-3915</a> JMX connector does not bind to a specific host when a connectHost is specified on the managementContext</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-2665">AMQ-2665</a> Durable subscription re-activation failed when keepDurableSubsActive=true.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3727">AMQ-3727</a> activemq-web-console: AjaxServlet not working in OSGi container</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3921">AMQ-3921</a> Duplicated durable subscriptions after broker retart with option keepDurableSubsActive=true</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3920">AMQ-3920</a> Performance issue with delay policy in DestinationBridge.onMessage</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3923">AMQ-3923</a> Webconsole should import javax.servlet.* too</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3925">AMQ-3925</a> Advisory messages/topics not generated for ActiveMQ.Advisory.FULL or ActiveMQ.Advisory.FastProducer.Queue</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3927">AMQ-3927</a> can't connect to stomp protocol 1.1 using telnet</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3929">AMQ-3929</a> STOMP multiple header handling incorrect per the 1.1 spec</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-2488">AMQ-2488</a> Unable to access Serializable class when receiving ObjectMessage in OSGi environment</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3934">AMQ-3934</a> QueueViewMBean.getMessage throws NullPointerException when message not found</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3932">AMQ-3932</a> receiveNoWait hangs when broker is down, using failover and prefetch=0</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3931">AMQ-3931</a> Memory problems with large transactions</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3935">AMQ-3935</a> JConsole browse() function does not work if useCache=false</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3936">AMQ-3936</a> activemq status return codes should be LSB compliant </li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3939">AMQ-3939</a> FailoverTransport never closes backup connections</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3841">AMQ-3841</a> mKahaDB causes ArrayIndexOutOfBoundsException on restart after deleting existing queues</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3845">AMQ-3845</a> CachedLDAPAuthorizationMap doesn't handle the ldap connectino dying</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3846">AMQ-3846</a> The JMX message move, copy and remove operation do not take messages in FIFO order</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3943">AMQ-3943</a> Connect to ActiveMQ server's jmx feature,but failed.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4042">AMQ-4042</a> Rest MessageServlet on osgi failes to start</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3848">AMQ-3848</a> Messages Are Not Read With Multiple Consumers</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4043">AMQ-4043</a> Web demo - Receive a message page renders an error page</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3849">AMQ-3849</a> Typos in protobuf specs + generated Java code for KahaDB</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4047">AMQ-4047</a> activemq-optional - Should include the JARs it needs</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4044">AMQ-4044</a> Shutting down AcitveMQ broker started in foreground logs 2 times</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3852">AMQ-3852</a> Stomp transport allows durable topic subscriber to subscribe to a queue</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3853">AMQ-3853</a> Missing import in activemq-web-console</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3856">AMQ-3856</a> MessageServlet assumes TextMessages contain Text</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3857">AMQ-3857</a> MessageServlet get messages does not return JMS Message Properties</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3854">AMQ-3854</a> Referencing old spring xsd in configuration files</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3855">AMQ-3855</a> MQTT doesn't translate wildcards to ActiveMQ wildcards</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3955">AMQ-3955</a> WebSocket Transport - Race condition starting transport</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3956">AMQ-3956</a> KahaDB pagefile (db.data) steady growth - BTreeIndex page leak</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3953">AMQ-3953</a> org.apache.activemq.util.URISupport.isCompositeURI doesn't work properly.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3954">AMQ-3954</a> Intended delivery mode for JMSUsecaseTest is not tested</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3951">AMQ-3951</a> LDAP Connection Timeouts in CachedLDAPAuthorizationMap</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3958">AMQ-3958</a> META-INF/spring.schemas does not contain a reference to 5.6.0 schema</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4030">AMQ-4030</a> Tomcat7 with ActiveMQ-5.6 or ActiveMQ-5.7 starts with error</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4031">AMQ-4031</a> BrokerFactoryBean logs error when starting a non persistent broker</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3858">AMQ-3858</a> Failure to resolve local jmx url for sunJvm can result in npe</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4033">AMQ-4033</a> AMQ Broker - Uses custom RMIServerSocketFactory class which cannot be unloaded due socket reuse</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4035">AMQ-4035</a> Null pointer in class KahaDBStore programmed</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4070">AMQ-4070</a> catstomp.rb does not work anymore</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3961">AMQ-3961</a> Durable subscriber only receives part of the persisted messages on re-connect</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3962">AMQ-3962</a> Memory leak bacause of InactivityMonitor thread</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-2170">AMQ-2170</a> Incoherent documentation / strange property names for advisory messages</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3965">AMQ-3965</a> Expired msgs not getting acked to broker causing consumer to fill up its prefetch and not getting more msgs.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3594">AMQ-3594</a> Stuck messages in topic after restart of ActiveMQ</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3557">AMQ-3557</a> Performance of consumption with JDBC persistance and Microsoft SQL Server</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4062">AMQ-4062</a> durableTopicPrefetch attribute in policyEntry in activemq.xml dont take effect</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3828">AMQ-3828</a> URISupport incorrectly handles parenthesis</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3451">AMQ-3451</a> Tomcat 6.0.32 complains that ActiveMQ 5.5 doesn't shutdown a thread</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3827">AMQ-3827</a> The SslContext definition is not used by the https transport protocol.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3832">AMQ-3832</a> Upgrade maven-bundle-plugin</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3831">AMQ-3831</a> Exit code is not properly returned when using RUN_AS_USER</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3973">AMQ-3973</a> data.db size is not included in calculation to monitor systemUsage settings</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3976">AMQ-3976</a> ActiveMQMessageProducer::send uses == instead of equals to compare destinations</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3979">AMQ-3979</a> AjaxServlet preventing Tomcat Container from shutting down.  </li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4058">AMQ-4058</a> http transport should remove options in uri</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-4052">AMQ-4052</a> When consumers was killed and restarted frequently, some messages could not be consumed by consumer but they were still in pending messages.</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3837">AMQ-3837</a> BrokerFacade returns more connections than expect when call  getConnections by connector name</li>
-<li><a href="https://issues.apache.org/jira/browse/AMQ-3836">AMQ-3836</a> STOMP 1.0 protocol (SUBSCRIBE destination) broken on ActiveMQ 5.6.0</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4541">CXF-4541</a> idl2wsdl not finding properly scoped structure elements</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4542">CXF-4542</a> @XmlJavaTypeAdapter ignored on exception classes </li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4540">CXF-4540</a> Colon character in the password is not hanled properly in AbstractHTTPDestination class</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4545">CXF-4545</a> ut_sign + sign_enc samples broken in last releases</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4484">CXF-4484</a> Claims to SAML attribute encoding wrong</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4487">CXF-4487</a> cxf-codegen-plugin: Error resolving component warnings for imported types</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4481">CXF-4481</a> unable to generate WADL to java </li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4500">CXF-4500</a> Evaluate jaxrs:schemaLocations after jaxrs:providers</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4539">CXF-4539</a> WS-Security inbound performance regression</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4537">CXF-4537</a> XmlAdapter Not Being Used</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4552">CXF-4552</a> typical HTML form payload does not seem to work when HTML form is used</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4499">CXF-4499</a> wrong charset encoding in FormEncodingProvider </li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4496">CXF-4496</a> find of ResponseExceptionMapper do not handle runtime exceptions</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4494">CXF-4494</a> JMSDestination need set binary mode if server send MTOM message back</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4493">CXF-4493</a> If javax.jws.Oneway annotation is specified for a SOAP interface method a NPE occurs</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4511">CXF-4511</a> WS-RM Sequence header should have mustUnderstand attribute</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4503">CXF-4503</a> TransformOutInterceptor may lose namespace declarations in some elements</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4505">CXF-4505</a> Invalid WS-RM messages may not be correctly rejected by WS-RM destination</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4507">CXF-4507</a> bug in SchemaJavascriptBuilder while deserializing an Array</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4508">CXF-4508</a> @Context fails to inject SearchContext into JAX-RS resource bean</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4523">CXF-4523</a> Unclosed XMLStreamReader/Writer causes leaking</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4522">CXF-4522</a> The logicalHandler could not modify the soap:body content if provider uses the SOAPMessage</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4520">CXF-4520</a> XMLStreamException about namespace has not been bound to a prefix with other stax implemenation</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4518">CXF-4518</a> CXF bundle jax-ws-catalog.xml doesn't include mapping of "http://www.w3.org/2006/03/addressing" </li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4517">CXF-4517</a> ClassCastException in WS-RM when RMP 200702  assertions are used</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4514">CXF-4514</a> JAXRS client ignores enum properties when populating request URI from beans</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4476">CXF-4476</a> Content-Disposition header may be incorrectly set in MTOM under windows </li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4475">CXF-4475</a> LoggingInInterceptor throws when pretty printing MTOM messages</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4477">CXF-4477</a> [WADL2JAVA] Generate incorrect primitive parameter type </li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4533">CXF-4533</a> Encoding error in CachedOutputStream when double-byte char is on 1024 byte boundary</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4535">CXF-4535</a> SOAP fault XML is invalid when a details element exists</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4534">CXF-4534</a> SortedMap is returned as HashMap</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4526">CXF-4526</a> PolicyAnnotationListener throws NPE in jar</li>
-<li><a href="https://issues.apache.org/jira/browse/CXF-4528">CXF-4528</a> WebApplicationExceptionMapper is too shy</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3620">MYFACES-3620</a> jsf.js: @this results in a javascript error</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3638">MYFACES-3638</a> NPE in ServerSideStateCacheImpl</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3646">MYFACES-3646</a> remove unused src/main/old from core-impl</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3637">MYFACES-3637</a> jsf.js: All Script Tags are Evaluated (wrong behavior)</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3649">MYFACES-3649</a> myfaces-shaded-impl always unpacks myfaces-2.1.1</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3630">MYFACES-3630</a> PartialViewContextImpl.findHeadComponent and findBodyComponent does not take into account h:head or h:body inside child of UIViewRoot</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3617">MYFACES-3617</a> NullPointerException occurs when using an EL Expression in f:viewParam name attribute</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3641">MYFACES-3641</a> ViewDeclarationLanguageFactoryImpl.getViewDeclarationLanguage(String viewId) should not throw exception if no associate VDL can be found</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3618">MYFACES-3618</a> jsf.js: ajax response is missing a param in the error handing of replaceHtmlItem</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3616">MYFACES-3616</a> Javascript: Method call with wrong argument size after error in AJAX request/response</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3613">MYFACES-3613</a> NPE in composite component when ActionListener is missing in the source</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3626">MYFACES-3626</a> f:ajax execute '@none' submitted as explicit request param, firing source listeners</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3632">MYFACES-3632</a> resource bundle name with bean property collition when trying to set value</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3631">MYFACES-3631</a> Malformed Ajax XML Response with duplicated IDs</li>
-<li><a href="https://issues.apache.org/jira/browse/MYFACES-3627">MYFACES-3627</a> jsf.js: DomExperimental.js isMultipartCandidate fails on older IE Versions</li>
-</ul>
-
-<h2>Tasks & Sub-Tasks</h2>
-
-<ul>
-
-
-
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-442">TOMEE-442</a> valid using hostname in webapp id is fine</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-439">TOMEE-439</a> refactor DeployerEjb to be able to deploy war as Tomcat</li>
-    <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1922">OPENEJB-1922</a> [KARAFEE] see how to take into account cdi dependencies</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4006">AMQ-4006</a> activemq-pool - Upgrade to commons-pool 1.6.0</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3784">AMQ-3784</a> Download page lists lots of releases; they are not in order and most of the pages point to the wrong location</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4013">AMQ-4013</a> Upgrade to xbean 3.11</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4041">AMQ-4041</a> Upgrade ActiveMQ karaf feature</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4045">AMQ-4045</a> Unit test shows NPE in BrokerService</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4038">AMQ-4038</a> Favor using JARs from Maven central</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4039">AMQ-4039</a> Upgrade 3rd party dependency JARs and align with SMX/Camel</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4056">AMQ-4056</a> Remove activemq-jmdns module</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-4053">AMQ-4053</a> Cleanup duplicate JARs in ActiveMQ distro</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3945">AMQ-3945</a> QueueBrowser missing messages on first browse.</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3947">AMQ-3947</a> ActiveMQConnectionFactory doesn't set the nestedMapAndListEnabled property on new Connections</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3967">AMQ-3967</a> ActiveMQJmsHeaderRouteTest doesn't work with Apache Camel 2.10</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3969">AMQ-3969</a> ActiveMQJmsHeaderRouteTest doesn't work with Apache Camel 2.10</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3968">AMQ-3968</a> ActiveMQJmsHeaderRouteTest doesn't work with Apache Camel 2.10</li>
-    <li><a href="https://issues.apache.org/jira/browse/AMQ-3970">AMQ-3970</a> ActiveMQJmsHeaderRouteTest doesn't work with Apache Camel 2.10</li>
-
-</ul>
diff --git a/src/main/jbake/content/tomee-1.5.1.adoc b/src/main/jbake/content/tomee-1.5.1.adoc
new file mode 100644
index 0000000..bdad3fe
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.5.1.adoc
@@ -0,0 +1,12 @@
+= Apache TomEE 1.5.1 Released!
+:jbake-type: page
+:jbake-status: published
+
+
+We are excited to announce the release of xref:download-archive.adoc[Apache TomEE 1.5.1].
+The volume of feedback on the 1.5.1 Final drove such an impressive number of fixes and improvements into TomEE.
+
+xref:tomee-1.5.1-release-notes.adoc[The changes].
+
+
+We'd like to thank everyone who gave feedback and contributed to improve Apache TomEE on a daily basis!
diff --git a/src/main/jbake/content/tomee-1.5.1.md b/src/main/jbake/content/tomee-1.5.1.md
deleted file mode 100644
index 0d3d15a..0000000
--- a/src/main/jbake/content/tomee-1.5.1.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Apache TomEE 1.5.1 Released!
-
->We are excited to announce the release of <a href="http://tomee.apache.org/downloads.html">Apache TomEE 1.5.1</a>.
-The volume of feedback on the 1.5.1 Final drove such an impressive number of fixes and improvements into TomEE
-[the changes](tomee-1.5.1-release-notes.html).
-
-We'd like to thank everyone who gave feedback and contributed to improve Apache TomEE on a daily basis!
diff --git a/src/main/jbake/content/tomee-1.6.0.1-release-notes.adoc b/src/main/jbake/content/tomee-1.6.0.1-release-notes.adoc
new file mode 100644
index 0000000..e6c05f0
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.6.0.1-release-notes.adoc
@@ -0,0 +1,17 @@
+= Apache TomEE 1.6.0.1 Release Notes
+:jbake-type: page
+:jbake-status: published
+
+== Upgrades
+
+* https://issues.apache.org/jira/browse/TOMEE-1104[TOMEE-1104] Tomcat 7.0.53
+
+== Tasks & Sub-Tasks
+
+[.compact]
+* https://issues.apache.org/jira/browse/TOMEE-1176[TOMEE-1176] Add missing ASF headers
+* https://issues.apache.org/jira/browse/TOMEE-1177[TOMEE-1177] Include Apache Tomcat Native library 1.1.30
+
+To see the full http://tomcat.apache.org/tomcat-7.0-doc/changelog.html[Changelog] of Apache Tomcat since version 7.0.51 follow this link:
+
+http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
diff --git a/src/main/jbake/content/tomee-1.6.0.1-release-notes.md b/src/main/jbake/content/tomee-1.6.0.1-release-notes.md
deleted file mode 100644
index 8984a29..0000000
--- a/src/main/jbake/content/tomee-1.6.0.1-release-notes.md
+++ /dev/null
@@ -1,40 +0,0 @@
-Title: Apache TomEE 1.6.0.1 Release Notes
-
-<h2>Upgrades</h2>
-
-<ul>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1104">TOMEE-1104</a> Tomcat 7.0.53</li>
-</ul>
-
-<h2>New Features</h2>
-
-<ul>
-
-</ul>
-
-<h2>Improvements</h2>
-
-<ul>
-
-</ul>
-
-<h2>Bugs</h2>
-
-<ul>
-
-</ul>
-
-<h2>Tasks & Sub-Tasks</h2>
-
-<ul>
-
-
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1176">TOMEE-1176</a> Add missing ASF headers</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1177">TOMEE-1177</a> Include Apache Tomcat Native library 1.1.30</li>
-
-</ul>
-
-To see the full [Changelog](http://tomcat.apache.org/tomcat-7.0-doc/changelog.html) of Apache Tomcat since version 7.0.51 follow this link:
-
-[http://tomcat.apache.org/tomcat-7.0-doc/changelog.html](http://tomcat.apache.org/tomcat-7.0-doc/changelog.html)
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-1.6.0.1.adoc b/src/main/jbake/content/tomee-1.6.0.1.adoc
new file mode 100644
index 0000000..44efde9
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.6.0.1.adoc
@@ -0,0 +1,31 @@
+= Apache TomEE 1.6.0.1 Released!
+:jbake-type: page
+:jbake-status: published
+
+Apache TomEE is happy to announce the security related release of http://tomee.apache.org/downloads.html[Apache TomEE 1.6.0.1] which is now based on http://tomcat.apache.org/tomcat-7.0-doc/index.html[Apache Tomcat 7.0.53] - The principal focus of this release is to provide compatibility for a significant security fix introduced in Tomcat 7.0.51 for the Apache Commons FileUpload.
+We recommend to all TomEE 1.6.0 users that are affected by this issue to upgrade TomEE to this latest version at the earliest opportunity.
+
+Complete details of the issue can be found at the following link:
+
+_Important: Denial of Service_  CVE-2014-0050<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0050>
+
+It goes without saying that everyone has heard of the Heartbleed issue and we have quickly replaced the included Apache Tomcat Native library with version 1.1.30 for this release, should anyone be using it.
+Note, this is not the default for TomEE and it does not resolve the issue, for that you will still need to update your OpenSSL - It merely enables the use of a more recent OpenSSL version.
+You can find more information here:
+
+http://tomcat.apache.org/native-doc/ - You may need to refresh the page if you have been checking the site as it was only recently updated.
+
+We would like to thank everyone in the community involved in the reporting, documentation and final resolution of this issue.
+A very special thank you goes out to Romain Manni-Bucau and Jonathan Gallimore for their tireless efforts in enabling us to provide this release so quickly.
+
+The Apache TomEE Release 1.6.0.1 files can be found here:
+
+http://tomee.apache.org/downloads.html
+
+A complete xref:tomee-1.6.0.1-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-1.6.0.1-release-notes.adoc[tomee-1.6.0.1-release-notes.html]
+
+To see the full http://tomcat.apache.org/tomcat-7.0-doc/changelog.html[Changelog] of Apache Tomcat since version 7.0.51 follow this link:
+
+http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
diff --git a/src/main/jbake/content/tomee-1.6.0.1.md b/src/main/jbake/content/tomee-1.6.0.1.md
deleted file mode 100644
index b05c890..0000000
--- a/src/main/jbake/content/tomee-1.6.0.1.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Apache TomEE 1.6.0.1 Released!
-
-Apache TomEE is happy to announce the security related release of [Apache TomEE 1.6.0.1](http://tomee.apache.org/downloads.html) which is now based on [Apache Tomcat 7.0.53](http://tomcat.apache.org/tomcat-7.0-doc/index.html) - The principal focus of this release is to provide compatibility for a significant security fix introduced in Tomcat 7.0.51 for the Apache Commons FileUpload. We recommend to all TomEE 1.6.0 users that are affected by this issue to upgrade TomEE to this latest version at the earliest opportunity.
-
-Complete details of the issue can be found at the following link:
- 
-*Important: Denial of Service* 
-CVE-2014-0050<[http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0050](http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0050)> 
-
-It goes without saying that everyone has heard of the Heartbleed issue and we have quickly replaced the included Apache Tomcat Native library with version 1.1.30 for this release, should anyone be using it. Note, this is not the default for TomEE and it does not resolve the issue, for that you will still need to update your OpenSSL - It merely enables the use of a more recent OpenSSL version. You can find more information here:
-
-[http://tomcat.apache.org/native-doc/](http://tomcat.apache.org/native-doc/) - You may need to refresh the page if you have been checking the site as it was only recently updated. 
-
-We would like to thank everyone in the community involved in the reporting, documentation and final resolution of this issue. A very special thank you goes out to Romain Manni-Bucau and Jonathan Gallimore for their tireless efforts in enabling us to provide this release so quickly.
-
-The Apache TomEE Release 1.6.0.1 files can be found here:
-
-[http://tomee.apache.org/downloads.html](http://tomee.apache.org/downloads.html)
-
-A complete [Changelog](tomee-1.6.0.1-release-notes.html) can be viewed here:
-
-[tomee-1.6.0.1-release-notes.html](tomee-1.6.0.1-release-notes.html)
-
-To see the full [Changelog](http://tomcat.apache.org/tomcat-7.0-doc/changelog.html) of Apache Tomcat since version 7.0.51 follow this link:
-
-[http://tomcat.apache.org/tomcat-7.0-doc/changelog.html](http://tomcat.apache.org/tomcat-7.0-doc/changelog.html)
diff --git a/src/main/jbake/content/tomee-1.6.0.2-release-notes.adoc b/src/main/jbake/content/tomee-1.6.0.2-release-notes.adoc
new file mode 100644
index 0000000..43b9c14
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.6.0.2-release-notes.adoc
@@ -0,0 +1,7 @@
+= Apache TomEE 1.6.0.2 Release Notes
+:jbake-type: page
+:jbake-status: published
+
+== Tasks & Sub-Tasks
+
+* https://issues.apache.org/jira/browse/TOMEE-1189[TOMEE-1189] Upgrade to CXF 2.6.14 to fix security issues.
diff --git a/src/main/jbake/content/tomee-1.6.0.2-release-notes.md b/src/main/jbake/content/tomee-1.6.0.2-release-notes.md
deleted file mode 100644
index 4133ee9..0000000
--- a/src/main/jbake/content/tomee-1.6.0.2-release-notes.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Title: Apache TomEE 1.6.0.2 Release Notes
-
-<h2>Upgrades</h2>
-
-<ul>
-</ul>
-
-<h2>New Features</h2>
-
-<ul>
-
-</ul>
-
-<h2>Improvements</h2>
-
-<ul>
-
-</ul>
-
-<h2>Bugs</h2>
-
-<ul>
-
-</ul>
-
-<h2>Tasks & Sub-Tasks</h2>
-
-<ul>
-
-
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1189">TOMEE-1189</a> Upgrade to CXF 2.6.14 to fix security issues.</li>
-
-</ul>
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-1.6.0.2.adoc b/src/main/jbake/content/tomee-1.6.0.2.adoc
new file mode 100644
index 0000000..ac6efd9
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.6.0.2.adoc
@@ -0,0 +1,19 @@
+= Apache TomEE 1.6.0.2 Released!
+:jbake-type: page
+:jbake-status: published
+
+Apache TomEE is happy to announce the security related release of http://tomee.apache.org/downloads.html[Apache TomEE 1.6.0.2] which is still based on http://tomcat.apache.org/tomcat-7.0-doc/index.html[Apache Tomcat 7.0.53] - The principal focus of this release is to provide an update to CXF version 2.6.14, which fixes several security issues.
+
+Complete details of the issues that have been fixed can be found at the following link:
+
+http://cxf.apache.org/security-advisories.html
+
+The stability of the continuous integration (CI) build can be seen here: http://ci.apache.org/builders/tomee-1.6.0.2-ubuntu
+
+The Apache TomEE Release 1.6.0.2 files can be found here:
+
+http://tomee.apache.org/downloads.html
+
+A complete xref:tomee-1.6.0.2-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-1.6.0.2-release-notes.adoc[tomee-1.6.0.2-release-notes.html]
diff --git a/src/main/jbake/content/tomee-1.6.0.2.md b/src/main/jbake/content/tomee-1.6.0.2.md
deleted file mode 100644
index c28d608..0000000
--- a/src/main/jbake/content/tomee-1.6.0.2.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Apache TomEE 1.6.0.2 Released!
-
-Apache TomEE is happy to announce the security related release of [Apache TomEE 1.6.0.2](http://tomee.apache.org/downloads.html) which is still based on [Apache Tomcat 7.0.53](http://tomcat.apache.org/tomcat-7.0-doc/index.html) - The principal focus of this release is to provide an update to CXF version 2.6.14, which fixes several security issues.
-
-Complete details of the issues that have been fixed can be found at the following link:
-
-[http://cxf.apache.org/security-advisories.html](http://cxf.apache.org/security-advisories.html)
-
-The stability of the continuous integration (CI) build can be seen here: [http://ci.apache.org/builders/tomee-1.6.0.2-ubuntu](http://ci.apache.org/builders/tomee-1.6.0.2-ubuntu)
-
-The Apache TomEE Release 1.6.0.2 files can be found here:
-
-[http://tomee.apache.org/downloads.html](http://tomee.apache.org/downloads.html)
-
-A complete [Changelog](tomee-1.6.0.2-release-notes.html) can be viewed here:
-
-[tomee-1.6.0.2-release-notes.html](tomee-1.6.0.2-release-notes.html)
diff --git a/src/main/jbake/content/tomee-1.7.0-release-notes.adoc b/src/main/jbake/content/tomee-1.7.0-release-notes.adoc
new file mode 100644
index 0000000..ef173b6
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.0-release-notes.adoc
@@ -0,0 +1,467 @@
+= Release Notes - TomEE - Version 1.7.0
+:jbake-type: page
+:jbake-status: published
+
+== Sub-task
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-659[TOMEE-659]] - TomEE new logo
+
+== Bug
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-836[TOMEE-836]] - ReportValidationResults should log.info about the root cause
+* [https://issues.apache.org/jira/browse/TOMEE-885[TOMEE-885]] - Cannot inject no-interface groovy local bean
+* [https://issues.apache.org/jira/browse/TOMEE-926[TOMEE-926]] - arquillian adaptors can fail replacing port if a port includes another one
+* [https://issues.apache.org/jira/browse/TOMEE-953[TOMEE-953]] - tolerate javax. classes from app when not in server
+* [https://issues.apache.org/jira/browse/TOMEE-982[TOMEE-982]] - JAXRS @ApplicationPath deployment fails if path starts with http and is not a URL
+* [https://issues.apache.org/jira/browse/TOMEE-1054[TOMEE-1054]] - catalina.sh created by installer is not executable
+* [https://issues.apache.org/jira/browse/TOMEE-1075[TOMEE-1075]] - openejb.home system properties not correctly set
+* [https://issues.apache.org/jira/browse/TOMEE-1076[TOMEE-1076]] - integrate tomee with spring-web SCI
+* [https://issues.apache.org/jira/browse/TOMEE-1079[TOMEE-1079]] - destroy resource adapter after connection factories
+* [https://issues.apache.org/jira/browse/TOMEE-1082[TOMEE-1082]] - openejb-javaagent missing from service.bat
+* [https://issues.apache.org/jira/browse/TOMEE-1083[TOMEE-1083]] - when using tccl for quartz avoid to set our quartz impl to avoid classloading issues (if the user does it he has to solve it himself)
+* [https://issues.apache.org/jira/browse/TOMEE-1084[TOMEE-1084]] - webservice (soap) undeployment doesn&#39;t use same id as deployment -> can deploy/undeploy (in tests) the same WS
+* [https://issues.apache.org/jira/browse/TOMEE-1085[TOMEE-1085]] - jaxrs application are scanned and kept even if not instantiable
+* [https://issues.apache.org/jira/browse/TOMEE-1086[TOMEE-1086]] - @WebServiceRef(MyServiceImpl.class) doesn&#39;t work as expected
+* [https://issues.apache.org/jira/browse/TOMEE-1088[TOMEE-1088]] - classpaths can be null in stop mojo
+* [https://issues.apache.org/jira/browse/TOMEE-1089[TOMEE-1089]] - driverDelegateInitString should be set only if job store class is a JobStoreSupport
+* [https://issues.apache.org/jira/browse/TOMEE-1093[TOMEE-1093]] - wrong filtering of slf4j bindings
+* [https://issues.apache.org/jira/browse/TOMEE-1094[TOMEE-1094]] - allow derby to be in webapps
+* [https://issues.apache.org/jira/browse/TOMEE-1099[TOMEE-1099]] - arquillian adapter supposes war contained in ear are named as the ear
+* [https://issues.apache.org/jira/browse/TOMEE-1101[TOMEE-1101]] - Test methods are not getting enriched when run via Arquillian
+* [https://issues.apache.org/jira/browse/TOMEE-1106[TOMEE-1106]] - infinite loop detected while destroying bean XYService under load
+* [https://issues.apache.org/jira/browse/TOMEE-1110[TOMEE-1110]] - Datasources declared in context.xml doesn&#39;t work when the application is redeployed
+* [https://issues.apache.org/jira/browse/TOMEE-1119[TOMEE-1119]] - Duplicate servlets with embedded container
+* [https://issues.apache.org/jira/browse/TOMEE-1122[TOMEE-1122]] - @Timeout & @TA(NOT_SUPPORTED) methods in @Singleton beans run with transactional context
+* [https://issues.apache.org/jira/browse/TOMEE-1125[TOMEE-1125]] - stateful not clean up on discardInstance (@Remove)
+* [https://issues.apache.org/jira/browse/TOMEE-1134[TOMEE-1134]] - activemq-webconsole doesn&#39;t work
+* [https://issues.apache.org/jira/browse/TOMEE-1135[TOMEE-1135]] - jaxrs beans lifecycle not well handled when relying on @Dependent
+* [https://issues.apache.org/jira/browse/TOMEE-1136[TOMEE-1136]] - Context.stop() destroy the context (manager is broken)
+* [https://issues.apache.org/jira/browse/TOMEE-1137[TOMEE-1137]] - Mark all apache-tomee pom dependencies provided
+* [https://issues.apache.org/jira/browse/TOMEE-1138[TOMEE-1138]] - Cannot reference @Stateful @ConversationScoped bean in JSF page
+* [https://issues.apache.org/jira/browse/TOMEE-1139[TOMEE-1139]] - RESTService fails to check for BasicAuthHttpListenerWrapper
+* [https://issues.apache.org/jira/browse/TOMEE-1147[TOMEE-1147]] - tld can&#39;t be in WEB-INF/classes/META-INF
+* [https://issues.apache.org/jira/browse/TOMEE-1157[TOMEE-1157]] - OpenJPA metadata shoudln&#39;t be cleaned up for classes of the jvm
+* [https://issues.apache.org/jira/browse/TOMEE-1161[TOMEE-1161]] - mapping of a jaxrs application with @ApplicationPath doesnt work
+* [https://issues.apache.org/jira/browse/TOMEE-1162[TOMEE-1162]] - embedded jaxrs/http layer is broken and then for not simple cases urls are wrong
+* [https://issues.apache.org/jira/browse/TOMEE-1164[TOMEE-1164]] - avoid tomcat classloader to get a parent null after reloading
+* [https://issues.apache.org/jira/browse/TOMEE-1165[TOMEE-1165]] - cxf context not cleaned up
+* [https://issues.apache.org/jira/browse/TOMEE-1169[TOMEE-1169]] - better support of XaDataSource
+* [https://issues.apache.org/jira/browse/TOMEE-1172[TOMEE-1172]] - support jta wrapping (ManagedDataSource) of a custom datasource
+* [https://issues.apache.org/jira/browse/TOMEE-1175[TOMEE-1175]] - BaseEjbProxyHandler equals is is wrong - can lead to perf issues with cmp beans
+* [https://issues.apache.org/jira/browse/TOMEE-1179[TOMEE-1179]] - would be great to support property on provide fields for @DataSourceDefinition
+* [https://issues.apache.org/jira/browse/TOMEE-1183[TOMEE-1183]] - docBase (tomcat) and webAppInfo.path (tomee) doesn&#39;t use same separator
+* [https://issues.apache.org/jira/browse/TOMEE-1190[TOMEE-1190]] - TomEE maven plugin must supported Tomcat based distros
+* [https://issues.apache.org/jira/browse/TOMEE-1199[TOMEE-1199]] - arquillian embedded deploy as testable not testable archives if context is not cleaned up by arquillian
+* [https://issues.apache.org/jira/browse/TOMEE-1200[TOMEE-1200]] - arquillian adapters should tolerate more than a single test class as injectable test
+* [https://issues.apache.org/jira/browse/TOMEE-1203[TOMEE-1203]] - stateful can&#39;t be checkouted by multiple threads
+* [https://issues.apache.org/jira/browse/TOMEE-1205[TOMEE-1205]] - TomEE webprofile 1.6.0.1 and 1.6.0.2 breaks java subtyping
+* [https://issues.apache.org/jira/browse/TOMEE-1207[TOMEE-1207]] - support additionalSystemProperties for mvn tomee:exec even for java as script command
+* [https://issues.apache.org/jira/browse/TOMEE-1208[TOMEE-1208]] - Arquillian should replace server.xml port even if we provide it in the project
+* [https://issues.apache.org/jira/browse/TOMEE-1214[TOMEE-1214]] - tomee should pick up conf/log4j.xml
+* [https://issues.apache.org/jira/browse/TOMEE-1215[TOMEE-1215]] - Log4jLogStreamFactory picks up wrong conf directory
+* [https://issues.apache.org/jira/browse/TOMEE-1217[TOMEE-1217]] - toUrl in PerisstenceUnitInfoImpl can create weird url when file is not a file but a jar link
+* [https://issues.apache.org/jira/browse/TOMEE-1218[TOMEE-1218]] - mixed scope-handling in CdiAppContextsService
+* [https://issues.apache.org/jira/browse/TOMEE-1219[TOMEE-1219]] - org.apache.quartz.threadPool.threadCount and openejb.timer.pool.size ignored
+* [https://issues.apache.org/jira/browse/TOMEE-1223[TOMEE-1223]] - tomee embedded EJBContainer doesn&#39;t close on error
+* [https://issues.apache.org/jira/browse/TOMEE-1226[TOMEE-1226]] - ensure when wrapping Tomcat Realms with TomEERealm that the delegates are in the right state
+* [https://issues.apache.org/jira/browse/TOMEE-1228[TOMEE-1228]] - tomee maven plugin doesn&#39;t deploy jar/ear if a custom tomee.xml is not provided
+* [https://issues.apache.org/jira/browse/TOMEE-1234[TOMEE-1234]] - arquillian tomee embedded : ensure test classloader is the app one
+* [https://issues.apache.org/jira/browse/TOMEE-1241[TOMEE-1241]] - clean up openejb.loader property when shuttingdown to allow reboot
+* [https://issues.apache.org/jira/browse/TOMEE-1242[TOMEE-1242]] - allow arquillian tomee embedded container to be rebooted (manual mode)
+* [https://issues.apache.org/jira/browse/TOMEE-1248[TOMEE-1248]] - Security identity initialized twice when using preemptive mode
+* [https://issues.apache.org/jira/browse/TOMEE-1255[TOMEE-1255]] - allow TomEE Maven Plugin to specify additional docBase
+* [https://issues.apache.org/jira/browse/TOMEE-1256[TOMEE-1256]] - allow tomee maven plugin to skip war resources
+* [https://issues.apache.org/jira/browse/TOMEE-1257[TOMEE-1257]] - undeployment remove all validator/validatorfactory (not only the undeployed app ones)
+* [https://issues.apache.org/jira/browse/TOMEE-1260[TOMEE-1260]] - allow CDI contructor injections for JAX-RS endpoints
+* [https://issues.apache.org/jira/browse/TOMEE-1261[TOMEE-1261]] - soap binding annotation not read for ejbs
+* [https://issues.apache.org/jira/browse/TOMEE-1262[TOMEE-1262]] - JAX RS Autoscanning from Web XML
+
+== Dependency upgrade
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1104[TOMEE-1104]] - Tomcat 7.0.53
+* [https://issues.apache.org/jira/browse/TOMEE-1108[TOMEE-1108]] - myfaces 2.1.15
+* [https://issues.apache.org/jira/browse/TOMEE-1115[TOMEE-1115]] - xbean 3.16
+* [https://issues.apache.org/jira/browse/TOMEE-1131[TOMEE-1131]] - OpenWebBeans 1.2.4
+* [https://issues.apache.org/jira/browse/TOMEE-1142[TOMEE-1142]] - CXF 2.6.14
+* [https://issues.apache.org/jira/browse/TOMEE-1158[TOMEE-1158]] - Arquillian 1.1.5.Final
+* [https://issues.apache.org/jira/browse/TOMEE-1193[TOMEE-1193]] - examples/groovy-spock groovy-all dependency update
+* [https://issues.apache.org/jira/browse/TOMEE-1194[TOMEE-1194]] - examples/groovy-cdi groovy-all dependency update
+* [https://issues.apache.org/jira/browse/TOMEE-1195[TOMEE-1195]] - examples/groovy-jpa groovy-all dependency update
+* [https://issues.apache.org/jira/browse/TOMEE-1196[TOMEE-1196]] - examples/lookup-of-ejbs junit dependency update
+* [https://issues.apache.org/jira/browse/TOMEE-1197[TOMEE-1197]] - examples/lookup-of-ejbs-with-descriptor junit dependency update
+* [https://issues.apache.org/jira/browse/TOMEE-1232[TOMEE-1232]] - update examples using myfaces extval
+* [https://issues.apache.org/jira/browse/TOMEE-1236[TOMEE-1236]] - Use Tomcat 7.0.54
+* [https://issues.apache.org/jira/browse/TOMEE-1237[TOMEE-1237]] - Mojarra 2.1.x
+* [https://issues.apache.org/jira/browse/TOMEE-1238[TOMEE-1238]] - EclipseLink 2.4.2
+* [https://issues.apache.org/jira/browse/TOMEE-1245[TOMEE-1245]] - activemq 5.10.0
+* [https://issues.apache.org/jira/browse/TOMEE-1252[TOMEE-1252]] - upgrade deltaspike fullstack example to deltaspike v1
+
+== Documentation
+
+* [https://issues.apache.org/jira/browse/TOMEE-1154[TOMEE-1154]] - port myfaces-codi fullstack demo to deltaspike
+* [https://issues.apache.org/jira/browse/TOMEE-1155[TOMEE-1155]] - upgrade myfaces-codi fullstack demo for tomee 1.6.x
+
+== Improvement
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-898[TOMEE-898]] - Bean Validation Test (bean-validation-design-by-contract) is in the wrong package
+* [https://issues.apache.org/jira/browse/TOMEE-904[TOMEE-904]] - Try to unwrap the URL from UrlAsset instead of creating a new one
+* [https://issues.apache.org/jira/browse/TOMEE-1090[TOMEE-1090]] - tomee-catalina PMD
+* [https://issues.apache.org/jira/browse/TOMEE-1100[TOMEE-1100]] - enhance error message in PersistenceUnitLinkResolver.extractWebApp when uri is illegal
+* [https://issues.apache.org/jira/browse/TOMEE-1105[TOMEE-1105]] - JAX-WS Endpoint CDI Support
+* [https://issues.apache.org/jira/browse/TOMEE-1111[TOMEE-1111]] - Expand SQL logging capability to include failed statements as well
+* [https://issues.apache.org/jira/browse/TOMEE-1126[TOMEE-1126]] - Add property for loading dynamic CXF providers
+* [https://issues.apache.org/jira/browse/TOMEE-1151[TOMEE-1151]] - @Observes optimization
+* [https://issues.apache.org/jira/browse/TOMEE-1152[TOMEE-1152]] - Failure related @Observes infinite loops protection
+* [https://issues.apache.org/jira/browse/TOMEE-1163[TOMEE-1163]] - ApplicationComposer: Process @Module annotations in parent classes
+* [https://issues.apache.org/jira/browse/TOMEE-1168[TOMEE-1168]] - subclass dynamic (ejb implementing invocation handler) are not deterministic wirh cxf-rs
+* [https://issues.apache.org/jira/browse/TOMEE-1185[TOMEE-1185]] - option to deactivate DataSourcePlugins
+* [https://issues.apache.org/jira/browse/TOMEE-1186[TOMEE-1186]] - allow to add at runtime system properties using execmojo (java -jar myapp.jar)
+* [https://issues.apache.org/jira/browse/TOMEE-1187[TOMEE-1187]] - disable tomcat reloading with tomee maven plugin to avoid reloading on update only extensions
+* [https://issues.apache.org/jira/browse/TOMEE-1192[TOMEE-1192]] - LazyRealm doesn&#39;t support Lifecycle hooks
+* [https://issues.apache.org/jira/browse/TOMEE-1201[TOMEE-1201]] - Allow dynamic configuration of, and log, thread pool sizes.
+* [https://issues.apache.org/jira/browse/TOMEE-1210[TOMEE-1210]] - Create Assemblies that honour OS specific line endings
+* [https://issues.apache.org/jira/browse/TOMEE-1211[TOMEE-1211]] - Reduce wrapping of SQLException in DBCP usage
+* [https://issues.apache.org/jira/browse/TOMEE-1221[TOMEE-1221]] - Unused code segment on tomee-catalina TomcatWebAppBuilder.java
+* [https://issues.apache.org/jira/browse/TOMEE-1227[TOMEE-1227]] - add a tomee-overlay-runner module to ease overlay creation
+* [https://issues.apache.org/jira/browse/TOMEE-1230[TOMEE-1230]] - Start and stop monitor logic should not just monitor shutdown port.
+* [https://issues.apache.org/jira/browse/TOMEE-1233[TOMEE-1233]] - update deltaspike example
+* [https://issues.apache.org/jira/browse/TOMEE-1239[TOMEE-1239]] - Update HttpsConnectionTest to support jdk8 - KeyTool changes
+* [https://issues.apache.org/jira/browse/TOMEE-1240[TOMEE-1240]] - Allow to choose Host when deploying a webapp (WebAppDeployer)
+
+== New Feature
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-651[TOMEE-651]] - DataSource is such a common resource type that it should be possible to not specify it in tomee.xml
+* [https://issues.apache.org/jira/browse/TOMEE-662[TOMEE-662]] - Support aliases on resources
+* [https://issues.apache.org/jira/browse/TOMEE-1074[TOMEE-1074]] - Manage Sessions
+* [https://issues.apache.org/jira/browse/TOMEE-1077[TOMEE-1077]] - add a &quot;openejb.timers.on&quot;
+property (configurable in application.properties) to deactivate timers
+* [https://issues.apache.org/jira/browse/TOMEE-1080[TOMEE-1080]] - properties as resource
+* [https://issues.apache.org/jira/browse/TOMEE-1081[TOMEE-1081]] - support WebServiceContext for pojos
+* [https://issues.apache.org/jira/browse/TOMEE-1092[TOMEE-1092]] - shade quartz in org.apache.openejb.quartz
+* [https://issues.apache.org/jira/browse/TOMEE-1097[TOMEE-1097]] - allow to define urls as resource
+* [https://issues.apache.org/jira/browse/TOMEE-1103[TOMEE-1103]] - tomeeAlreadyInstalled option to tomee mvn plugin to not modify tomee (no conf, no lib, no app) when starting
+* [https://issues.apache.org/jira/browse/TOMEE-1107[TOMEE-1107]] - support org.hibernate.jpa.HibernatePersistenceProvider out of the box
+* [https://issues.apache.org/jira/browse/TOMEE-1109[TOMEE-1109]] - Potential TomEE distribution with Mojarra and EclipseLink
+* [https://issues.apache.org/jira/browse/TOMEE-1113[TOMEE-1113]] - support leveldb and custom amq persistence adapter
+* [https://issues.apache.org/jira/browse/TOMEE-1114[TOMEE-1114]] - TomEE Maven Plugin should support OpenEJB standalone
+* [https://issues.apache.org/jira/browse/TOMEE-1121[TOMEE-1121]] - add openejb.cxf-rs.wadl-generator.ignoreRequests to configure and not force ignoreRequests on wadlgenerator
+* [https://issues.apache.org/jira/browse/TOMEE-1127[TOMEE-1127]] - New Event: @Observes LifecycleEvent
+* [https://issues.apache.org/jira/browse/TOMEE-1132[TOMEE-1132]] - add javaagents parameter to xref:{tomee-latest-vc}::maven/index.adoc[tomee-maven-plugin]
+* [https://issues.apache.org/jira/browse/TOMEE-1133[TOMEE-1133]] - support @CdiExtensions on test class for ApplicationComposer
+* [https://issues.apache.org/jira/browse/TOMEE-1140[TOMEE-1140]] - Support CDI LoginModule
+* [https://issues.apache.org/jira/browse/TOMEE-1144[TOMEE-1144]] - provide an exec war goal to tomee plugin
+* [https://issues.apache.org/jira/browse/TOMEE-1145[TOMEE-1145]] - <Resource classpath=&quot;&quot;> attribute
+* [https://issues.apache.org/jira/browse/TOMEE-1146[TOMEE-1146]] - Support multiple JDBC Driver class versions
+* [https://issues.apache.org/jira/browse/TOMEE-1149[TOMEE-1149]] - @Observes BeforeEvent & AfterEvent
+* [https://issues.apache.org/jira/browse/TOMEE-1150[TOMEE-1150]] - @Observes Event type inheritance
+* [https://issues.apache.org/jira/browse/TOMEE-1159[TOMEE-1159]] - support jaxrs to be overriden by the webapp
+* [https://issues.apache.org/jira/browse/TOMEE-1166[TOMEE-1166]] - activate cxf jmx by default
+* [https://issues.apache.org/jira/browse/TOMEE-1170[TOMEE-1170]] - Investigate the use of the Win platform daemon tool (prunmgr.exe)
+* [https://issues.apache.org/jira/browse/TOMEE-1184[TOMEE-1184]] - TomEE Remote should support empty/null classifier
+* [https://issues.apache.org/jira/browse/TOMEE-1212[TOMEE-1212]] - allow to configure async pool by remote initial context
+* [https://issues.apache.org/jira/browse/TOMEE-1213[TOMEE-1213]] - Add support for <security-role-ref>
+* [https://issues.apache.org/jira/browse/TOMEE-1220[TOMEE-1220]] - if jaxrs.txt is in <tomee>/conf add libraries in container
+* [https://issues.apache.org/jira/browse/TOMEE-1222[TOMEE-1222]] - allow JarLocation (of ziplock) to get jar file from resource name and jar name
+* [https://issues.apache.org/jira/browse/TOMEE-1224[TOMEE-1224]] - TomEE Remote EJBContainer
+* [https://issues.apache.org/jira/browse/TOMEE-1247[TOMEE-1247]] - allow internal datasources to be flushable (swap delegate)
+* [https://issues.apache.org/jira/browse/TOMEE-1249[TOMEE-1249]] - add LockFactory API in StatefulContainer
+* [https://issues.apache.org/jira/browse/TOMEE-1250[TOMEE-1250]] - support resource references in resources.xml Service using @ prefix
+* [https://issues.apache.org/jira/browse/TOMEE-1251[TOMEE-1251]] - Add ability to configure HTTPS port
+* [https://issues.apache.org/jira/browse/TOMEE-1258[TOMEE-1258]] - allow tomee maven plugin to configure externalRepositories
+* [https://issues.apache.org/jira/browse/TOMEE-1259[TOMEE-1259]] - add webappDefaultConfig to tomee maven plugin to auto configure the plugin for default webapp dev setup
+* [https://issues.apache.org/jira/browse/TOMEE-1263[TOMEE-1263]] - Add a REST Exception mapper for EJBAccessException
+
+== Task
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1160[TOMEE-1160]] - Track AppContext start time
+* [https://issues.apache.org/jira/browse/TOMEE-1177[TOMEE-1177]] - Include Apache Tomcat Native library 1.1.30
+* [https://issues.apache.org/jira/browse/TOMEE-1178[TOMEE-1178]] - Please create a DOAP file for your TLP
+
+== Test
+
+* [https://issues.apache.org/jira/browse/TOMEE-1253[TOMEE-1253]] - add tests based on the test-control module to the deltaspike fullstack example
+
+# Release Notes - OpenEJB - Version 4.7.0
+
+== Sub-task
+
+[.compact]
+* [https://issues.apache.org/jira/browse/OPENEJB-120[OPENEJB-120]] - Port CMP Container
+* [https://issues.apache.org/jira/browse/OPENEJB-145[OPENEJB-145]] - iTest: StatelessRemoteJndiTests
+* [https://issues.apache.org/jira/browse/OPENEJB-146[OPENEJB-146]] - iTest: StatelessLocalJndiTests
+* [https://issues.apache.org/jira/browse/OPENEJB-147[OPENEJB-147]] - iTest: StatelessHomeIntfcTests
+* [https://issues.apache.org/jira/browse/OPENEJB-148[OPENEJB-148]] - iTest: StatelessEjbHomeTests
+* [https://issues.apache.org/jira/browse/OPENEJB-149[OPENEJB-149]] - iTest: StatelessEjbObjectTests
+* [https://issues.apache.org/jira/browse/OPENEJB-150[OPENEJB-150]] - iTest: StatelessEjbLocalHomeTests
+* [https://issues.apache.org/jira/browse/OPENEJB-151[OPENEJB-151]] - iTest: StatelessEjbLocalObjectTests
+* [https://issues.apache.org/jira/browse/OPENEJB-152[OPENEJB-152]] - iTest: StatelessRemoteIntfcTests
+* [https://issues.apache.org/jira/browse/OPENEJB-153[OPENEJB-153]] - iTest: StatelessLocalIntfcTests
+* [https://issues.apache.org/jira/browse/OPENEJB-154[OPENEJB-154]] - iTest: StatelessHomeHandleTests
+* [https://issues.apache.org/jira/browse/OPENEJB-155[OPENEJB-155]] - iTest: StatelessHandleTests
+* [https://issues.apache.org/jira/browse/OPENEJB-156[OPENEJB-156]] - iTest: StatelessEjbMetaDataTests
+* [https://issues.apache.org/jira/browse/OPENEJB-157[OPENEJB-157]] - iTest: StatelessLocalBusinessIntfcTests
+* [https://issues.apache.org/jira/browse/OPENEJB-158[OPENEJB-158]] - iTest: StatelessRemoteBusinessIntfcTests
+* [https://issues.apache.org/jira/browse/OPENEJB-159[OPENEJB-159]] - iTest: StatelessBeanJndiEncTests
+* [https://issues.apache.org/jira/browse/OPENEJB-160[OPENEJB-160]] - iTest: StatelessBeanSetterInjectionTests
+* [https://issues.apache.org/jira/browse/OPENEJB-161[OPENEJB-161]] - iTest: StatelessBeanPublicFieldInjectionTests
+* [https://issues.apache.org/jira/browse/OPENEJB-171[OPENEJB-171]] - iTest: StatefulRemoteJndiTests
+* [https://issues.apache.org/jira/browse/OPENEJB-172[OPENEJB-172]] - iTest: StatefulLocalJndiTests
+* [https://issues.apache.org/jira/browse/OPENEJB-173[OPENEJB-173]] - iTest: StatefulHomeIntfcTests
+* [https://issues.apache.org/jira/browse/OPENEJB-174[OPENEJB-174]] - iTest: StatefulEjbHomeTests
+* [https://issues.apache.org/jira/browse/OPENEJB-175[OPENEJB-175]] - iTest: StatefulEjbObjectTests
+* [https://issues.apache.org/jira/browse/OPENEJB-176[OPENEJB-176]] - iTest: StatefulEjbLocalHomeTests
+* [https://issues.apache.org/jira/browse/OPENEJB-177[OPENEJB-177]] - iTest: StatefulEjbLocalObjectTests
+* [https://issues.apache.org/jira/browse/OPENEJB-179[OPENEJB-179]] - iTest: StatefulLocalIntfcTests
+* [https://issues.apache.org/jira/browse/OPENEJB-180[OPENEJB-180]] - iTest: StatefulHomeHandleTests
+* [https://issues.apache.org/jira/browse/OPENEJB-181[OPENEJB-181]] - iTest: StatefulHandleTests
+* [https://issues.apache.org/jira/browse/OPENEJB-183[OPENEJB-183]] - iTest: StatefulLocalBusinessIntfcTests
+* [https://issues.apache.org/jira/browse/OPENEJB-184[OPENEJB-184]] - iTest: StatefulRemoteBusinessIntfcTests
+* [https://issues.apache.org/jira/browse/OPENEJB-185[OPENEJB-185]] - iTest: StatefulBeanJndiEncTests
+* [https://issues.apache.org/jira/browse/OPENEJB-186[OPENEJB-186]] - iTest: StatefulBeanSetterInjectionTests
+* [https://issues.apache.org/jira/browse/OPENEJB-187[OPENEJB-187]] - iTest: StatefulBeanPublicFieldInjectionTests
+* [https://issues.apache.org/jira/browse/OPENEJB-201[OPENEJB-201]] - iTest: InterceptorInvocationContextTests
+* [https://issues.apache.org/jira/browse/OPENEJB-316[OPENEJB-316]] - ASL Headers: openejb3/assembly
+* [https://issues.apache.org/jira/browse/OPENEJB-317[OPENEJB-317]] - ASL Headers: openejb3/container
+* [https://issues.apache.org/jira/browse/OPENEJB-318[OPENEJB-318]] - ASL Headers: openejb3/examples
+* [https://issues.apache.org/jira/browse/OPENEJB-319[OPENEJB-319]] - ASL Headers: openejb3/itests
+* [https://issues.apache.org/jira/browse/OPENEJB-320[OPENEJB-320]] - ASL Headers: openejb3/server
+* [https://issues.apache.org/jira/browse/OPENEJB-328[OPENEJB-328]] - openejb3 license and notice files do not end with .txt
+* [https://issues.apache.org/jira/browse/OPENEJB-329[OPENEJB-329]] - openejb3/itests/openejb-itests-app/
+* [https://issues.apache.org/jira/browse/OPENEJB-330[OPENEJB-330]] - openejb3/assembly/openejb-standalone
+* [https://issues.apache.org/jira/browse/OPENEJB-331[OPENEJB-331]] - openejb3/assembly/openejb-tomcat
+* [https://issues.apache.org/jira/browse/OPENEJB-343[OPENEJB-343]] - Example: Minimal Statetless Bean via a deployment descriptor
+* [https://issues.apache.org/jira/browse/OPENEJB-345[OPENEJB-345]] - Example: Minimal MessageDriven Bean via a deployment descriptor
+* [https://issues.apache.org/jira/browse/OPENEJB-636[OPENEJB-636]] - doc: deploy-tool.html
+* [https://issues.apache.org/jira/browse/OPENEJB-658[OPENEJB-658]] - doc: quickstart.html
+* [https://issues.apache.org/jira/browse/OPENEJB-660[OPENEJB-660]] - doc: startup.html
+* [https://issues.apache.org/jira/browse/OPENEJB-678[OPENEJB-678]] - Validation: Explicit check for InvocationContext incorrectly used in bean callbacks
+* [https://issues.apache.org/jira/browse/OPENEJB-1419[OPENEJB-1419]] - Add a related documentation page
+* [https://issues.apache.org/jira/browse/OPENEJB-1836[OPENEJB-1836]] - Validation: @Local on bean with no-interface should use @LocalBean
+* [https://issues.apache.org/jira/browse/OPENEJB-2071[OPENEJB-2071]] - Validation: Check for proper @Asynchronous usage
+
+== Bug
+
+[.compact]
+* [https://issues.apache.org/jira/browse/OPENEJB-6[OPENEJB-6]] - Wrong Exceptions thrown for unimplemented features
+* [https://issues.apache.org/jira/browse/OPENEJB-23[OPENEJB-23]] - OpenEJB protocol hangs in ObjectInputStream
+* [https://issues.apache.org/jira/browse/OPENEJB-75[OPENEJB-75]] - itests broken when Geronimo moved to v1.0
+* [https://issues.apache.org/jira/browse/OPENEJB-207[OPENEJB-207]] - Need to put the most updated EJB\JPA specs onto one of our repos
+* [https://issues.apache.org/jira/browse/OPENEJB-208[OPENEJB-208]] - NoClassDefFound exception is thrown when OpenEJB3.0 server is starting
+* [https://issues.apache.org/jira/browse/OPENEJB-259[OPENEJB-259]] - Session bean &quot;setSessionContext&quot;
+method should not be required for POJO EJBs
+* [https://issues.apache.org/jira/browse/OPENEJB-290[OPENEJB-290]] - Executing an ejbSelect that does not return a cmp bean throw NullPointerException
+* [https://issues.apache.org/jira/browse/OPENEJB-291[OPENEJB-291]] - SessionContext getRollbackOnly and setRollbackOnly should throw an IllegalArgumentException when there is no transaction in progress
+* [https://issues.apache.org/jira/browse/OPENEJB-292[OPENEJB-292]] - SessionSynchronization should not be called on a SFSB when ejbCreate is called
+* [https://issues.apache.org/jira/browse/OPENEJB-293[OPENEJB-293]] - beforeCommit should not be called when the transaction is marked rollback only
+* [https://issues.apache.org/jira/browse/OPENEJB-296[OPENEJB-296]] - EJBQL query with many-to-many join clause causes an AssertionError
+* [https://issues.apache.org/jira/browse/OPENEJB-303[OPENEJB-303]] - EJBLocalObject.getEJBLocalHome throws exception
+* [https://issues.apache.org/jira/browse/OPENEJB-322[OPENEJB-322]] - JeeTests fail due to bad descriptors
+* [https://issues.apache.org/jira/browse/OPENEJB-339[OPENEJB-339]] - NPE in class AnnotationDeployer during deployment of annotated beans
+* [https://issues.apache.org/jira/browse/OPENEJB-391[OPENEJB-391]] - openejb-itests-core does not start
+* [https://issues.apache.org/jira/browse/OPENEJB-392[OPENEJB-392]] - Patch to fix broken itests
+* [https://issues.apache.org/jira/browse/OPENEJB-394[OPENEJB-394]] - javax.naming.NameNotFoundException Name &quot;client/tools/DatabaseHome&quot;
+not found
+* [https://issues.apache.org/jira/browse/OPENEJB-397[OPENEJB-397]] - Fix DummyTest.java in itests.
+* [https://issues.apache.org/jira/browse/OPENEJB-409[OPENEJB-409]] - NullPointer Exception on trying to deploy MessageDrivenBean
+* [https://issues.apache.org/jira/browse/OPENEJB-410[OPENEJB-410]] - Executing bin/openejb with no parameters causes usage to be printed 4 times
+* [https://issues.apache.org/jira/browse/OPENEJB-411[OPENEJB-411]] - IvmContext.listBindings returns an enumeration of NameClassPair insted of Bindings
+* [https://issues.apache.org/jira/browse/OPENEJB-413[OPENEJB-413]] - @EJB Resource injection does not work when there are both Local and Remote interface
+* [https://issues.apache.org/jira/browse/OPENEJB-430[OPENEJB-430]] - Transaction support not wired in MDB Container
+* [https://issues.apache.org/jira/browse/OPENEJB-444[OPENEJB-444]] - Starting and ending spaces not trimmed in openejb during unmarshalling of descriptors.
+* [https://issues.apache.org/jira/browse/OPENEJB-461[OPENEJB-461]] - Workaround for maven misresolving ${pom.version}
+* [https://issues.apache.org/jira/browse/OPENEJB-463[OPENEJB-463]] - Examples use a different version for geronimo-ejb_3.0_spec than the one used in the main build.
+* [https://issues.apache.org/jira/browse/OPENEJB-467[OPENEJB-467]] - Lookup of EntityManagerFactories failing in Windows
+* [https://issues.apache.org/jira/browse/OPENEJB-471[OPENEJB-471]] - CMP beans in an EJB 1.1 jar are assumed to be CMP 2.0
+* [https://issues.apache.org/jira/browse/OPENEJB-513[OPENEJB-513]] - Missing OpenEJB icon on &quot;Define New Server&quot;
+Page of &quot;New Server&quot;
+wizard
+* [https://issues.apache.org/jira/browse/OPENEJB-515[OPENEJB-515]] - openejb2/geronimo jaxb tree cannot handle persistence-unit-ref
+* [https://issues.apache.org/jira/browse/OPENEJB-539[OPENEJB-539]] - Fix NPE in InterceptorStack
+* [https://issues.apache.org/jira/browse/OPENEJB-540[OPENEJB-540]] - Rolling back a transaction in which a Timer is cancelled results in a non-functional timer
+* [https://issues.apache.org/jira/browse/OPENEJB-545[OPENEJB-545]] - PortableRemoteObject instances not getting marshaled correctly on EJB calls.
+* [https://issues.apache.org/jira/browse/OPENEJB-546[OPENEJB-546]] - Timer operations are improperly allowed in some methods
+* [https://issues.apache.org/jira/browse/OPENEJB-549[OPENEJB-549]] - JndiEncBuilder is inserting bad comp/ORB and comp/HandleDelegate references into jndi tree.
+* [https://issues.apache.org/jira/browse/OPENEJB-551[OPENEJB-551]] - ClassNotFoundExceptions can occur during method argument or return value marshalling/unmarshalling
+* [https://issues.apache.org/jira/browse/OPENEJB-553[OPENEJB-553]] - EjbObjectProxyHandler and EjbHomeProxyHandler serialization using wrong server context.
+* [https://issues.apache.org/jira/browse/OPENEJB-554[OPENEJB-554]] - WebServiceBindingType.ejbName not set in ReadDescriptors.java
+* [https://issues.apache.org/jira/browse/OPENEJB-555[OPENEJB-555]] - Don&#39;t ship files with Sun copyright statements
+* [https://issues.apache.org/jira/browse/OPENEJB-556[OPENEJB-556]] - HSQL ServerService fails to start when there are no connectors bound into the system
+* [https://issues.apache.org/jira/browse/OPENEJB-557[OPENEJB-557]] - Throw EJBAccessException not RemoteException when you&#39;re unauthorized
+* [https://issues.apache.org/jira/browse/OPENEJB-562[OPENEJB-562]] - WebServiceRef annotation processing does not check for existing service-ref elements in DD
+* [https://issues.apache.org/jira/browse/OPENEJB-564[OPENEJB-564]] - JAX-RPC fixes
+* [https://issues.apache.org/jira/browse/OPENEJB-566[OPENEJB-566]] - geronimo security type not copied correctly
+* [https://issues.apache.org/jira/browse/OPENEJB-567[OPENEJB-567]] - EjbJarBuilder.build() should not &quot;deploy&quot;
+beans
+* [https://issues.apache.org/jira/browse/OPENEJB-570[OPENEJB-570]] - NotSerializableException passivating a session
+* [https://issues.apache.org/jira/browse/OPENEJB-578[OPENEJB-578]] - Register SERVICE_ENDPOINT last so it doesn&#39;t get overriden
+* [https://issues.apache.org/jira/browse/OPENEJB-579[OPENEJB-579]] - Persistenceunit refs with no name should get resolved to a unique persistence unit
+* [https://issues.apache.org/jira/browse/OPENEJB-581[OPENEJB-581]] - EjbModule URL not valid should be squashed
+* [https://issues.apache.org/jira/browse/OPENEJB-582[OPENEJB-582]] - Lifecycle interceptor defined on a superclass breaks the chain
+* [https://issues.apache.org/jira/browse/OPENEJB-587[OPENEJB-587]] - wrong main.class value for deploy and validate options
+* [https://issues.apache.org/jira/browse/OPENEJB-588[OPENEJB-588]] - OpenJPA graduated from incubator, need to upgrade to 1.0.0-SNAPSHOT
+* [https://issues.apache.org/jira/browse/OPENEJB-589[OPENEJB-589]] - MalformedURLException during deployment of Geronimo MEJBGBean
+* [https://issues.apache.org/jira/browse/OPENEJB-590[OPENEJB-590]] - mvn -Dassemble does not create bin directory in the assembly of module openejb-standalone
+* [https://issues.apache.org/jira/browse/OPENEJB-593[OPENEJB-593]] - Fix build error
+* [https://issues.apache.org/jira/browse/OPENEJB-595[OPENEJB-595]] - maven assembly plugin does not filter resources
+* [https://issues.apache.org/jira/browse/OPENEJB-601[OPENEJB-601]] - broken logging
+* [https://issues.apache.org/jira/browse/OPENEJB-622[OPENEJB-622]] - EntityEJBObjectHandler memory leak
+* [https://issues.apache.org/jira/browse/OPENEJB-623[OPENEJB-623]] - Apply container-transaction delcarations in proper order
+* [https://issues.apache.org/jira/browse/OPENEJB-625[OPENEJB-625]] - RedeployTest does not search for maven repository properly
+* [https://issues.apache.org/jira/browse/OPENEJB-666[OPENEJB-666]] - openejb start --help command prints out property values.
+* [https://issues.apache.org/jira/browse/OPENEJB-667[OPENEJB-667]] - OpenEJB server prints logging messages to console.
+* [https://issues.apache.org/jira/browse/OPENEJB-672[OPENEJB-672]] - Running the command &quot;openejb stop --help&quot;
+throws a null pointer exception
+* [https://issues.apache.org/jira/browse/OPENEJB-792[OPENEJB-792]] - Failure in RedeployTest on Windows.
+* [https://issues.apache.org/jira/browse/OPENEJB-889[OPENEJB-889]] - javax.jms.JMSException: Failed to build body from bytes.
+* [https://issues.apache.org/jira/browse/OPENEJB-1022[OPENEJB-1022]] - Test case org.apache.openejb.config.ConfigurationFactoryTest#testConfigureApplicationWebModule fails while building OEJB
+* [https://issues.apache.org/jira/browse/OPENEJB-1131[OPENEJB-1131]] - JDK 1.6.0 u18 has a ClassCastException in ClassLoaderUtil.clearSunJarFileFactoryCache
+* [https://issues.apache.org/jira/browse/OPENEJB-1246[OPENEJB-1246]] - Committed timers are not visible between transactions
+* [https://issues.apache.org/jira/browse/OPENEJB-1263[OPENEJB-1263]] - IllegalAccessException with TomcatThreadContextListener
+* [https://issues.apache.org/jira/browse/OPENEJB-1287[OPENEJB-1287]] - java.lang.NullPointerException: null: null at org.apache.openejb.assembler.classic.Assembler.createApplication
+* [https://issues.apache.org/jira/browse/OPENEJB-1305[OPENEJB-1305]] - Standalone Server shutdown fails
+* [https://issues.apache.org/jira/browse/OPENEJB-1347[OPENEJB-1347]] - ClassCastException in ClassLoaderUtil.clearSunJarFileFactoryCache
+* [https://issues.apache.org/jira/browse/OPENEJB-1349[OPENEJB-1349]] - No interceptor of type org.apache.openejb.cdi.CdiInterceptor
+* [https://issues.apache.org/jira/browse/OPENEJB-1405[OPENEJB-1405]] - WS Security mustUnderstand flag not treated when handlers are used
+* [https://issues.apache.org/jira/browse/OPENEJB-1417[OPENEJB-1417]] - webservices.xml not read when embedded in Tomcat
+* [https://issues.apache.org/jira/browse/OPENEJB-1422[OPENEJB-1422]] - fix compile error caused by OWB-503
+* [https://issues.apache.org/jira/browse/OPENEJB-1622[OPENEJB-1622]] - Adding more boundary condition handling in cron calendar timer.
+* [https://issues.apache.org/jira/browse/OPENEJB-1918[OPENEJB-1918]] - Build relies on <repositories> and <pluginRepositories>
+* [https://issues.apache.org/jira/browse/OPENEJB-1962[OPENEJB-1962]] - Filter out known directories from EAR scanning
+* [https://issues.apache.org/jira/browse/OPENEJB-1963[OPENEJB-1963]] - Only fail security on bad deployment directory
+* [https://issues.apache.org/jira/browse/OPENEJB-1967[OPENEJB-1967]] - SocketConnectionFactory not honouring lock request and soLinger
+* [https://issues.apache.org/jira/browse/OPENEJB-1986[OPENEJB-1986]] - Deployment of web application with white spaces in its name fails due to unencoded characters
+* [https://issues.apache.org/jira/browse/OPENEJB-1994[OPENEJB-1994]] - App directory with space in name fails on Win platforms
+* [https://issues.apache.org/jira/browse/OPENEJB-1995[OPENEJB-1995]] - Scheduler does not respect TimeZone property if specified
+* [https://issues.apache.org/jira/browse/OPENEJB-2004[OPENEJB-2004]] - EjbTimerService fails to shut down after recent changes
+* [https://issues.apache.org/jira/browse/OPENEJB-2047[OPENEJB-2047]] - ignore com.sun in PersistenceUnitInfoImpl
+* [https://issues.apache.org/jira/browse/OPENEJB-2055[OPENEJB-2055]] - openejb-core PMD - basic.xml
+* [https://issues.apache.org/jira/browse/OPENEJB-2063[OPENEJB-2063]] - Failure to start cxf-rs service due to simple logging call
+* [https://issues.apache.org/jira/browse/OPENEJB-2064[OPENEJB-2064]] - @DenyAll not handled at class level
+* [https://issues.apache.org/jira/browse/OPENEJB-2065[OPENEJB-2065]] - Change 1482211 causes shell error if bin/openejb is given more than one argument
+* [https://issues.apache.org/jira/browse/OPENEJB-2066[OPENEJB-2066]] - &quot;openejb stop&quot;
+leaves the standalone java process running but broken
+* [https://issues.apache.org/jira/browse/OPENEJB-2067[OPENEJB-2067]] - Wrong URL when hot-deploying @WebService to TomEE+ 1.6.0
+* [https://issues.apache.org/jira/browse/OPENEJB-2068[OPENEJB-2068]] - OpenEJB runs EJB Business Interface Method on Proxy instead of Bean
+* [https://issues.apache.org/jira/browse/OPENEJB-2070[OPENEJB-2070]] - Potential deadlock in URLClassLoaderFirst
+* [https://issues.apache.org/jira/browse/OPENEJB-2072[OPENEJB-2072]] - Fix OSGI import for commons-lang and commons-lang3
+* [https://issues.apache.org/jira/browse/OPENEJB-2078[OPENEJB-2078]] - add pojo-deployment to openejb-jar.xsd
+* [https://issues.apache.org/jira/browse/OPENEJB-2080[OPENEJB-2080]] - EJB @LocalBean reference serialization issue
+* [https://issues.apache.org/jira/browse/OPENEJB-2081[OPENEJB-2081]] - Fix @Event AssemblerAfterApplicationCreated location
+* [https://issues.apache.org/jira/browse/OPENEJB-2085[OPENEJB-2085]] - Interceptor extension not recognized
+* [https://issues.apache.org/jira/browse/OPENEJB-2093[OPENEJB-2093]] - Testing a WebService through ApplicationComposer may lead to a null WebServiceContext
+
+== Improvement
+
+[.compact]
+* [https://issues.apache.org/jira/browse/OPENEJB-38[OPENEJB-38]] - The loader jar not installable or deployable to a maven repo
+* [https://issues.apache.org/jira/browse/OPENEJB-305[OPENEJB-305]] - Update itest plans
+* [https://issues.apache.org/jira/browse/OPENEJB-309[OPENEJB-309]] - Implement support for JNDI_LIST and JNDI_LIST_BINDINGS methods in org.openejb.server.ejbd.JndiRequestHandler
+* [https://issues.apache.org/jira/browse/OPENEJB-321[OPENEJB-321]] - Add ASF license header to all source files
+* [https://issues.apache.org/jira/browse/OPENEJB-514[OPENEJB-514]] - Introduce UI plugin + minor fixes to core plugin
+* [https://issues.apache.org/jira/browse/OPENEJB-568[OPENEJB-568]] - JAX-RPC integration improvements
+* [https://issues.apache.org/jira/browse/OPENEJB-626[OPENEJB-626]] - Rename default.logging.conf to embedded.logging.properties and also change appenders for embedded.logging.properties
+* [https://issues.apache.org/jira/browse/OPENEJB-630[OPENEJB-630]] - Add search to home page
+* [https://issues.apache.org/jira/browse/OPENEJB-669[OPENEJB-669]] - remove hsql log messages from server startup
+* [https://issues.apache.org/jira/browse/OPENEJB-684[OPENEJB-684]] - Upgrade org.apache.axis2:axis2-jaxws-api to 1.3
+* [https://issues.apache.org/jira/browse/OPENEJB-685[OPENEJB-685]] - Use Maven 2 Remote Resources Plugin to manage LICENSE/NOTICE files
+* [https://issues.apache.org/jira/browse/OPENEJB-925[OPENEJB-925]] - Improved scanning for ejbs in webapps while in Tomcat
+* [https://issues.apache.org/jira/browse/OPENEJB-1081[OPENEJB-1081]] - Find most specific setter in ClientInjectionProcessor.findSetter
+* [https://issues.apache.org/jira/browse/OPENEJB-1265[OPENEJB-1265]] - TempClassLoader buffer reuse reduces memory requirements
+* [https://issues.apache.org/jira/browse/OPENEJB-1346[OPENEJB-1346]] - Improve @AccessTimeout annotation processing
+* [https://issues.apache.org/jira/browse/OPENEJB-1413[OPENEJB-1413]] - Support interesting module types in DeploymentLoader
+* [https://issues.apache.org/jira/browse/OPENEJB-1418[OPENEJB-1418]] - Refactor TomcatWebAppBuilder
+* [https://issues.apache.org/jira/browse/OPENEJB-1838[OPENEJB-1838]] - Add &#39;MultiPulse&#39;
+discovery - An alternative multicast discovery option
+* [https://issues.apache.org/jira/browse/OPENEJB-1839[OPENEJB-1839]] - Configrable TCP Socket connect timeout for ejbd and ejbds
+* [https://issues.apache.org/jira/browse/OPENEJB-1854[OPENEJB-1854]] - Multicast discovery collides with a configured localhost service
+* [https://issues.apache.org/jira/browse/OPENEJB-1969[OPENEJB-1969]] - OpenEJBDeployableContainer has InstanceProducer<Context>
+* [https://issues.apache.org/jira/browse/OPENEJB-1996[OPENEJB-1996]] - Configure QuartzResourceAdapter start and stop timeouts and logging
+* [https://issues.apache.org/jira/browse/OPENEJB-1999[OPENEJB-1999]] - Update to ActiveMQ 5.8.x
+* [https://issues.apache.org/jira/browse/OPENEJB-2000[OPENEJB-2000]] - Add &#39;ignore&#39;
+property to MulticastPulseAgent
+* [https://issues.apache.org/jira/browse/OPENEJB-2030[OPENEJB-2030]] - Default include exclude order should be exclude-include
+* [https://issues.apache.org/jira/browse/OPENEJB-2049[OPENEJB-2049]] - openejb-core PMD - EmptyCatchBlock
+* [https://issues.apache.org/jira/browse/OPENEJB-2050[OPENEJB-2050]] - openejb-core PMD - EmptyStatementNotInLoop
+* [https://issues.apache.org/jira/browse/OPENEJB-2051[OPENEJB-2051]] - openejb-core PMD - EmptyWhileStmt
+* [https://issues.apache.org/jira/browse/OPENEJB-2052[OPENEJB-2052]] - openejb-core PMD - EmptyIfStmt
+* [https://issues.apache.org/jira/browse/OPENEJB-2053[OPENEJB-2053]] - openejb-core PMD - finalizers.xml and imports.xml
+* [https://issues.apache.org/jira/browse/OPENEJB-2054[OPENEJB-2054]] - openejb-core PMD - unusedcode.xml
+* [https://issues.apache.org/jira/browse/OPENEJB-2056[OPENEJB-2056]] - openejb-loader PMD
+* [https://issues.apache.org/jira/browse/OPENEJB-2057[OPENEJB-2057]] - openejb-core checkstyle
+* [https://issues.apache.org/jira/browse/OPENEJB-2060[OPENEJB-2060]] - openejb-core checkstyle [FinalClass]
+* [https://issues.apache.org/jira/browse/OPENEJB-2061[OPENEJB-2061]] - openejb-core checkstyle [SimplifyBooleanExpression, SimplifyBooleanReturn]
+* [https://issues.apache.org/jira/browse/OPENEJB-2062[OPENEJB-2062]] - openejb-core checkstyle [ArrayTypeStyle]
+* [https://issues.apache.org/jira/browse/OPENEJB-2073[OPENEJB-2073]] - openejb-core PMD - LocalVariableCouldBeFinal
+* [https://issues.apache.org/jira/browse/OPENEJB-2079[OPENEJB-2079]] - Use system property &#39;derby.system.home&#39;
+if supplied
+* [https://issues.apache.org/jira/browse/OPENEJB-2084[OPENEJB-2084]] - Move Server Services to a dedicated &quot;Start&quot;
+event
+* [https://issues.apache.org/jira/browse/OPENEJB-2088[OPENEJB-2088]] - Allow injection of (SOAP)Handlers
+* [https://issues.apache.org/jira/browse/OPENEJB-2089[OPENEJB-2089]] - Provide ApplicationComposer feature as a JUnit @Rule
+
+== New Feature
+
+[.compact]
+* [https://issues.apache.org/jira/browse/OPENEJB-63[OPENEJB-63]] - New Castor CMP Container
+* [https://issues.apache.org/jira/browse/OPENEJB-565[OPENEJB-565]] - Basic support for JAX-WS invocations
+* [https://issues.apache.org/jira/browse/OPENEJB-569[OPENEJB-569]] - @Resource WebServiceContext injection
+* [https://issues.apache.org/jira/browse/OPENEJB-924[OPENEJB-924]] - Adding APIs for new EJB 3.1 features
+* [https://issues.apache.org/jira/browse/OPENEJB-1230[OPENEJB-1230]] - Webapp scanning include/exclude via context.xml settings
+* [https://issues.apache.org/jira/browse/OPENEJB-1410[OPENEJB-1410]] - Dynamic data source (using more than one data source as one)
+* [https://issues.apache.org/jira/browse/OPENEJB-1525[OPENEJB-1525]] - bean validation for parameters and returned values
+* [https://issues.apache.org/jira/browse/OPENEJB-1528[OPENEJB-1528]] - allowing the user to add default interceptors
+* [https://issues.apache.org/jira/browse/OPENEJB-1958[OPENEJB-1958]] - Add compression to the ejbd protocol.
+* [https://issues.apache.org/jira/browse/OPENEJB-2048[OPENEJB-2048]] - Implement a simplified direct connection factory
+* [https://issues.apache.org/jira/browse/OPENEJB-2082[OPENEJB-2082]] - Allow to call an observer after another one
+* [https://issues.apache.org/jira/browse/OPENEJB-2090[OPENEJB-2090]] - provide junit rules for EJBContainer
+
+== Task
+
+[.compact]
+* [https://issues.apache.org/jira/browse/OPENEJB-20[OPENEJB-20]] - org.openejb.util.Logger uses deprecated log4j.Category class
+* [https://issues.apache.org/jira/browse/OPENEJB-36[OPENEJB-36]] - Automated test of tomcat integration
+* [https://issues.apache.org/jira/browse/OPENEJB-81[OPENEJB-81]] - ejb3 specs module
+* [https://issues.apache.org/jira/browse/OPENEJB-110[OPENEJB-110]] - JPA Spec - ClassTransformer missing method patch
+* [https://issues.apache.org/jira/browse/OPENEJB-111[OPENEJB-111]] - JPA - persistence.xml parser and skeleton provider
+* [https://issues.apache.org/jira/browse/OPENEJB-112[OPENEJB-112]] - Port HTTP server support from 2
+* [https://issues.apache.org/jira/browse/OPENEJB-113[OPENEJB-113]] - Port CORBA server code from openejb 2
+* [https://issues.apache.org/jira/browse/OPENEJB-114[OPENEJB-114]] - Port Axis server support from 2
+* [https://issues.apache.org/jira/browse/OPENEJB-115[OPENEJB-115]] - Port/rewrite the XFire server support from 2 into 3
+* [https://issues.apache.org/jira/browse/OPENEJB-116[OPENEJB-116]] - Port EJB Containers from 2 into 3
+* [https://issues.apache.org/jira/browse/OPENEJB-122[OPENEJB-122]] - JCA Support via Jencks project
+* [https://issues.apache.org/jira/browse/OPENEJB-135[OPENEJB-135]] - Castor 1.0 upgrade
+* [https://issues.apache.org/jira/browse/OPENEJB-258[OPENEJB-258]] - Documentation about XBean and its use
+* [https://issues.apache.org/jira/browse/OPENEJB-264[OPENEJB-264]] - iTests broken - missing spring2.xml
+* [https://issues.apache.org/jira/browse/OPENEJB-272[OPENEJB-272]] - Change packages to org.apache.openejb in openejb3 trunk
+* [https://issues.apache.org/jira/browse/OPENEJB-281[OPENEJB-281]] - Remove dependencies with groupId=geronimo from poms
+* [https://issues.apache.org/jira/browse/OPENEJB-282[OPENEJB-282]] - Both EJBHome and EJBLocalHome remove(Object primaryKey) methods should throw javax.ejb.RemoveException when used with Sessions beans
+* [https://issues.apache.org/jira/browse/OPENEJB-311[OPENEJB-311]] - Add ASL License Headers
+* [https://issues.apache.org/jira/browse/OPENEJB-323[OPENEJB-323]] - Add ASL License and Notice
+* [https://issues.apache.org/jira/browse/OPENEJB-387[OPENEJB-387]] - Adding support for &quot;openejb.deployments.classpath.include&quot;
+* [https://issues.apache.org/jira/browse/OPENEJB-448[OPENEJB-448]] - Move duplicate app checking into the assembler
+* [https://issues.apache.org/jira/browse/OPENEJB-449[OPENEJB-449]] - Non-finder based ServerService creation
+* [https://issues.apache.org/jira/browse/OPENEJB-524[OPENEJB-524]] - Geronimo 2.0 Integration
+* [https://issues.apache.org/jira/browse/OPENEJB-585[OPENEJB-585]] - [GRADUATION] Yank the DISCLAIMER.txt that says we are incubating
+* [https://issues.apache.org/jira/browse/OPENEJB-586[OPENEJB-586]] - [GRADUATION] Drop &quot;incubating&quot;
+from version number
+* [https://issues.apache.org/jira/browse/OPENEJB-1054[OPENEJB-1054]] - Investigate App Client Main-Class handling
+
+== Test
+
+[.compact]
+* [https://issues.apache.org/jira/browse/OPENEJB-450[OPENEJB-450]] - Potentially use xbean-naming
+* [https://issues.apache.org/jira/browse/OPENEJB-519[OPENEJB-519]] - Annotated test clients enablement
+* [https://issues.apache.org/jira/browse/OPENEJB-563[OPENEJB-563]] - Test Case for Jax-RPC
+* [https://issues.apache.org/jira/browse/OPENEJB-676[OPENEJB-676]] - [BUILD FAILURE : There are test failures] OpenejbJarTest and ConversionTest are failing when building the code.
+
+== Wish
+
+[.compact]
+* [https://issues.apache.org/jira/browse/OPENEJB-2077[OPENEJB-2077]] - Do not require openejb.json/openejb.xml
+* [https://issues.apache.org/jira/browse/OPENEJB-2092[OPENEJB-2092]] - Allow easy offsetting of all OpenEJB ports
diff --git a/src/main/jbake/content/tomee-1.7.0-release-notes.md b/src/main/jbake/content/tomee-1.7.0-release-notes.md
deleted file mode 100644
index 20fb90a..0000000
--- a/src/main/jbake/content/tomee-1.7.0-release-notes.md
+++ /dev/null
@@ -1,861 +0,0 @@
-
-        Release Notes - TomEE - Version 1.7.0
-    
-<h2>        Sub-task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-659'>TOMEE-659</a>] -         TomEE new logo
-</li>
-</ul>
-            
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-836'>TOMEE-836</a>] -         ReportValidationResults should log.info about the root cause
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-885'>TOMEE-885</a>] -         Cannot inject no-interface groovy local bean
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-926'>TOMEE-926</a>] -         arquillian adaptors can fail replacing port if a port includes another one
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-953'>TOMEE-953</a>] -         tolerate javax. classes from app when not in server
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-982'>TOMEE-982</a>] -         JAXRS @ApplicationPath deployment fails if path starts with http and is not a URL
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1054'>TOMEE-1054</a>] -         catalina.sh created by installer is not executable
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1075'>TOMEE-1075</a>] -         openejb.home system properties not correctly set
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1076'>TOMEE-1076</a>] -         integrate tomee with spring-web SCI
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1079'>TOMEE-1079</a>] -         destroy resource adapter after connection factories
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1082'>TOMEE-1082</a>] -         openejb-javaagent missing from service.bat
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1083'>TOMEE-1083</a>] -         when using tccl for quartz avoid to set our quartz impl to avoid classloading issues (if the user does it he has to solve it himself)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1084'>TOMEE-1084</a>] -         webservice (soap) undeployment doesn&#39;t use same id as deployment -&gt; can deploy/undeploy (in tests) the same WS 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1085'>TOMEE-1085</a>] -         jaxrs application are scanned and kept even if not instantiable
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1086'>TOMEE-1086</a>] -         @WebServiceRef(MyServiceImpl.class) doesn&#39;t work as expected
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1088'>TOMEE-1088</a>] -         classpaths can be null in stop mojo
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1089'>TOMEE-1089</a>] -         driverDelegateInitString should be set only if job store class is a JobStoreSupport
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1093'>TOMEE-1093</a>] -         wrong filtering of slf4j bindings
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1094'>TOMEE-1094</a>] -         allow derby to be in webapps
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1099'>TOMEE-1099</a>] -         arquillian adapter supposes war contained in ear are named as the ear
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1101'>TOMEE-1101</a>] -         Test methods are not getting enriched when run via Arquillian
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1106'>TOMEE-1106</a>] -         infinite loop detected while destroying bean XYService under load
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1110'>TOMEE-1110</a>] -         Datasources declared in context.xml doesn&#39;t work when the application is redeployed
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1119'>TOMEE-1119</a>] -         Duplicate servlets with embedded container
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1122'>TOMEE-1122</a>] -         @Timeout &amp; @TA(NOT_SUPPORTED) methods in @Singleton beans run with transactional context
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1125'>TOMEE-1125</a>] -         stateful not clean up on discardInstance (@Remove)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1134'>TOMEE-1134</a>] -         activemq-webconsole doesn&#39;t work
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1135'>TOMEE-1135</a>] -         jaxrs beans lifecycle not well handled when relying on @Dependent
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1136'>TOMEE-1136</a>] -         Context.stop() destroy the context (manager is broken)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1137'>TOMEE-1137</a>] -         Mark all apache-tomee pom dependencies provided
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1138'>TOMEE-1138</a>] -         Cannot reference @Stateful @ConversationScoped bean in JSF page
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1139'>TOMEE-1139</a>] -         RESTService fails to check for BasicAuthHttpListenerWrapper
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1147'>TOMEE-1147</a>] -         tld can&#39;t be in WEB-INF/classes/META-INF
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1157'>TOMEE-1157</a>] -         OpenJPA metadata shoudln&#39;t be cleaned up for classes of the jvm
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1161'>TOMEE-1161</a>] -         mapping of a jaxrs application with @ApplicationPath doesnt work
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1162'>TOMEE-1162</a>] -         embedded jaxrs/http layer is broken and then for not simple cases urls are wrong
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1164'>TOMEE-1164</a>] -         avoid tomcat classloader to get a parent null after reloading
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1165'>TOMEE-1165</a>] -         cxf context not cleaned up
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1169'>TOMEE-1169</a>] -         better support of XaDataSource
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1172'>TOMEE-1172</a>] -         support jta wrapping (ManagedDataSource) of a custom datasource
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1175'>TOMEE-1175</a>] -         BaseEjbProxyHandler equals is is wrong - can lead to perf issues with cmp beans
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1179'>TOMEE-1179</a>] -         would be great to support property on provide fields for @DataSourceDefinition
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1183'>TOMEE-1183</a>] -         docBase (tomcat) and webAppInfo.path (tomee) doesn&#39;t use same separator
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1190'>TOMEE-1190</a>] -         TomEE maven plugin must supported Tomcat based distros
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1199'>TOMEE-1199</a>] -         arquillian embedded deploy as testable not testable archives if context is not cleaned up by arquillian
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1200'>TOMEE-1200</a>] -         arquillian adapters should tolerate more than a single test class as injectable test
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1203'>TOMEE-1203</a>] -         stateful can&#39;t be checkouted by multiple threads
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1205'>TOMEE-1205</a>] -         TomEE webprofile 1.6.0.1 and 1.6.0.2 breaks java subtyping
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1207'>TOMEE-1207</a>] -         support additionalSystemProperties for mvn tomee:exec even for java as script command
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1208'>TOMEE-1208</a>] -         Arquillian should replace server.xml port even if we provide it in the project
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1214'>TOMEE-1214</a>] -         tomee should pick up conf/log4j.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1215'>TOMEE-1215</a>] -         Log4jLogStreamFactory picks up wrong conf directory
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1217'>TOMEE-1217</a>] -         toUrl in PerisstenceUnitInfoImpl can create weird url when file is not a file but a jar link
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1218'>TOMEE-1218</a>] -         mixed scope-handling in CdiAppContextsService
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1219'>TOMEE-1219</a>] -         org.apache.quartz.threadPool.threadCount and openejb.timer.pool.size ignored
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1223'>TOMEE-1223</a>] -         tomee embedded EJBContainer doesn&#39;t close on error
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1226'>TOMEE-1226</a>] -         ensure when wrapping Tomcat Realms with TomEERealm that the delegates are in the right state
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1228'>TOMEE-1228</a>] -         tomee maven plugin doesn&#39;t deploy jar/ear if a custom tomee.xml is not provided
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1234'>TOMEE-1234</a>] -         arquillian tomee embedded : ensure test classloader is the app one
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1241'>TOMEE-1241</a>] -         clean up openejb.loader property when shuttingdown to allow reboot
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1242'>TOMEE-1242</a>] -         allow arquillian tomee embedded container to be rebooted (manual mode)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1248'>TOMEE-1248</a>] -         Security identity initialized twice when using preemptive mode
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1255'>TOMEE-1255</a>] -         allow TomEE Maven Plugin to specify additional docBase
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1256'>TOMEE-1256</a>] -         allow tomee maven plugin to skip war resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1257'>TOMEE-1257</a>] -         undeployment remove all validator/validatorfactory (not only the undeployed app ones)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1260'>TOMEE-1260</a>] -         allow CDI contructor injections for JAX-RS endpoints
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1261'>TOMEE-1261</a>] -         soap binding annotation not read for ejbs
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1262'>TOMEE-1262</a>] -         JAX RS Autoscanning from Web XML
-</li>
-</ul>
-    
-<h2>        Dependency upgrade
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1104'>TOMEE-1104</a>] -         Tomcat 7.0.53
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1108'>TOMEE-1108</a>] -         myfaces 2.1.15
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1115'>TOMEE-1115</a>] -         xbean 3.16
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1131'>TOMEE-1131</a>] -         OpenWebBeans 1.2.4
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1142'>TOMEE-1142</a>] -         CXF 2.6.14
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1158'>TOMEE-1158</a>] -         Arquillian 1.1.5.Final
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1193'>TOMEE-1193</a>] -         examples/groovy-spock groovy-all dependency update
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1194'>TOMEE-1194</a>] -         examples/groovy-cdi groovy-all dependency update
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1195'>TOMEE-1195</a>] -         examples/groovy-jpa groovy-all dependency update
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1196'>TOMEE-1196</a>] -         examples/lookup-of-ejbs junit dependency update
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1197'>TOMEE-1197</a>] -         examples/lookup-of-ejbs-with-descriptor junit dependency update
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1232'>TOMEE-1232</a>] -         update examples using myfaces extval
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1236'>TOMEE-1236</a>] -         Use Tomcat 7.0.54
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1237'>TOMEE-1237</a>] -         Mojarra 2.1.x
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1238'>TOMEE-1238</a>] -         EclipseLink 2.4.2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1245'>TOMEE-1245</a>] -         activemq 5.10.0
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1252'>TOMEE-1252</a>] -         upgrade deltaspike fullstack example to deltaspike v1
-</li>
-</ul>
-    
-<h2>        Documentation
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1154'>TOMEE-1154</a>] -         port myfaces-codi fullstack demo to deltaspike
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1155'>TOMEE-1155</a>] -         upgrade myfaces-codi fullstack demo for tomee 1.6.x
-</li>
-</ul>
-        
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-898'>TOMEE-898</a>] -         Bean Validation Test (bean-validation-design-by-contract) is in the wrong package
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-904'>TOMEE-904</a>] -         Try to unwrap the URL from UrlAsset instead of creating a new one
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1090'>TOMEE-1090</a>] -         tomee-catalina PMD
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1100'>TOMEE-1100</a>] -         enhance error message in PersistenceUnitLinkResolver.extractWebApp when uri is illegal
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1105'>TOMEE-1105</a>] -         JAX-WS Endpoint CDI Support
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1111'>TOMEE-1111</a>] -         Expand SQL logging capability to include failed statements as well
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1126'>TOMEE-1126</a>] -         Add property for loading dynamic CXF providers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1151'>TOMEE-1151</a>] -         @Observes optimization
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1152'>TOMEE-1152</a>] -         Failure related @Observes infinite loops protection
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1163'>TOMEE-1163</a>] -         ApplicationComposer: Process @Module annotations in parent classes
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1168'>TOMEE-1168</a>] -         subclass dynamic (ejb implementing invocation handler) are not deterministic wirh cxf-rs
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1185'>TOMEE-1185</a>] -         option to deactivate DataSourcePlugins
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1186'>TOMEE-1186</a>] -         allow to add at runtime system properties using execmojo (java -jar myapp.jar)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1187'>TOMEE-1187</a>] -         disable tomcat reloading with tomee maven plugin to avoid reloading on update only extensions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1192'>TOMEE-1192</a>] -         LazyRealm doesn&#39;t support Lifecycle hooks
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1201'>TOMEE-1201</a>] -         Allow dynamic configuration of, and log, thread pool sizes.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1210'>TOMEE-1210</a>] -         Create Assemblies that honour OS specific line endings
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1211'>TOMEE-1211</a>] -         Reduce wrapping of SQLException in DBCP usage
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1221'>TOMEE-1221</a>] -         Unused code segment on tomee-catalina TomcatWebAppBuilder.java
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1227'>TOMEE-1227</a>] -         add a tomee-overlay-runner module to ease overlay creation
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1230'>TOMEE-1230</a>] -         Start and stop monitor logic should not just monitor shutdown port.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1233'>TOMEE-1233</a>] -         update deltaspike example
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1239'>TOMEE-1239</a>] -         Update HttpsConnectionTest to support jdk8 - KeyTool changes
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1240'>TOMEE-1240</a>] -         Allow to choose Host when deploying a webapp (WebAppDeployer)
-</li>
-</ul>
-    
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-651'>TOMEE-651</a>] -         DataSource is such a common resource type that it should be possible to not specify it in tomee.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-662'>TOMEE-662</a>] -         Support aliases on resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1074'>TOMEE-1074</a>] -         Manage Sessions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1077'>TOMEE-1077</a>] -         add a &quot;openejb.timers.on&quot; property (configurable in application.properties) to deactivate timers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1080'>TOMEE-1080</a>] -         properties as resource
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1081'>TOMEE-1081</a>] -         support WebServiceContext for pojos
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1092'>TOMEE-1092</a>] -         shade quartz in org.apache.openejb.quartz
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1097'>TOMEE-1097</a>] -         allow to define urls as resource
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1103'>TOMEE-1103</a>] -         tomeeAlreadyInstalled option to tomee mvn plugin to not modify tomee (no conf, no lib, no app) when starting
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1107'>TOMEE-1107</a>] -         support org.hibernate.jpa.HibernatePersistenceProvider out of the box
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1109'>TOMEE-1109</a>] -         Potential TomEE distribution with Mojarra and EclipseLink
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1113'>TOMEE-1113</a>] -         support leveldb and custom amq persistence adapter
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1114'>TOMEE-1114</a>] -         TomEE Maven Plugin should support OpenEJB standalone
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1121'>TOMEE-1121</a>] -         add openejb.cxf-rs.wadl-generator.ignoreRequests to configure and not force ignoreRequests on wadlgenerator
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1127'>TOMEE-1127</a>] -         New Event: @Observes LifecycleEvent
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1132'>TOMEE-1132</a>] -         add javaagents parameter to <a href='maven/index.html'>tomee-maven-plugin</a>
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1133'>TOMEE-1133</a>] -         support @CdiExtensions on test class for ApplicationComposer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1140'>TOMEE-1140</a>] -         Support CDI LoginModule
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1144'>TOMEE-1144</a>] -         provide an exec war goal to tomee plugin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1145'>TOMEE-1145</a>] -         &lt;Resource classpath=&quot;&quot;&gt; attribute
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1146'>TOMEE-1146</a>] -         Support multiple JDBC Driver class versions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1149'>TOMEE-1149</a>] -         @Observes BeforeEvent &amp; AfterEvent
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1150'>TOMEE-1150</a>] -         @Observes Event type inheritance
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1159'>TOMEE-1159</a>] -         support jaxrs to be overriden by the webapp
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1166'>TOMEE-1166</a>] -         activate cxf jmx by default
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1170'>TOMEE-1170</a>] -         Investigate the use of the Win platform daemon tool (prunmgr.exe)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1184'>TOMEE-1184</a>] -         TomEE Remote should support empty/null classifier
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1212'>TOMEE-1212</a>] -         allow to configure async pool by remote initial context
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1213'>TOMEE-1213</a>] -         Add support for &lt;security-role-ref&gt;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1220'>TOMEE-1220</a>] -         if jaxrs.txt is in &lt;tomee&gt;/conf add libraries in container
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1222'>TOMEE-1222</a>] -         allow JarLocation (of ziplock) to get jar file from resource name and jar name
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1224'>TOMEE-1224</a>] -         TomEE Remote EJBContainer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1247'>TOMEE-1247</a>] -         allow internal datasources to be flushable (swap delegate)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1249'>TOMEE-1249</a>] -         add LockFactory API in StatefulContainer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1250'>TOMEE-1250</a>] -         support resource references in resources.xml Service using @ prefix
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1251'>TOMEE-1251</a>] -         Add ability to configure HTTPS port
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1258'>TOMEE-1258</a>] -         allow tomee maven plugin to configure externalRepositories
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1259'>TOMEE-1259</a>] -         add webappDefaultConfig to tomee maven plugin to auto configure the plugin for default webapp dev setup
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1263'>TOMEE-1263</a>] -         Add a REST Exception mapper for EJBAccessException
-</li>
-</ul>
-                                
-<h2>        Task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1160'>TOMEE-1160</a>] -         Track AppContext start time
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1177'>TOMEE-1177</a>] -         Include Apache Tomcat Native library 1.1.30
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1178'>TOMEE-1178</a>] -         Please create a DOAP file for your TLP
-</li>
-</ul>
-        
-<h2>        Test
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1253'>TOMEE-1253</a>] -         add tests based on the test-control module to the deltaspike fullstack example
-</li>
-</ul>
-
-        Release Notes - OpenEJB - Version 4.7.0
-    
-<h2>        Sub-task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-120'>OPENEJB-120</a>] -         Port CMP Container
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-145'>OPENEJB-145</a>] -         iTest: StatelessRemoteJndiTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-146'>OPENEJB-146</a>] -         iTest: StatelessLocalJndiTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-147'>OPENEJB-147</a>] -         iTest: StatelessHomeIntfcTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-148'>OPENEJB-148</a>] -         iTest: StatelessEjbHomeTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-149'>OPENEJB-149</a>] -         iTest: StatelessEjbObjectTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-150'>OPENEJB-150</a>] -         iTest: StatelessEjbLocalHomeTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-151'>OPENEJB-151</a>] -         iTest: StatelessEjbLocalObjectTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-152'>OPENEJB-152</a>] -         iTest: StatelessRemoteIntfcTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-153'>OPENEJB-153</a>] -         iTest: StatelessLocalIntfcTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-154'>OPENEJB-154</a>] -         iTest: StatelessHomeHandleTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-155'>OPENEJB-155</a>] -         iTest: StatelessHandleTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-156'>OPENEJB-156</a>] -         iTest: StatelessEjbMetaDataTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-157'>OPENEJB-157</a>] -         iTest: StatelessLocalBusinessIntfcTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-158'>OPENEJB-158</a>] -         iTest: StatelessRemoteBusinessIntfcTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-159'>OPENEJB-159</a>] -         iTest: StatelessBeanJndiEncTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-160'>OPENEJB-160</a>] -         iTest: StatelessBeanSetterInjectionTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-161'>OPENEJB-161</a>] -         iTest: StatelessBeanPublicFieldInjectionTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-171'>OPENEJB-171</a>] -         iTest: StatefulRemoteJndiTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-172'>OPENEJB-172</a>] -         iTest: StatefulLocalJndiTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-173'>OPENEJB-173</a>] -         iTest: StatefulHomeIntfcTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-174'>OPENEJB-174</a>] -         iTest: StatefulEjbHomeTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-175'>OPENEJB-175</a>] -         iTest: StatefulEjbObjectTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-176'>OPENEJB-176</a>] -         iTest: StatefulEjbLocalHomeTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-177'>OPENEJB-177</a>] -         iTest: StatefulEjbLocalObjectTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-179'>OPENEJB-179</a>] -         iTest: StatefulLocalIntfcTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-180'>OPENEJB-180</a>] -         iTest: StatefulHomeHandleTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-181'>OPENEJB-181</a>] -         iTest: StatefulHandleTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-183'>OPENEJB-183</a>] -         iTest: StatefulLocalBusinessIntfcTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-184'>OPENEJB-184</a>] -         iTest: StatefulRemoteBusinessIntfcTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-185'>OPENEJB-185</a>] -         iTest: StatefulBeanJndiEncTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-186'>OPENEJB-186</a>] -         iTest: StatefulBeanSetterInjectionTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-187'>OPENEJB-187</a>] -         iTest: StatefulBeanPublicFieldInjectionTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-201'>OPENEJB-201</a>] -         iTest: InterceptorInvocationContextTests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-316'>OPENEJB-316</a>] -         ASL Headers:  openejb3/assembly
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-317'>OPENEJB-317</a>] -         ASL Headers:  openejb3/container
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-318'>OPENEJB-318</a>] -         ASL Headers:  openejb3/examples
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-319'>OPENEJB-319</a>] -         ASL Headers:  openejb3/itests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-320'>OPENEJB-320</a>] -         ASL Headers:  openejb3/server
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-328'>OPENEJB-328</a>] -         openejb3 license and notice files do not end with .txt
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-329'>OPENEJB-329</a>] -         openejb3/itests/openejb-itests-app/
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-330'>OPENEJB-330</a>] -         openejb3/assembly/openejb-standalone
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-331'>OPENEJB-331</a>] -         openejb3/assembly/openejb-tomcat
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-343'>OPENEJB-343</a>] -         Example: Minimal Statetless Bean via a deployment descriptor
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-345'>OPENEJB-345</a>] -         Example: Minimal MessageDriven Bean via a deployment descriptor
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-636'>OPENEJB-636</a>] -         doc: deploy-tool.html
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-658'>OPENEJB-658</a>] -         doc: quickstart.html
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-660'>OPENEJB-660</a>] -         doc: startup.html
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-678'>OPENEJB-678</a>] -         Validation: Explicit check for InvocationContext incorrectly used in bean callbacks
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1419'>OPENEJB-1419</a>] -         Add a related documentation page
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1836'>OPENEJB-1836</a>] -         Validation: @Local on bean with no-interface should use @LocalBean
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2071'>OPENEJB-2071</a>] -         Validation: Check for proper @Asynchronous usage
-</li>
-</ul>
-            
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-6'>OPENEJB-6</a>] -         Wrong Exceptions thrown for unimplemented features
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-23'>OPENEJB-23</a>] -         OpenEJB protocol hangs in ObjectInputStream
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-75'>OPENEJB-75</a>] -         itests broken when Geronimo moved to v1.0
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-207'>OPENEJB-207</a>] -         Need to put the most updated EJB\JPA specs onto one of our repos
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-208'>OPENEJB-208</a>] -         NoClassDefFound exception is thrown when OpenEJB3.0 server is starting
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-259'>OPENEJB-259</a>] -         Session bean &quot;setSessionContext&quot; method should not be required for POJO EJBs
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-290'>OPENEJB-290</a>] -         Executing an ejbSelect that does not return a cmp bean throw NullPointerException
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-291'>OPENEJB-291</a>] -         SessionContext getRollbackOnly and setRollbackOnly should throw an IllegalArgumentException when there is no transaction in progress
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-292'>OPENEJB-292</a>] -         SessionSynchronization should not be called on a SFSB when ejbCreate is called
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-293'>OPENEJB-293</a>] -         beforeCommit should not be called when the transaction is marked rollback only
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-296'>OPENEJB-296</a>] -         EJBQL query with many-to-many join clause causes an AssertionError
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-303'>OPENEJB-303</a>] -         EJBLocalObject.getEJBLocalHome throws exception
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-322'>OPENEJB-322</a>] -         JeeTests fail due to bad descriptors
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-339'>OPENEJB-339</a>] -         NPE in class AnnotationDeployer during deployment of annotated beans
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-391'>OPENEJB-391</a>] -         openejb-itests-core does not start
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-392'>OPENEJB-392</a>] -         Patch to fix broken itests
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-394'>OPENEJB-394</a>] -         javax.naming.NameNotFoundException Name &quot;client/tools/DatabaseHome&quot; not found
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-397'>OPENEJB-397</a>] -         Fix DummyTest.java in itests.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-409'>OPENEJB-409</a>] -         NullPointer Exception on trying to deploy MessageDrivenBean
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-410'>OPENEJB-410</a>] -         Executing bin/openejb with no parameters causes usage to be printed 4 times
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-411'>OPENEJB-411</a>] -         IvmContext.listBindings returns an enumeration of NameClassPair insted of Bindings
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-413'>OPENEJB-413</a>] -         @EJB Resource injection does not work when there are both Local and Remote interface
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-430'>OPENEJB-430</a>] -         Transaction support not wired in MDB Container
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-444'>OPENEJB-444</a>] -         Starting and ending spaces not trimmed in openejb during unmarshalling of descriptors.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-461'>OPENEJB-461</a>] -         Workaround for maven misresolving ${pom.version}
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-463'>OPENEJB-463</a>] -         Examples use a different version for geronimo-ejb_3.0_spec than the one used in the main build.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-467'>OPENEJB-467</a>] -         Lookup of EntityManagerFactories failing in Windows
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-471'>OPENEJB-471</a>] -         CMP beans in an EJB 1.1 jar are assumed to be CMP 2.0
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-513'>OPENEJB-513</a>] -         Missing OpenEJB icon on &quot;Define New Server&quot; Page of  &quot;New Server&quot; wizard
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-515'>OPENEJB-515</a>] -         openejb2/geronimo jaxb tree cannot handle persistence-unit-ref
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-539'>OPENEJB-539</a>] -         Fix NPE in InterceptorStack
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-540'>OPENEJB-540</a>] -         Rolling back a transaction in which a Timer is cancelled results in a non-functional timer 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-545'>OPENEJB-545</a>] -         PortableRemoteObject instances not getting marshaled correctly on EJB calls.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-546'>OPENEJB-546</a>] -         Timer operations are improperly allowed in some methods
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-549'>OPENEJB-549</a>] -         JndiEncBuilder is inserting bad comp/ORB and comp/HandleDelegate references into jndi tree. 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-551'>OPENEJB-551</a>] -         ClassNotFoundExceptions can occur during method argument or return value marshalling/unmarshalling
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-553'>OPENEJB-553</a>] -         EjbObjectProxyHandler and EjbHomeProxyHandler serialization using wrong server context.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-554'>OPENEJB-554</a>] -         WebServiceBindingType.ejbName not set in ReadDescriptors.java
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-555'>OPENEJB-555</a>] -         Don&#39;t ship files with Sun copyright statements
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-556'>OPENEJB-556</a>] -         HSQL ServerService fails to start when there are no connectors bound into the system
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-557'>OPENEJB-557</a>] -         Throw EJBAccessException not RemoteException when you&#39;re unauthorized
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-562'>OPENEJB-562</a>] -         WebServiceRef annotation processing does not check for existing service-ref elements in DD
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-564'>OPENEJB-564</a>] -         JAX-RPC fixes
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-566'>OPENEJB-566</a>] -         geronimo security type not copied correctly
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-567'>OPENEJB-567</a>] -         EjbJarBuilder.build() should not &quot;deploy&quot; beans
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-570'>OPENEJB-570</a>] -         NotSerializableException passivating a session
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-578'>OPENEJB-578</a>] -         Register SERVICE_ENDPOINT last so it doesn&#39;t get overriden
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-579'>OPENEJB-579</a>] -         Persistenceunit refs with no name should get resolved to a unique persistence unit
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-581'>OPENEJB-581</a>] -         EjbModule URL not valid should be squashed
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-582'>OPENEJB-582</a>] -         Lifecycle interceptor defined on a superclass breaks the chain
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-587'>OPENEJB-587</a>] -         wrong main.class value for deploy and validate options
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-588'>OPENEJB-588</a>] -         OpenJPA graduated from incubator, need to upgrade to 1.0.0-SNAPSHOT
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-589'>OPENEJB-589</a>] -         MalformedURLException during deployment of Geronimo MEJBGBean
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-590'>OPENEJB-590</a>] -         mvn -Dassemble does not create bin directory in the assembly of module openejb-standalone
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-593'>OPENEJB-593</a>] -         Fix build error
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-595'>OPENEJB-595</a>] -         maven assembly plugin does not filter resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-601'>OPENEJB-601</a>] -         broken logging
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-622'>OPENEJB-622</a>] -         EntityEJBObjectHandler memory leak
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-623'>OPENEJB-623</a>] -         Apply container-transaction delcarations in proper order
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-625'>OPENEJB-625</a>] -         RedeployTest does not search for maven repository properly
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-666'>OPENEJB-666</a>] -         openejb start --help command prints out property values.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-667'>OPENEJB-667</a>] -         OpenEJB server prints logging messages to console.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-672'>OPENEJB-672</a>] -         Running the command &quot;openejb stop --help&quot; throws a null pointer exception
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-792'>OPENEJB-792</a>] -         Failure in RedeployTest on Windows. 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-889'>OPENEJB-889</a>] -         javax.jms.JMSException: Failed to build body from bytes. 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1022'>OPENEJB-1022</a>] -         Test case org.apache.openejb.config.ConfigurationFactoryTest#testConfigureApplicationWebModule fails while building OEJB
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1131'>OPENEJB-1131</a>] -         JDK 1.6.0 u18 has a ClassCastException in ClassLoaderUtil.clearSunJarFileFactoryCache
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1246'>OPENEJB-1246</a>] -         Committed timers are not visible between transactions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1263'>OPENEJB-1263</a>] -         IllegalAccessException with TomcatThreadContextListener
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1287'>OPENEJB-1287</a>] -         java.lang.NullPointerException: null: null at org.apache.openejb.assembler.classic.Assembler.createApplication
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1305'>OPENEJB-1305</a>] -         Standalone Server shutdown fails
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1347'>OPENEJB-1347</a>] -         ClassCastException in ClassLoaderUtil.clearSunJarFileFactoryCache
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1349'>OPENEJB-1349</a>] -         No interceptor of type org.apache.openejb.cdi.CdiInterceptor
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1405'>OPENEJB-1405</a>] -         WS Security mustUnderstand flag not treated when handlers are used
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1417'>OPENEJB-1417</a>] -         webservices.xml not read when embedded in Tomcat
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1422'>OPENEJB-1422</a>] -         fix compile error caused by OWB-503
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1622'>OPENEJB-1622</a>] -         Adding more boundary condition handling in cron calendar timer.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1918'>OPENEJB-1918</a>] -         Build relies on &lt;repositories&gt; and &lt;pluginRepositories&gt;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1962'>OPENEJB-1962</a>] -         Filter out known directories from EAR scanning
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1963'>OPENEJB-1963</a>] -         Only fail security on bad deployment directory
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1967'>OPENEJB-1967</a>] -         SocketConnectionFactory not honouring lock request and soLinger
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1986'>OPENEJB-1986</a>] -         Deployment of web application with white spaces in its name fails due to unencoded characters
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1994'>OPENEJB-1994</a>] -         App directory with space in name fails on Win platforms
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1995'>OPENEJB-1995</a>] -         Scheduler does not respect TimeZone property if specified
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2004'>OPENEJB-2004</a>] -         EjbTimerService fails to shut down after recent changes
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2047'>OPENEJB-2047</a>] -         ignore com.sun in PersistenceUnitInfoImpl
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2055'>OPENEJB-2055</a>] -         openejb-core PMD - basic.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2063'>OPENEJB-2063</a>] -         Failure to start cxf-rs service due to simple logging call
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2064'>OPENEJB-2064</a>] -         @DenyAll not handled at class level
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2065'>OPENEJB-2065</a>] -         Change 1482211 causes shell error if bin/openejb is given more than one argument
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2066'>OPENEJB-2066</a>] -         &quot;openejb stop&quot; leaves the standalone java process running but broken
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2067'>OPENEJB-2067</a>] -         Wrong URL when hot-deploying @WebService to TomEE+ 1.6.0
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2068'>OPENEJB-2068</a>] -         OpenEJB runs EJB Business Interface Method on Proxy instead of Bean
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2070'>OPENEJB-2070</a>] -         Potential deadlock in URLClassLoaderFirst
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2072'>OPENEJB-2072</a>] -         Fix OSGI import for commons-lang and commons-lang3
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2078'>OPENEJB-2078</a>] -         add pojo-deployment to openejb-jar.xsd
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2080'>OPENEJB-2080</a>] -         EJB @LocalBean reference serialization issue
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2081'>OPENEJB-2081</a>] -         Fix @Event AssemblerAfterApplicationCreated location
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2085'>OPENEJB-2085</a>] -         Interceptor extension not recognized
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2093'>OPENEJB-2093</a>] -         Testing a WebService through ApplicationComposer may lead to a null WebServiceContext
-</li>
-</ul>
-                
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-38'>OPENEJB-38</a>] -         The loader jar not installable or deployable to a maven repo
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-305'>OPENEJB-305</a>] -         Update itest plans
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-309'>OPENEJB-309</a>] -         Implement support for JNDI_LIST and JNDI_LIST_BINDINGS methods in org.openejb.server.ejbd.JndiRequestHandler
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-321'>OPENEJB-321</a>] -         Add ASF license header to all source files
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-514'>OPENEJB-514</a>] -         Introduce UI plugin + minor fixes to core plugin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-568'>OPENEJB-568</a>] -         JAX-RPC integration improvements
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-626'>OPENEJB-626</a>] -         Rename default.logging.conf to embedded.logging.properties and also change appenders for embedded.logging.properties
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-630'>OPENEJB-630</a>] -         Add search to home page
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-669'>OPENEJB-669</a>] -         remove hsql log messages from server startup
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-684'>OPENEJB-684</a>] -         Upgrade org.apache.axis2:axis2-jaxws-api to 1.3
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-685'>OPENEJB-685</a>] -         Use Maven 2 Remote Resources Plugin to manage LICENSE/NOTICE files
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-925'>OPENEJB-925</a>] -         Improved scanning for ejbs in webapps while in Tomcat
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1081'>OPENEJB-1081</a>] -         Find most specific setter in ClientInjectionProcessor.findSetter
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1265'>OPENEJB-1265</a>] -         TempClassLoader buffer reuse reduces memory requirements
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1346'>OPENEJB-1346</a>] -         Improve @AccessTimeout annotation processing
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1413'>OPENEJB-1413</a>] -         Support interesting module types in DeploymentLoader
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1418'>OPENEJB-1418</a>] -         Refactor TomcatWebAppBuilder
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1838'>OPENEJB-1838</a>] -         Add &#39;MultiPulse&#39; discovery - An alternative multicast discovery option
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1839'>OPENEJB-1839</a>] -         Configrable TCP Socket connect timeout for ejbd and ejbds
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1854'>OPENEJB-1854</a>] -         Multicast discovery collides with a configured localhost service
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1969'>OPENEJB-1969</a>] -         OpenEJBDeployableContainer has InstanceProducer&lt;Context&gt;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1996'>OPENEJB-1996</a>] -         Configure QuartzResourceAdapter start and stop timeouts and logging
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1999'>OPENEJB-1999</a>] -         Update to ActiveMQ 5.8.x
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2000'>OPENEJB-2000</a>] -         Add &#39;ignore&#39; property to MulticastPulseAgent
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2030'>OPENEJB-2030</a>] -         Default include exclude order should be exclude-include
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2049'>OPENEJB-2049</a>] -         openejb-core PMD - EmptyCatchBlock
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2050'>OPENEJB-2050</a>] -         openejb-core PMD - EmptyStatementNotInLoop
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2051'>OPENEJB-2051</a>] -         openejb-core PMD - EmptyWhileStmt
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2052'>OPENEJB-2052</a>] -         openejb-core PMD - EmptyIfStmt
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2053'>OPENEJB-2053</a>] -         openejb-core PMD - finalizers.xml and imports.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2054'>OPENEJB-2054</a>] -         openejb-core PMD - unusedcode.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2056'>OPENEJB-2056</a>] -         openejb-loader PMD
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2057'>OPENEJB-2057</a>] -         openejb-core checkstyle
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2060'>OPENEJB-2060</a>] -         openejb-core checkstyle [FinalClass]
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2061'>OPENEJB-2061</a>] -         openejb-core checkstyle [SimplifyBooleanExpression, SimplifyBooleanReturn]
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2062'>OPENEJB-2062</a>] -         openejb-core checkstyle [ArrayTypeStyle]
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2073'>OPENEJB-2073</a>] -         openejb-core PMD - LocalVariableCouldBeFinal
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2079'>OPENEJB-2079</a>] -         Use system property &#39;derby.system.home&#39; if supplied
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2084'>OPENEJB-2084</a>] -         Move Server Services to a dedicated &quot;Start&quot; event
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2088'>OPENEJB-2088</a>] -         Allow injection of (SOAP)Handlers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2089'>OPENEJB-2089</a>] -         Provide ApplicationComposer feature as a JUnit @Rule
-</li>
-</ul>
-    
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-63'>OPENEJB-63</a>] -         New Castor CMP Container
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-565'>OPENEJB-565</a>] -         Basic support for JAX-WS invocations
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-569'>OPENEJB-569</a>] -         @Resource WebServiceContext injection
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-924'>OPENEJB-924</a>] -         Adding APIs for new EJB 3.1 features
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1230'>OPENEJB-1230</a>] -         Webapp scanning include/exclude via context.xml settings
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1410'>OPENEJB-1410</a>] -         Dynamic data source (using more than one data source as one)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1525'>OPENEJB-1525</a>] -         bean validation for parameters and returned values
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1528'>OPENEJB-1528</a>] -         allowing the user to add default interceptors
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1958'>OPENEJB-1958</a>] -         Add compression to the ejbd protocol.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2048'>OPENEJB-2048</a>] -         Implement a simplified direct connection factory
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2082'>OPENEJB-2082</a>] -         Allow to call an observer after another one
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2090'>OPENEJB-2090</a>] -         provide junit rules for EJBContainer
-</li>
-</ul>
-                                
-<h2>        Task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-20'>OPENEJB-20</a>] -         org.openejb.util.Logger uses deprecated log4j.Category class
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-36'>OPENEJB-36</a>] -         Automated test of tomcat integration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-81'>OPENEJB-81</a>] -         ejb3 specs module
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-110'>OPENEJB-110</a>] -         JPA Spec - ClassTransformer missing method patch
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-111'>OPENEJB-111</a>] -         JPA - persistence.xml parser and skeleton provider
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-112'>OPENEJB-112</a>] -         Port HTTP server support from 2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-113'>OPENEJB-113</a>] -         Port CORBA server code from openejb 2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-114'>OPENEJB-114</a>] -         Port Axis server support from 2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-115'>OPENEJB-115</a>] -         Port/rewrite the XFire server support from 2 into 3
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-116'>OPENEJB-116</a>] -         Port EJB Containers from 2 into 3
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-122'>OPENEJB-122</a>] -         JCA Support via Jencks project
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-135'>OPENEJB-135</a>] -         Castor 1.0 upgrade
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-258'>OPENEJB-258</a>] -         Documentation about XBean and its use
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-264'>OPENEJB-264</a>] -         iTests broken - missing spring2.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-272'>OPENEJB-272</a>] -         Change packages to org.apache.openejb in openejb3 trunk
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-281'>OPENEJB-281</a>] -         Remove dependencies with groupId=geronimo from poms
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-282'>OPENEJB-282</a>] -         Both EJBHome and EJBLocalHome remove(Object primaryKey) methods should throw javax.ejb.RemoveException when used with Sessions beans
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-311'>OPENEJB-311</a>] -         Add ASL License Headers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-323'>OPENEJB-323</a>] -         Add ASL License and Notice
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-387'>OPENEJB-387</a>] -         Adding support for &quot;openejb.deployments.classpath.include&quot;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-448'>OPENEJB-448</a>] -         Move duplicate app checking into the assembler
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-449'>OPENEJB-449</a>] -         Non-finder based ServerService creation
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-524'>OPENEJB-524</a>] -         Geronimo 2.0 Integration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-585'>OPENEJB-585</a>] -         [GRADUATION] Yank the DISCLAIMER.txt that says we are incubating
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-586'>OPENEJB-586</a>] -         [GRADUATION] Drop &quot;incubating&quot; from version number
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-1054'>OPENEJB-1054</a>] -         Investigate App Client Main-Class handling
-</li>
-</ul>
-        
-<h2>        Test
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-450'>OPENEJB-450</a>] -         Potentially use xbean-naming
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-519'>OPENEJB-519</a>] -         Annotated test clients enablement
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-563'>OPENEJB-563</a>] -         Test Case for Jax-RPC
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-676'>OPENEJB-676</a>] -         [BUILD FAILURE : There are test failures] OpenejbJarTest and ConversionTest are failing when building the code.
-</li>
-</ul>
-        
-<h2>        Wish
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2077'>OPENEJB-2077</a>] -         Do not require openejb.json/openejb.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2092'>OPENEJB-2092</a>] -         Allow easy offsetting of all OpenEJB ports
-</li>
-</ul>
diff --git a/src/main/jbake/content/tomee-1.7.0.adoc b/src/main/jbake/content/tomee-1.7.0.adoc
new file mode 100644
index 0000000..5dd89ac
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.0.adoc
@@ -0,0 +1,73 @@
+= Apache TomEE 1.7.0 Released!
+:jbake-type: page
+:jbake-status: published
+
+Great news for Summer!
+After many months of hard work and dedicated community commitment Apache TomEE is happy to finally announce the feature release of http://tomee.apache.org/downloads.html[Apache TomEE 1.7.0], which is based on http://tomcat.apache.org/tomcat-7.0-doc/index.html[Apache Tomcat 7.0.55].
+Please do not forget that nearly all of the work that goes into this purely open source project is community driven.
+Very special thanks go out to all that have dedicated their time and effort to make this release possible.
+Anyone active on the http://tomee.apache.org/support.html[mailing lists and/or IRC] will know that an extra special thanks for http://rmannibucau.wordpress.com[Romain Manni-Bucau] for his lightning fast support is well deserved.
+
+The 1.7.0 feature release is the final Java SE 6 / Java SE 8 compatible Oracle Java EE 6 Web Profile Certified branch.
+
+So what is new?
+
+*** PLUME Profile (Mojarra and EclipseLink)
+
+One the most important new features has to be the new experimental PLUME profile, which is basically TomEE PLUS with https://javaserverfaces.java.net/[Mojarra] and http://www.eclipse.org/eclipselink/[EclipseLink] added support.
++ This makes the transition to TomEE from a Glassfish environment a lot less painful.
+So no more excuses, come and join us - We're all yours!
+
+*** Java SE 8 Runtime Support
+
+A lot of work has been completed to ensure that Apache TomEE 1.7.x will run within an http://www.oracle.com/technetwork/java/javase/downloads/index.html[Java SE 8 environment], yet remain backwards compatible with Java SE 6.
+Several libraries used have been shaded and patched to achieve this goal and provide users with a stable platform for the transition to a new runtime.
+
+*** Bug Fixes and Improvements
+
+In addition to PLUME and Java 8 support there have been a train, plane and truck load of tweaks, improvements and bug fixes to make this release one of the most stable and feature rich versions we have ever released.
+Just have a quick look at these lists to get an idea of how much has been achieved.
+Amazing!
+
+A total of https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&mode=hide&jqlQuery=project+%3D+TOMEE+AND+fixVersion+%3D+1.7.0[154 TomEE] issues have been addressed.
++ A total of https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&mode=hide&jqlQuery=project+%3D+OPENEJB+AND+fixVersion+%3D+4.7.0[237 OpenEJB] issues have been addressed (OK, to be fair, some of these were legacy JIRA's stuck in the cobweb)
+
+The Apache TomEE 1.7.0 release files can be downloaded from here:
+
+http://tomee.apache.org/downloads.html
+
+Or just update your existing Maven JavaEE-API, OpenEJB and or TomEE entries to point to the latest versions:
+
+....
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>javaee-api</artifactId>
+	<version>6.0-6</version>
+	<scope>provided</scope>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>openejb-core</artifactId>
+	<version>4.7.0</version>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>tomee</artifactId>
+	<version>1.7.0</version>
+</dependency>
+....
+
+A complete xref:tomee-1.7.0-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-1.7.0-release-notes.adoc[tomee-1.7.0-release-notes.html]
+
+So please feel free to jump in feet first and http://tomee.apache.org/documentation.html[get started with TomEE].
+You will nearly always find someone to help you on one of our http://tomee.apache.org/support.html[support channels].
+
+*** Java EE7 and Beyond
+
+From this point on the TomEE community will be focusing most of it's efforts on TomEE 2.0.x, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x.
+It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process.
+We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-1.7.0.md b/src/main/jbake/content/tomee-1.7.0.md
deleted file mode 100644
index 3dc8fc6..0000000
--- a/src/main/jbake/content/tomee-1.7.0.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Apache TomEE 1.7.0 Released!
-
-Great news for Summer! After many months of hard work and dedicated community commitment Apache TomEE is happy to finally announce the feature release of [Apache TomEE 1.7.0](http://tomee.apache.org/downloads.html), which is based on [Apache Tomcat 7.0.55](http://tomcat.apache.org/tomcat-7.0-doc/index.html). Please do not forget that nearly all of the work that goes into this purely open source project is community driven. Very special thanks go out to all that have dedicated their time and effort to make this release possible. Anyone active on the [mailing lists and/or IRC](http://tomee.apache.org/support.html) will know that an extra special thanks for [Romain Manni-Bucau](http://rmannibucau.wordpress.com) for his lightning fast support is well deserved.
-
-The 1.7.0 feature release is the final Java SE 6 / Java SE 8 compatible Oracle Java EE 6 Web Profile Certified branch. 
-
-So what is new?
-
-###PLUME Profile (Mojarra and EclipseLink)
-
-One the most important new features has to be the new experimental PLUME profile, which is basically TomEE PLUS with [Mojarra](https://javaserverfaces.java.net/) and [EclipseLink](http://www.eclipse.org/eclipselink/) added support.  
-This makes the transition to TomEE from a Glassfish environment a lot less painful. So no more excuses, come and join us - We're all yours!
-
-###Java SE 8 Runtime Support
-
-A lot of work has been completed to ensure that Apache TomEE 1.7.x will run within an [Java SE 8 environment](http://www.oracle.com/technetwork/java/javase/downloads/index.html), yet remain backwards compatible with Java SE 6.  Several libraries used have been shaded and patched to achieve this goal and provide users with a stable platform for the transition to a new runtime.
-
-###Bug Fixes and Improvements
-
-In addition to PLUME and Java 8 support there have been a train, plane and truck load of tweaks, improvements and bug fixes to make this release one of the most stable and feature rich versions we have ever released. Just have a quick look at these lists to get an idea of how much has been achieved. Amazing!
-
-A total of [154 TomEE](https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&mode=hide&jqlQuery=project+%3D+TOMEE+AND+fixVersion+%3D+1.7.0) issues have been addressed.  
-A total of [237 OpenEJB](https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&mode=hide&jqlQuery=project+%3D+OPENEJB+AND+fixVersion+%3D+4.7.0) issues have been addressed (OK, to be fair, some of these were legacy JIRA's stuck in the cobweb)  
-
-The Apache TomEE 1.7.0 release files can be downloaded from here:
-
-[http://tomee.apache.org/downloads.html](http://tomee.apache.org/downloads.html)
-
-Or just update your existing Maven JavaEE-API, OpenEJB and or TomEE entries to point to the latest versions:
-
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>javaee-api</artifactId>
-		<version>6.0-6</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>openejb-core</artifactId>
-		<version>4.7.0</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>tomee</artifactId>
-		<version>1.7.0</version>
-	</dependency>
-
-A complete [Changelog](tomee-1.7.0-release-notes.html) can be viewed here:
-
-[tomee-1.7.0-release-notes.html](tomee-1.7.0-release-notes.html)
-
-So please feel free to jump in feet first and [get started with TomEE](http://tomee.apache.org/documentation.html). You will nearly always find someone to help you on one of our [support channels](http://tomee.apache.org/support.html).
-
-###Java EE7 and Beyond
-
-From this point on the TomEE community will be focusing most of it's efforts on TomEE 2.0.x, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x. It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process. We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-1.7.1-release-notes.adoc b/src/main/jbake/content/tomee-1.7.1-release-notes.adoc
new file mode 100644
index 0000000..2b4c531
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.1-release-notes.adoc
@@ -0,0 +1,45 @@
+= Release Notes - TomEE - Version 1.7.1
+:jbake-type: page
+:jbake-status: published
+
+== Bug
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1296[TOMEE-1296]] - org.apache.openejb.jpa.integration.eclipselink.OpenEJBServerPlatform mbeanServer name is wrong
+* [https://issues.apache.org/jira/browse/TOMEE-1324[TOMEE-1324]] - Problem with TomEE Maven archetype
+* [https://issues.apache.org/jira/browse/TOMEE-1325[TOMEE-1325]] - Dynamic subclassing doesn&#39;t support interfaces (@Local)
+* [https://issues.apache.org/jira/browse/TOMEE-1329[TOMEE-1329]] - jars.txt doesn&#39;t support empty lines
+* [https://issues.apache.org/jira/browse/TOMEE-1330[TOMEE-1330]] - Support to include container urls in scanning
+* [https://issues.apache.org/jira/browse/TOMEE-1334[TOMEE-1334]] - cdi lazy realm throws NPE cause of init handling (too early)
+* [https://issues.apache.org/jira/browse/TOMEE-1335[TOMEE-1335]] - openejb.deployer.save-deployments broken on war
+* [https://issues.apache.org/jira/browse/TOMEE-1342[TOMEE-1342]] - OutputGeneratedDescriptors doesn&#39;t output complete ejb-jar.xml
+* [https://issues.apache.org/jira/browse/TOMEE-1343[TOMEE-1343]] - HSQL server shuts down saying no databases available
+
+== Dependency upgrade
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1326[TOMEE-1326]] - Upgrade to Mojarra 2.1.29
+
+== Improvement
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1339[TOMEE-1339]] - [JAXRS] try static resources first
+
+== New Feature
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1295[TOMEE-1295]] - openjpa.EntityManagerFactoryPool support for container persistence unit
+* [https://issues.apache.org/jira/browse/TOMEE-1297[TOMEE-1297]] - add @Jars annotation to ApplicationComposer
+* [https://issues.apache.org/jira/browse/TOMEE-1341[TOMEE-1341]] - Arquillian support for Suite testing
+
+== Test
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1338[TOMEE-1338]] - Create tests for DeployerEjb
+
+
+= Release Notes - OpenEJB - Version 4.7.1
+
+== Bug
+
+* [https://issues.apache.org/jira/browse/OPENEJB-2100[OPENEJB-2100]] - Context Classloader not restored in org.apache.openejb.client.EJBObjectHandler.createEJBObjectProxy
diff --git a/src/main/jbake/content/tomee-1.7.1-release-notes.md b/src/main/jbake/content/tomee-1.7.1-release-notes.md
deleted file mode 100644
index b5b6922..0000000
--- a/src/main/jbake/content/tomee-1.7.1-release-notes.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Release Notes - TomEE - Version 1.7.1
-                
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1296'>TOMEE-1296</a>] -         org.apache.openejb.jpa.integration.eclipselink.OpenEJBServerPlatform mbeanServer name is wrong
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1324'>TOMEE-1324</a>] -         Problem with TomEE Maven archetype
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1325'>TOMEE-1325</a>] -         Dynamic subclassing doesn&#39;t support interfaces (@Local)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1329'>TOMEE-1329</a>] -         jars.txt doesn&#39;t support empty lines
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1330'>TOMEE-1330</a>] -         Support to include container urls in scanning
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1334'>TOMEE-1334</a>] -         cdi lazy realm throws NPE cause of init handling (too early)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1335'>TOMEE-1335</a>] -         openejb.deployer.save-deployments broken on war
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1342'>TOMEE-1342</a>] -         OutputGeneratedDescriptors doesn&#39;t output complete ejb-jar.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1343'>TOMEE-1343</a>] -         HSQL server shuts down saying no databases available
-</li>
-</ul>
-    
-<h2>        Dependency upgrade
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1326'>TOMEE-1326</a>] -         Upgrade to Mojarra 2.1.29
-</li>
-</ul>
-            
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1339'>TOMEE-1339</a>] -         [JAXRS] try static resources first
-</li>
-</ul>
-    
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1295'>TOMEE-1295</a>] -         openjpa.EntityManagerFactoryPool support for container persistence unit
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1297'>TOMEE-1297</a>] -         add @Jars annotation to ApplicationComposer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1341'>TOMEE-1341</a>] -         Arquillian support for Suite testing
-</li>
-</ul>
-                                        
-<h2>        Test
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1338'>TOMEE-1338</a>] -         Create tests for DeployerEjb
-</li>
-</ul>
-        
-
-        Release Notes - OpenEJB - Version 4.7.1
-                
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENEJB-2100'>OPENEJB-2100</a>] -         Context Classloader not restored in org.apache.openejb.client.EJBObjectHandler.createEJBObjectProxy
-</li>
-</ul>
-                                                                    
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-1.7.1.adoc b/src/main/jbake/content/tomee-1.7.1.adoc
new file mode 100644
index 0000000..ce7ebb1
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.1.adoc
@@ -0,0 +1,65 @@
+= Apache TomEE 1.7.1 Released!
+:jbake-type: page
+:jbake-status: published
+
+After the huge buzz getting version 1.7.0 off the press it is time to get back to the day to day.
+As promised we are committed to providing the best for our community, and so without further a do here is TomEE 1.7.1 - This is a maintenance release that fixes some minor issues and a few tweaks (We understand it is not so minor if you are waiting for it, so thanks for your patience).
+This version is still shipped upon Apache Tomcat 7.0.55.
+
+Please note that the TomEE 1.7.1 drop in WAR file will not work on Apache Tomcat 8.
+If you are interested in a Tomcat 8.x version then please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+
+The Apache TomEE 1.7.1 release files can be downloaded from here:
+
+xref:download-ng.adoc[http://tomee.apache.org/downloads.html]
+
+*** Important Notes:
+
+Issue https://issues.apache.org/jira/browse/TOMEE-1339[TOMEE-1339] introduced a default (but configurable) check for a static _index.html_ file when an empty JAX-RS resource URL is specified by a client.
+You can use this file to return a descriptive response to the client for example.
+Make sure that this optional file does not contain sensitive information when made available.
+Currently it is not a JSP and it is not parsed in any way by the Servlet container - This may change in the next version.
+
+A new property *openejb.finder.module-scoped* was added that changed default behaviour.
+It is used to enable rare optional scanning outside of the current runtime scope.
+For example, if a bean is declared in one application that is extended in another application or test scope then you must now explicitly enable cross scope scanning by setting *openejb.finder.module-scoped=true*
+
+* In such cases failure to do this will invariably result in an *javax.naming.NameAlreadyBoundException*
+
+*** Update Maven POM Files
+
+Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
+
+....
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>javaee-api</artifactId>
+	<version>6.0-6</version>
+	<scope>provided</scope>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>openejb-core</artifactId>
+	<version>4.7.1</version>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>tomee</artifactId>
+	<version>1.7.1</version>
+</dependency>
+....
+
+A complete xref:tomee-1.7.1-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-1.7.1-release-notes.adoc[tomee-1.7.1-release-notes.html]
+
+Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE].
+You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
+
+*** Java EE7 and Beyond
+
+From this point on the TomEE community will be focusing most of it's efforts on TomEE 2.0.x, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x.
+It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process.
+We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-1.7.1.md b/src/main/jbake/content/tomee-1.7.1.md
deleted file mode 100644
index 75be427..0000000
--- a/src/main/jbake/content/tomee-1.7.1.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Apache TomEE 1.7.1 Released!
-
-After the huge buzz getting version 1.7.0 off the press it is time to get back to the day to day. As promised we are committed to providing the best for our community, and so without further a do here is TomEE 1.7.1 - This is a maintenance release that fixes some minor issues and a few tweaks (We understand it is not so minor if you are waiting for it, so thanks for your patience). This version is still shipped upon Apache Tomcat 7.0.55.
-
-Please note that the TomEE 1.7.1 drop in WAR file will not work on Apache Tomcat 8. If you are interested in a Tomcat 8.x version then please feel free to check out and [contribute to the developer branch](contribute.html) - We are always interested in any help from the community that we can get.
-
-The Apache TomEE 1.7.1 release files can be downloaded from here:
-
-[http://tomee.apache.org/downloads.html](downloads.html)
-
-###Important Notes: 
-
-Issue [TOMEE-1339](https://issues.apache.org/jira/browse/TOMEE-1339) introduced a default (but configurable) check for a static *index.html* file when an empty JAX-RS resource URL is specified by a client. You can use this file to return a descriptive response to the client for example. Make sure that this optional file does not contain sensitive information when made available. Currently it is not a JSP and it is not parsed in any way by the Servlet container - This may change in the next version.
-
-A new property **openejb.finder.module-scoped** was added that changed default behaviour. It is used to enable rare optional scanning outside of the current runtime scope. For example, if a bean is declared in one application that is extended in another application or test scope then you must now explicitly enable cross scope scanning by setting **openejb.finder.module-scoped=true**  
- - In such cases failure to do this will invariably result in an **javax.naming.NameAlreadyBoundException**
-
-###Update Maven POM Files
-
-Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
-
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>javaee-api</artifactId>
-		<version>6.0-6</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>openejb-core</artifactId>
-		<version>4.7.1</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>tomee</artifactId>
-		<version>1.7.1</version>
-	</dependency>
-
-A complete [Changelog](tomee-1.7.1-release-notes.html) can be viewed here:
-
-[tomee-1.7.1-release-notes.html](tomee-1.7.1-release-notes.html)
-
-Please feel free to jump in feet first and [get started with TomEE](documentation.html). You will nearly always find someone to help you on one of our [support channels](support.html).
-
-###Java EE7 and Beyond
-
-From this point on the TomEE community will be focusing most of it's efforts on TomEE 2.0.x, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x. It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process. We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-1.7.2-release-notes.adoc b/src/main/jbake/content/tomee-1.7.2-release-notes.adoc
new file mode 100644
index 0000000..04327ea
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.2-release-notes.adoc
@@ -0,0 +1,153 @@
+= Release Notes - TomEE - Version 1.7.2
+:jbake-type: page
+:jbake-status: published
+
+== Upgrades
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1426[TOMEE-1426] xbean 4.1
+* link:https://issues.apache.org/jira/browse/TOMEE-1554[TOMEE-1554] Upgrade OpenJPA to 2.4.0
+* link:https://issues.apache.org/jira/browse/TOMEE-1391[TOMEE-1391] Use maven-filtering:1.2 to fix MSHARED-319 when compiling under JDK8
+* link:https://issues.apache.org/jira/browse/TOMEE-1405[TOMEE-1405] tomcat 7.0.62
+* link:https://issues.apache.org/jira/browse/TOMEE-1370[TOMEE-1370] symbolic links not supported by tomee for @WebXXX
+* link:https://issues.apache.org/jira/browse/TOMEE-1536[TOMEE-1536] xbean 4.2
+* link:https://issues.apache.org/jira/browse/TOMEE-1469[TOMEE-1469] cxf 2.6.16
+* link:https://issues.apache.org/jira/browse/TOMEE-1368[TOMEE-1368] upgrade arquillian-transaction-impl-base to 1.0.1.Final
+* link:https://issues.apache.org/jira/browse/TOMEE-1363[TOMEE-1363] myfaces 2.1.16
+
+== New Features
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1552[TOMEE-1552] add openejb.activemq.deploymentId-as-clientId flag to not force AMQ clientId to ejb deploymentId
+* link:https://issues.apache.org/jira/browse/TOMEE-1444[TOMEE-1444] allow extensions through openejb extensions of cxf-rs
+* link:https://issues.apache.org/jira/browse/TOMEE-1440[TOMEE-1440] support singleDeploymentByArchiveName in tomee arquillian adapters (remote/embedded)
+* link:https://issues.apache.org/jira/browse/TOMEE-1526[TOMEE-1526] global (conf/system.properties) openejb.datasource.pool support
+* link:https://issues.apache.org/jira/browse/TOMEE-1421[TOMEE-1421] support persistence of javaagent config in tomee maven plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-1388[TOMEE-1388] add @JaxrsProviders to ApplicationComposers to add provider classes quickly on WebApp
+* link:https://issues.apache.org/jira/browse/TOMEE-1420[TOMEE-1420] tomee-maven-plugin customizers configuration to be able to call java code to customize an instance
+* link:https://issues.apache.org/jira/browse/TOMEE-1347[TOMEE-1347] allow to provide a default global properties provider for resources
+* link:https://issues.apache.org/jira/browse/TOMEE-1473[TOMEE-1473] @SimpleLog for ApplicationComposer
+* link:https://issues.apache.org/jira/browse/TOMEE-1472[TOMEE-1472] @RandomPort for applicationComposer
+* link:https://issues.apache.org/jira/browse/TOMEE-1479[TOMEE-1479] HttpRequestImpl login backed by security service by default
+* link:https://issues.apache.org/jira/browse/TOMEE-1487[TOMEE-1487] CDI Event based realm
+* link:https://issues.apache.org/jira/browse/TOMEE-1483[TOMEE-1483] support destinationLookup activation spec with activemq
+* link:https://issues.apache.org/jira/browse/TOMEE-1482[TOMEE-1482] add ability to log all CDI beans found (OWB scanner)
+* link:https://issues.apache.org/jira/browse/TOMEE-1446[TOMEE-1446] add event BeforeStartEjbs otherwise for timer beans it is surely too late if you want to modify it
+* link:https://issues.apache.org/jira/browse/TOMEE-1451[TOMEE-1451] notify through BusCreated event when cxf bus is created
+* link:https://issues.apache.org/jira/browse/TOMEE-1458[TOMEE-1458] provide cxf configuration support for @WebServiceRef
+* link:https://issues.apache.org/jira/browse/TOMEE-1346[TOMEE-1346] support ciphered values in resources
+* link:https://issues.apache.org/jira/browse/TOMEE-1345[TOMEE-1345] basic support of Tomcat embedded in tomee-embedded
+
+== Improvements
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1425[TOMEE-1425] better JMX naming for cxf jaxrs endpoint
+* link:https://issues.apache.org/jira/browse/TOMEE-1434[TOMEE-1434] wire roles/users to tomee embedded arquillian adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-1430[TOMEE-1430] add support for users/roles for tomee embedded
+* link:https://issues.apache.org/jira/browse/TOMEE-1392[TOMEE-1392] META-INF/org.apache.openejb.extension doesn't support multiple lines
+* link:https://issues.apache.org/jira/browse/TOMEE-1439[TOMEE-1439] @Context SecurityContext doesn't use SecurityService
+* link:https://issues.apache.org/jira/browse/TOMEE-1443[TOMEE-1443] support cxf.jaxws.wsFeatures
+* link:https://issues.apache.org/jira/browse/TOMEE-1529[TOMEE-1529] BaseEjbProxyHandler#equals is super slow when parameter is not a proxy
+* link:https://issues.apache.org/jira/browse/TOMEE-1411[TOMEE-1411] allow to create an application composer webapp using all inner classes of the test
+* link:https://issues.apache.org/jira/browse/TOMEE-1530[TOMEE-1530] (arquillian) OpenEJBEnricher: if app context is null try to find it from classloader
+* link:https://issues.apache.org/jira/browse/TOMEE-1374[TOMEE-1374] basic detection that container loader can't create a datasource and fallback on app one
+* link:https://issues.apache.org/jira/browse/TOMEE-1373[TOMEE-1373] AlternativeDriver leaks when used (by default) from applications (resources.xml)
+* link:https://issues.apache.org/jira/browse/TOMEE-1372[TOMEE-1372] when trying to find persistence unit datasources ensure to try exact name first without required property constraint
+* link:https://issues.apache.org/jira/browse/TOMEE-1371[TOMEE-1371] if using kahadb or leveldb or any persistence adapter force broker to be persistent
+* link:https://issues.apache.org/jira/browse/TOMEE-1418[TOMEE-1418] Add Classpath discovery in REST annotations with virtual class path
+* link:https://issues.apache.org/jira/browse/TOMEE-1387[TOMEE-1387] tomee embedded arquillian adapter doesn't delete temp folder as fast as it should/could
+* link:https://issues.apache.org/jira/browse/TOMEE-1386[TOMEE-1386] skip org.apache.wink.common.internal.
+@Provider when using CXF
+* link:https://issues.apache.org/jira/browse/TOMEE-1354[TOMEE-1354] Add 'openejb.deployer.binaries.use' automatically for arquillian test on remote machine
+* link:https://issues.apache.org/jira/browse/TOMEE-1489[TOMEE-1489] Allow ActiveMQ scheduler activation when using kahadb persistence
+* link:https://issues.apache.org/jira/browse/TOMEE-1367[TOMEE-1367] add singleDumpByArchiveName parameter to arquillian tomee adapters
+* link:https://issues.apache.org/jira/browse/TOMEE-1486[TOMEE-1486] add to jaxws events close to jaxrs ones for consistency (ServerCreated/Destroyed)
+* link:https://issues.apache.org/jira/browse/TOMEE-1567[TOMEE-1567] allow to override persistence-unit properties from application.properties (as we already support system props)
+* link:https://issues.apache.org/jira/browse/TOMEE-1454[TOMEE-1454] add openejb.force-unit-type property to workaround 8.2.1.5 of JPA 2.0 spec
+* link:https://issues.apache.org/jira/browse/TOMEE-1500[TOMEE-1500] MultiPulse bad URI event only fires once
+* link:https://issues.apache.org/jira/browse/TOMEE-1466[TOMEE-1466] Apply WS-Security config (cxf interceptor) when use @WebService with javax.xml.ws.Service
+* link:https://issues.apache.org/jira/browse/TOMEE-1463[TOMEE-1463] support WebServiceFeature for @WebServiceRef as well
+
+== Bugs
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1433[TOMEE-1433] Prevent error output on tomee:run+++<Enter>+++</li>
+* link:https://issues.apache.org/jira/browse/TOMEE-1553[TOMEE-1553] EJBContainerRunner broken with junit 4.12
+* link:https://issues.apache.org/jira/browse/TOMEE-1551[TOMEE-1551] URLClassLoaderFirst uses its own lock and not classloader one
+* link:https://issues.apache.org/jira/browse/TOMEE-1438[TOMEE-1438] cxf classloader doesn't delegate properly in equals/hashcode (lookup are broken in tomcat)
+* link:https://issues.apache.org/jira/browse/TOMEE-1435[TOMEE-1435] flushable datasources not destroyed
+* link:https://issues.apache.org/jira/browse/TOMEE-1566[TOMEE-1566] [tomee-maven-plugin] Allow for name customizations for .rar apps
+* link:https://issues.apache.org/jira/browse/TOMEE-1283[TOMEE-1283] old commons-lang3 dependency in lib folder
+* link:https://issues.apache.org/jira/browse/TOMEE-1409[TOMEE-1409] Invalid configuration in module openejb-junit
+* link:https://issues.apache.org/jira/browse/TOMEE-1408[TOMEE-1408] Incorrect assertions within the testcode
+* link:https://issues.apache.org/jira/browse/TOMEE-1528[TOMEE-1528] add LogSqlPackages and openejb.log.sql.packages
+* link:https://issues.apache.org/jira/browse/TOMEE-1407[TOMEE-1407] Invalid filtering configuration for assembly/openejb-standalone which causes a compile error
+* link:https://issues.apache.org/jira/browse/TOMEE-1406[TOMEE-1406] Compile error in openejb-core due to an encoding issue
+* link:https://issues.apache.org/jira/browse/TOMEE-1379[TOMEE-1379] TransactionSynchronizationRegistry not found in JNDI for EJB Timer started transactions
+* link:https://issues.apache.org/jira/browse/TOMEE-1499[TOMEE-1499] connector modules are not destroyed properly
+* link:https://issues.apache.org/jira/browse/TOMEE-1497[TOMEE-1497] NPE When deploy genericjmsra.rar
+* link:https://issues.apache.org/jira/browse/TOMEE-1495[TOMEE-1495] TomEE won't load Taglibs from WEB-INF/lib/
+* link:https://issues.apache.org/jira/browse/TOMEE-1491[TOMEE-1491] add a LazyValve
+* link:https://issues.apache.org/jira/browse/TOMEE-1490[TOMEE-1490] Arquillian Test and Local context.xml file not loading correctly
+* link:https://issues.apache.org/jira/browse/TOMEE-1538[TOMEE-1538] ProvisioningUtil#fallback has replace String in wrong location, causing invalid path on Win platforms
+* link:https://issues.apache.org/jira/browse/TOMEE-1535[TOMEE-1535] JAX-RS Subresource paths are chosen incorrectly
+* link:https://issues.apache.org/jira/browse/TOMEE-1414[TOMEE-1414] @Jars works only with a single jar and not all matching jars
+* link:https://issues.apache.org/jira/browse/TOMEE-1534[TOMEE-1534] in JAXRS ExceptionException are not always unwrapped
+* link:https://issues.apache.org/jira/browse/TOMEE-1423[TOMEE-1423] Packaging contains duplicate artifacts with snapshot timestamp
+* link:https://issues.apache.org/jira/browse/TOMEE-1389[TOMEE-1389] ApplicationComposer should try all possible BeanManager for injections
+* link:https://issues.apache.org/jira/browse/TOMEE-1540[TOMEE-1540] tomee.sh doesn't support missing JAVA_HOME var
+* link:https://issues.apache.org/jira/browse/TOMEE-1265[TOMEE-1265] Can not start tomee when using conf/catalina.policy
+* link:https://issues.apache.org/jira/browse/TOMEE-1385[TOMEE-1385] in embedded mode with embedded JUL logger allow to change consoleHandlerClazz
+* link:https://issues.apache.org/jira/browse/TOMEE-1384[TOMEE-1384] tolerate serialization of undeployed EJB
+* link:https://issues.apache.org/jira/browse/TOMEE-1382[TOMEE-1382] allow to override LoaderService of openwebbeans by app in application.properties
+* link:https://issues.apache.org/jira/browse/TOMEE-1381[TOMEE-1381] wrong property passed as ValidatorFactory to JPA
+* link:https://issues.apache.org/jira/browse/TOMEE-1509[TOMEE-1509] PropertyPlaceHolderHelper does not work with cipher:
+* link:https://issues.apache.org/jira/browse/TOMEE-1507[TOMEE-1507] openejb-rest leaks deployed apps
+* link:https://issues.apache.org/jira/browse/TOMEE-1505[TOMEE-1505] shutdown cxf bus when exiting services (rs/ws)
+* link:https://issues.apache.org/jira/browse/TOMEE-1504[TOMEE-1504] undeploy doesn't always clean up correctly Deployments
+* link:https://issues.apache.org/jira/browse/TOMEE-1348[TOMEE-1348] [JAXRS] ensure static resources are handled through servlet chain (jsp case for instance)
+* link:https://issues.apache.org/jira/browse/TOMEE-1468[TOMEE-1468] ApplicationComposer + CDI for a WebApp breaks startup
+* link:https://issues.apache.org/jira/browse/TOMEE-1357[TOMEE-1357] tomee forces new StandardManager()
+* link:https://issues.apache.org/jira/browse/TOMEE-1477[TOMEE-1477] TomEE wont start if added maven-properties to+++<args>+++</li>
+* link:https://issues.apache.org/jira/browse/TOMEE-1353[TOMEE-1353] [regression] jsonproviuder no more added
+* link:https://issues.apache.org/jira/browse/TOMEE-1352[TOMEE-1352] can't start if there is a space in tomee folder path
+* link:https://issues.apache.org/jira/browse/TOMEE-1351[TOMEE-1351] jaxws doesn't support ROOT context
+* link:https://issues.apache.org/jira/browse/TOMEE-1350[TOMEE-1350] arquillian class discovering algorithm should ignore test classes which can't be EJBs
+* link:https://issues.apache.org/jira/browse/TOMEE-1071[TOMEE-1071] NoClassDefFoundError - SVGDocument
+* link:https://issues.apache.org/jira/browse/TOMEE-1519[TOMEE-1519] SetupCommand fails to delete file/dir on Windows
+* link:https://issues.apache.org/jira/browse/TOMEE-1513[TOMEE-1513] catalina.sh does not quote javaagent argument correctly
+* link:https://issues.apache.org/jira/browse/TOMEE-1359[TOMEE-1359] TomEEInjectionEnricher does not always return correct AppContext
+* link:https://issues.apache.org/jira/browse/TOMEE-1358[TOMEE-1358] openejb.additional.include not respected
+* link:https://issues.apache.org/jira/browse/TOMEE-1521[TOMEE-1521] Duplicate App Deployment when autoDeploy="true"
+* link:https://issues.apache.org/jira/browse/TOMEE-1400[TOMEE-1400] Potential NPE in TomeeAnnotationProvider
+* link:https://issues.apache.org/jira/browse/TOMEE-1520[TOMEE-1520] A service as a singleton is not working
+* link:https://issues.apache.org/jira/browse/TOMEE-1366[TOMEE-1366] UnsupportedOperationException in CxfEndpoint.doServiceCreate
+* link:https://issues.apache.org/jira/browse/TOMEE-1364[TOMEE-1364] When using the tomee-maven-plugins stop goal tomee seems to hang forever
+* link:https://issues.apache.org/jira/browse/TOMEE-1362[TOMEE-1362] WsRsTest is not correct
+* link:https://issues.apache.org/jira/browse/TOMEE-1481[TOMEE-1481] web-fragment.xml FacesServlet declaration not supported
+* link:https://issues.apache.org/jira/browse/TOMEE-1480[TOMEE-1480] make possibility to provide conf.d-files for arquillian-tomee-remote adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-1449[TOMEE-1449] allow to deploy twice (several hosts) the same app
+* link:https://issues.apache.org/jira/browse/TOMEE-1569[TOMEE-1569] openejb Logger (util package) should use container loader to create JUL loggers
+* link:https://issues.apache.org/jira/browse/TOMEE-1448[TOMEE-1448] container CDI classes shouldn't be filtered from CDI context
+* link:https://issues.apache.org/jira/browse/TOMEE-1568[TOMEE-1568] support overriding of a failed deployment in tomcat webappdeployer
+* link:https://issues.apache.org/jira/browse/TOMEE-1333[TOMEE-1333] NPE in releasing deployed artifacts with ArquillianSuiteExtension
+* link:https://issues.apache.org/jira/browse/TOMEE-1452[TOMEE-1452] reloading doesn't work with jaxws services for ears
+* link:https://issues.apache.org/jira/browse/TOMEE-1450[TOMEE-1450] Unable to shutdown with whitespace in path because of javaagent error
+* link:https://issues.apache.org/jira/browse/TOMEE-1570[TOMEE-1570] OpenEJBLogRecord misses logger name
+* link:https://issues.apache.org/jira/browse/TOMEE-1457[TOMEE-1457] OpenEJBLoginValidator shouldn't associate if in tomee
+* link:https://issues.apache.org/jira/browse/TOMEE-1467[TOMEE-1467] embedded http layer doesn't support repeated query parameters
+* link:https://issues.apache.org/jira/browse/TOMEE-1344[TOMEE-1344] URLClassLoader are not closed during scanning and with app undeployment
+* link:https://issues.apache.org/jira/browse/TOMEE-1583[TOMEE-1583] ProvisioningUtil fails to check for alternate repository location
+* link:https://issues.apache.org/jira/browse/TOMEE-1462[TOMEE-1462] ApplicationComposer hides assert errors
+* link:https://issues.apache.org/jira/browse/TOMEE-1460[TOMEE-1460] deploying cxf webservice in host other than localhost
+* link:https://issues.apache.org/jira/browse/TOMEE-1580[TOMEE-1580] Datasource JNDI Name Context not available to eclipselink non jta data source
+* link:https://issues.apache.org/jira/browse/OPENEJB-2106[OPENEJB-2106] Invalid schema location in test xml
+* link:https://issues.apache.org/jira/browse/OPENEJB-2112[OPENEJB-2112] 'Tweaks' to a (native) query are lost when running without a tx
+* link:https://issues.apache.org/jira/browse/OPENEJB-2111[OPENEJB-2111] Unchecked application exceptions, thrown in asynchronous business methods, are always wrapped in EJBException
+* link:https://issues.apache.org/jira/browse/OPENEJB-2109[OPENEJB-2109] Call to ThreadContext.enter and ThreadContext.exit is uneven in EjbObjectProxyHandler.businessMethod </ul>
+
+== Tasks & Sub-Tasks
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1410[TOMEE-1410] Cleanup poms to update the filtering of EXE files.
+* link:https://issues.apache.org/jira/browse/TOMEE-1356[TOMEE-1356] tomcat resources are not always well created and can return a Context instead of the real instance+++</args>++++++</Enter>+++
diff --git a/src/main/jbake/content/tomee-1.7.2-release-notes.md b/src/main/jbake/content/tomee-1.7.2-release-notes.md
deleted file mode 100644
index e945aff..0000000
--- a/src/main/jbake/content/tomee-1.7.2-release-notes.md
+++ /dev/null
@@ -1,162 +0,0 @@
-# Release Notes - TomEE - Version 1.7.2
-                
-<h2>Upgrades</h2>
-
-<ul>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1426">TOMEE-1426</a> xbean 4.1</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1554">TOMEE-1554</a> Upgrade OpenJPA to 2.4.0</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1391">TOMEE-1391</a> Use maven-filtering:1.2 to fix MSHARED-319 when compiling under JDK8</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1405">TOMEE-1405</a> tomcat 7.0.62</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1370">TOMEE-1370</a> symbolic links not supported by tomee for @WebXXX</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1536">TOMEE-1536</a> xbean 4.2</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1469">TOMEE-1469</a> cxf 2.6.16</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1368">TOMEE-1368</a> upgrade arquillian-transaction-impl-base to 1.0.1.Final</li>
-    <li><a href="https://issues.apache.org/jira/browse/TOMEE-1363">TOMEE-1363</a> myfaces 2.1.16</li>
-</ul>
-
-<h2>New Features</h2>
-
-<ul>
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1552">TOMEE-1552</a> add openejb.activemq.deploymentId-as-clientId flag to not force AMQ clientId to ejb deploymentId</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1444">TOMEE-1444</a> allow extensions through openejb extensions of cxf-rs</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1440">TOMEE-1440</a> support singleDeploymentByArchiveName in tomee arquillian adapters (remote/embedded)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1526">TOMEE-1526</a> global (conf/system.properties) openejb.datasource.pool support</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1421">TOMEE-1421</a> support persistence of javaagent config in tomee maven plugin</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1388">TOMEE-1388</a> add @JaxrsProviders to ApplicationComposers to add provider classes quickly on WebApp</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1420">TOMEE-1420</a> tomee-maven-plugin customizers configuration to be able to call java code to customize an instance</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1347">TOMEE-1347</a> allow to provide a default global properties provider for resources</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1473">TOMEE-1473</a> @SimpleLog for ApplicationComposer</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1472">TOMEE-1472</a> @RandomPort for applicationComposer</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1479">TOMEE-1479</a> HttpRequestImpl login backed by security service by default</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1487">TOMEE-1487</a> CDI Event based realm</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1483">TOMEE-1483</a> support destinationLookup activation spec with activemq</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1482">TOMEE-1482</a> add ability to log all CDI beans found (OWB scanner)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1446">TOMEE-1446</a> add event BeforeStartEjbs otherwise for timer beans it is surely too late if you want to modify it</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1451">TOMEE-1451</a> notify through BusCreated event when cxf bus is created</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1458">TOMEE-1458</a> provide cxf configuration support for @WebServiceRef</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1346">TOMEE-1346</a> support ciphered values in resources</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1345">TOMEE-1345</a> basic support of Tomcat embedded in tomee-embedded</li>
-</ul>
-
-<h2>Improvements</h2>
-
-<ul>
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1425">TOMEE-1425</a> better JMX naming for cxf jaxrs endpoint</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1434">TOMEE-1434</a> wire roles/users to tomee embedded arquillian adapter</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1430">TOMEE-1430</a> add support for users/roles for tomee embedded</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1392">TOMEE-1392</a> META-INF/org.apache.openejb.extension doesn't support multiple lines</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1439">TOMEE-1439</a> @Context SecurityContext doesn't use SecurityService</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1443">TOMEE-1443</a> support cxf.jaxws.wsFeatures</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1529">TOMEE-1529</a> BaseEjbProxyHandler#equals is super slow when parameter is not a proxy</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1411">TOMEE-1411</a> allow to create an application composer webapp using all inner classes of the test</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1530">TOMEE-1530</a> (arquillian) OpenEJBEnricher: if app context is null try to find it from classloader</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1374">TOMEE-1374</a> basic detection that container loader can't create a datasource and fallback on app one</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1373">TOMEE-1373</a> AlternativeDriver leaks when used (by default) from applications (resources.xml)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1372">TOMEE-1372</a> when trying to find persistence unit datasources ensure to try exact name first without required property constraint</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1371">TOMEE-1371</a> if using kahadb or leveldb or any persistence adapter force broker to be persistent</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1418">TOMEE-1418</a> Add Classpath discovery in REST annotations with virtual class path</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1387">TOMEE-1387</a> tomee embedded arquillian adapter doesn't delete temp folder as fast as it should/could</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1386">TOMEE-1386</a> skip org.apache.wink.common.internal. @Provider when using CXF</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1354">TOMEE-1354</a> Add 'openejb.deployer.binaries.use' automatically for arquillian test on remote machine</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1489">TOMEE-1489</a> Allow ActiveMQ scheduler activation when using kahadb persistence</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1367">TOMEE-1367</a> add singleDumpByArchiveName parameter to arquillian tomee adapters</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1486">TOMEE-1486</a> add to jaxws events close to jaxrs ones for consistency (ServerCreated/Destroyed)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1567">TOMEE-1567</a> allow to override persistence-unit properties from application.properties (as we already support system props)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1454">TOMEE-1454</a> add openejb.force-unit-type property to workaround 8.2.1.5 of JPA 2.0 spec</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1500">TOMEE-1500</a> MultiPulse bad URI event only fires once</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1466">TOMEE-1466</a> Apply WS-Security config (cxf interceptor) when use @WebService with javax.xml.ws.Service</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1463">TOMEE-1463</a> support WebServiceFeature for @WebServiceRef as well</li>
-</ul>
-
-<h2>Bugs</h2>
-
-<ul>
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1433">TOMEE-1433</a> Prevent error output on tomee:run<Enter></li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1553">TOMEE-1553</a> EJBContainerRunner broken with junit 4.12</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1551">TOMEE-1551</a> URLClassLoaderFirst uses its own lock and not classloader one</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1438">TOMEE-1438</a> cxf classloader doesn't delegate properly in equals/hashcode (lookup are broken in tomcat)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1435">TOMEE-1435</a> flushable datasources not destroyed</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1566">TOMEE-1566</a> [tomee-maven-plugin] Allow for name customizations for .rar apps</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1283">TOMEE-1283</a> old commons-lang3 dependency in lib folder</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1409">TOMEE-1409</a> Invalid configuration in module openejb-junit</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1408">TOMEE-1408</a> Incorrect assertions within the testcode</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1528">TOMEE-1528</a> add LogSqlPackages and openejb.log.sql.packages</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1407">TOMEE-1407</a> Invalid filtering configuration for assembly/openejb-standalone which causes a compile error</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1406">TOMEE-1406</a> Compile error in openejb-core due to an encoding issue</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1379">TOMEE-1379</a> TransactionSynchronizationRegistry not found in JNDI for EJB Timer started transactions</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1499">TOMEE-1499</a> connector modules are not destroyed properly</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1497">TOMEE-1497</a> NPE When deploy genericjmsra.rar </li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1495">TOMEE-1495</a> TomEE won't load Taglibs from WEB-INF/lib/</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1491">TOMEE-1491</a> add a LazyValve</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1490">TOMEE-1490</a> Arquillian Test and Local context.xml file not loading correctly</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1538">TOMEE-1538</a> ProvisioningUtil#fallback has replace String in wrong location, causing invalid path on Win platforms</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1535">TOMEE-1535</a> JAX-RS Subresource paths are chosen incorrectly</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1414">TOMEE-1414</a> @Jars works only with a single jar and not all matching jars</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1534">TOMEE-1534</a> in JAXRS ExceptionException are not always unwrapped</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1423">TOMEE-1423</a> Packaging contains duplicate artifacts with snapshot timestamp</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1389">TOMEE-1389</a> ApplicationComposer should try all possible BeanManager for injections</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1540">TOMEE-1540</a> tomee.sh doesn't support missing JAVA_HOME var</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1265">TOMEE-1265</a> Can not start tomee when using conf/catalina.policy</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1385">TOMEE-1385</a> in embedded mode with embedded JUL logger allow to change consoleHandlerClazz</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1384">TOMEE-1384</a> tolerate serialization of undeployed EJB</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1382">TOMEE-1382</a> allow to override LoaderService of openwebbeans by app in application.properties</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1381">TOMEE-1381</a> wrong property passed as ValidatorFactory to JPA</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1509">TOMEE-1509</a> PropertyPlaceHolderHelper does not work with cipher:</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1507">TOMEE-1507</a> openejb-rest leaks deployed apps</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1505">TOMEE-1505</a> shutdown cxf bus when exiting services (rs/ws)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1504">TOMEE-1504</a> undeploy doesn't always clean up correctly Deployments</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1348">TOMEE-1348</a> [JAXRS] ensure static resources are handled through servlet chain (jsp case for instance)</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1468">TOMEE-1468</a> ApplicationComposer + CDI for a WebApp breaks startup</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1357">TOMEE-1357</a> tomee forces new StandardManager()</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1477">TOMEE-1477</a> TomEE wont start if added maven-properties to <args></li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1353">TOMEE-1353</a> [regression] jsonproviuder no more added </li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1352">TOMEE-1352</a> can't start if there is a space in tomee folder path</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1351">TOMEE-1351</a> jaxws doesn't support ROOT context</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1350">TOMEE-1350</a> arquillian class discovering algorithm should ignore test classes which can't be EJBs</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1071">TOMEE-1071</a> NoClassDefFoundError - SVGDocument</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1519">TOMEE-1519</a> SetupCommand fails to delete file/dir on Windows</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1513">TOMEE-1513</a> catalina.sh does not quote javaagent argument correctly</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1359">TOMEE-1359</a> TomEEInjectionEnricher does not always return correct AppContext</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1358">TOMEE-1358</a> openejb.additional.include not respected</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1521">TOMEE-1521</a> Duplicate App Deployment when autoDeploy="true"</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1400">TOMEE-1400</a> Potential NPE in TomeeAnnotationProvider</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1520">TOMEE-1520</a> A service as a singleton is not working</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1366">TOMEE-1366</a> UnsupportedOperationException in CxfEndpoint.doServiceCreate</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1364">TOMEE-1364</a> When using the tomee-maven-plugins stop goal tomee seems to hang forever</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1362">TOMEE-1362</a> WsRsTest is not correct</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1481">TOMEE-1481</a> web-fragment.xml FacesServlet declaration not supported</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1480">TOMEE-1480</a> make possibility to provide conf.d-files for arquillian-tomee-remote adapter</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1449">TOMEE-1449</a> allow to deploy twice (several hosts) the same app</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1569">TOMEE-1569</a> openejb Logger (util package) should use container loader to create JUL loggers</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1448">TOMEE-1448</a> container CDI classes shouldn't be filtered from CDI context</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1568">TOMEE-1568</a> support overriding of a failed deployment in tomcat webappdeployer</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1333">TOMEE-1333</a> NPE in releasing deployed artifacts with ArquillianSuiteExtension</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1452">TOMEE-1452</a> reloading doesn't work with jaxws services for ears</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1450">TOMEE-1450</a> Unable to shutdown with whitespace in path because of javaagent error</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1570">TOMEE-1570</a> OpenEJBLogRecord misses logger name</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1457">TOMEE-1457</a> OpenEJBLoginValidator shouldn't associate if in tomee</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1467">TOMEE-1467</a> embedded http layer doesn't support repeated query parameters</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1344">TOMEE-1344</a> URLClassLoader are not closed during scanning and with app undeployment</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1583">TOMEE-1583</a> ProvisioningUtil fails to check for alternate repository location</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1462">TOMEE-1462</a> ApplicationComposer hides assert errors</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1460">TOMEE-1460</a> deploying cxf webservice in host other than localhost</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1580">TOMEE-1580</a> Datasource JNDI Name Context not available to eclipselink non jta data source</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-2106">OPENEJB-2106</a> Invalid schema location in test xml</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-2112">OPENEJB-2112</a> 'Tweaks' to a (native) query are lost when running without a tx</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-2111">OPENEJB-2111</a> Unchecked application exceptions, thrown in asynchronous business methods, are always wrapped in EJBException</li>
-<li><a href="https://issues.apache.org/jira/browse/OPENEJB-2109">OPENEJB-2109</a> Call to ThreadContext.enter and ThreadContext.exit is uneven in EjbObjectProxyHandler.businessMethod</li>
-</ul>
-
-<h2>Tasks & Sub-Tasks</h2>
-
-<ul>
-
-
-
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1410">TOMEE-1410</a> Cleanup poms to update the filtering of EXE files.</li>
-<li><a href="https://issues.apache.org/jira/browse/TOMEE-1356">TOMEE-1356</a> tomcat resources are not always well created and can return a Context instead of the real instance</li>
-
-</ul>
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-1.7.2.adoc b/src/main/jbake/content/tomee-1.7.2.adoc
new file mode 100644
index 0000000..b3f381a
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.2.adoc
@@ -0,0 +1,50 @@
+= Apache TomEE 1.7.2 Released!
+:jbake-type: page
+:jbake-status: published
+
+The Apache TomEE community is delighted to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.7.2], which is based on http://tomcat.apache.org/tomcat-7.0-doc/index.html[Apache Tomcat 7.0.61], including numerous fixes and updates.
+
+Please note that the TomEE 1.7.2 drop in WAR file will not work on Apache Tomcat 8.
+If you are interested in a Tomcat 8.x version then please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+
+The Apache TomEE 1.7.2 release files can be downloaded from here:
+
+xref:download-ng.adoc[http://tomee.apache.org/downloads.html]
+
+*** Update Maven POM Files
+
+Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
+
+....
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>javaee-api</artifactId>
+	<version>6.0-6</version>
+	<scope>provided</scope>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>openejb-core</artifactId>
+	<version>4.7.2</version>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>tomee</artifactId>
+	<version>1.7.2</version>
+</dependency>
+....
+
+A complete xref:tomee-1.7.2-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-1.7.2-release-notes.adoc[tomee-1.7.2-release-notes.html]
+
+Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE].
+You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
+
+*** Java EE7 and Beyond
+
+From this point on the TomEE community will be focusing most of it's efforts on TomEE 2.0.x, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x.
+It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process.
+We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-1.7.2.md b/src/main/jbake/content/tomee-1.7.2.md
deleted file mode 100644
index 56bc052..0000000
--- a/src/main/jbake/content/tomee-1.7.2.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Apache TomEE 1.7.2 Released!
-
-The Apache TomEE community is delighted to announce the release of [Apache TomEE 1.7.2](http://tomee.apache.org/downloads.html), which is based on [Apache Tomcat 7.0.61](http://tomcat.apache.org/tomcat-7.0-doc/index.html), including numerous fixes and updates.
-
-Please note that the TomEE 1.7.2 drop in WAR file will not work on Apache Tomcat 8. If you are interested in a Tomcat 8.x version then please feel free to check out and [contribute to the developer branch](contribute.html) - We are always interested in any help from the community that we can get.
-
-The Apache TomEE 1.7.2 release files can be downloaded from here:
-
-[http://tomee.apache.org/downloads.html](downloads.html)
-
-###Update Maven POM Files
-
-Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
-
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>javaee-api</artifactId>
-		<version>6.0-6</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>openejb-core</artifactId>
-		<version>4.7.2</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>tomee</artifactId>
-		<version>1.7.2</version>
-	</dependency>
-
-A complete [Changelog](tomee-1.7.2-release-notes.html) can be viewed here:
-
-[tomee-1.7.2-release-notes.html](tomee-1.7.2-release-notes.html)
-
-Please feel free to jump in feet first and [get started with TomEE](documentation.html). You will nearly always find someone to help you on one of our [support channels](support.html).
-
-###Java EE7 and Beyond
-
-From this point on the TomEE community will be focusing most of it's efforts on TomEE 2.0.x, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x. It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process. We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-1.7.3-release-notes.adoc b/src/main/jbake/content/tomee-1.7.3-release-notes.adoc
new file mode 100644
index 0000000..6f6ce06
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.3-release-notes.adoc
@@ -0,0 +1,50 @@
+= Release Notes - TomEE - Version 1.7.3
+:jbake-type: page
+:jbake-status: published
+
+== Bug
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1465[TOMEE-1465]] - org.apache.openejb.util.PropertyPlaceHolderHelper.PropertiesLookup caches properties
+* [https://issues.apache.org/jira/browse/TOMEE-1585[TOMEE-1585]] - org.apache.openejb.core.ivm.BaseEjbProxyHandler.ProxyRegistry#liveHandleRegistry not thread safe
+* [https://issues.apache.org/jira/browse/TOMEE-1587[TOMEE-1587]] - merge arquillian tomee ear support from 7.x to 1.7.x
+* [https://issues.apache.org/jira/browse/TOMEE-1590[TOMEE-1590]] - WsFactory: ClassCastException: java.util.HashSet cannot be cast to java.util.List
+* [https://issues.apache.org/jira/browse/TOMEE-1596[TOMEE-1596]] - AutoDeployer buggy is not using hot deploy
+* [https://issues.apache.org/jira/browse/TOMEE-1610[TOMEE-1610]] - [OSGi] Version range problem in openejb-core on bean-asm5
+* [https://issues.apache.org/jira/browse/TOMEE-1614[TOMEE-1614]] - Netbeans Tomcat Plugin Integration Does Not Detected TomeeStarted
+* [https://issues.apache.org/jira/browse/TOMEE-1622[TOMEE-1622]] - TomEE SystemInstance unsafely iterates over the System.getProperties()
+* [https://issues.apache.org/jira/browse/TOMEE-1631[TOMEE-1631]] - Basic Rotating JUL Handler
+* [https://issues.apache.org/jira/browse/TOMEE-1636[TOMEE-1636]] - BrokerXmlConfig xbean:file: does not accept a relative path
+* [https://issues.apache.org/jira/browse/TOMEE-1638[TOMEE-1638]] - tomee:exec on Windows produces invalid tomee.zip due to backslash directory separators
+* [https://issues.apache.org/jira/browse/TOMEE-1655[TOMEE-1655]] - ApplicationComposers not isolating @Configuration for each test class.
+
+== Dependency upgrade
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1611[TOMEE-1611]] - Tomcat 7.0.63
+* [https://issues.apache.org/jira/browse/TOMEE-1678[TOMEE-1678]] - Tomcat 7.0.65
+* [https://issues.apache.org/jira/browse/TOMEE-1633[TOMEE-1633]] - upgrade javamail to 1.9.0-alpha-2
+* [https://issues.apache.org/jira/browse/TOMEE-1673[TOMEE-1673]] - Upgrade commons-collections to 3.2.2
+
+== Improvement
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1428[TOMEE-1428]] - improve the performance of TempClassLoader$ResourceComparator
+* [https://issues.apache.org/jira/browse/TOMEE-1455[TOMEE-1455]] - for resource local pu try to guess if datasource is configured in persistence unit properties
+* [https://issues.apache.org/jira/browse/TOMEE-1461[TOMEE-1461]] - Need a machine global mechanism for &#39;get next available port&#39;
+to prevent &#39;address in use&#39;
+issues
+* [https://issues.apache.org/jira/browse/TOMEE-1547[TOMEE-1547]] - Use application classloader for resources defined in resources.xml
+* [https://issues.apache.org/jira/browse/TOMEE-1557[TOMEE-1557]] - Support AMQ plugin config on amq5factory
+* [https://issues.apache.org/jira/browse/TOMEE-1642[TOMEE-1642]] - Would be nice that tomee logs JAXRS configuration in use (was: sends an INFO when not found the relative class for pojo-deployment in configuration [openejb-jar.xml])
+* [https://issues.apache.org/jira/browse/TOMEE-1662[TOMEE-1662]] - Ensure dangling JMS connections are closed on shutdown
+
+== New Feature
+
+[.compact]
+* [https://issues.apache.org/jira/browse/TOMEE-1442[TOMEE-1442]] - Show list of deployed applications (including EARs) in the console
+* [https://issues.apache.org/jira/browse/TOMEE-1456[TOMEE-1456]] - Support endorsed libs in the TomEE Maven Plugin
+
+== Test
+
+* [https://issues.apache.org/jira/browse/TOMEE-1412[TOMEE-1412]] - Extra unversioned context displayed when using parallel deployment
diff --git a/src/main/jbake/content/tomee-1.7.3-release-notes.md b/src/main/jbake/content/tomee-1.7.3-release-notes.md
deleted file mode 100644
index db1f82d..0000000
--- a/src/main/jbake/content/tomee-1.7.3-release-notes.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Release Notes - TomEE - Version 1.7.3
-                
-
-        Release Notes - TomEE - Version 1.7.3
-                                
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1465'>TOMEE-1465</a>] -         org.apache.openejb.util.PropertyPlaceHolderHelper.PropertiesLookup caches properties
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1585'>TOMEE-1585</a>] -         org.apache.openejb.core.ivm.BaseEjbProxyHandler.ProxyRegistry#liveHandleRegistry not thread safe
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1587'>TOMEE-1587</a>] -         merge arquillian tomee ear support from 7.x to 1.7.x
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1590'>TOMEE-1590</a>] -         WsFactory: ClassCastException: java.util.HashSet cannot be cast to java.util.List
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1596'>TOMEE-1596</a>] -         AutoDeployer buggy is not using hot deploy
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1610'>TOMEE-1610</a>] -         [OSGi] Version range problem in openejb-core on bean-asm5
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1614'>TOMEE-1614</a>] -         Netbeans Tomcat Plugin Integration Does Not Detected TomeeStarted
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1622'>TOMEE-1622</a>] -         TomEE SystemInstance unsafely iterates over the System.getProperties()
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1631'>TOMEE-1631</a>] -         Basic Rotating JUL Handler
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1636'>TOMEE-1636</a>] -         BrokerXmlConfig xbean:file: does not accept a relative path
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1638'>TOMEE-1638</a>] -         tomee:exec on Windows produces invalid tomee.zip due to backslash directory separators
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1655'>TOMEE-1655</a>] -         ApplicationComposers not isolating @Configuration for each test class.
-</li>
-</ul>
-    
-<h2>        Dependency upgrade
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1611'>TOMEE-1611</a>] -         Tomcat 7.0.63
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1678'>TOMEE-1678</a>] -         Tomcat 7.0.65
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1633'>TOMEE-1633</a>] -         upgrade javamail to 1.9.0-alpha-2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1673'>TOMEE-1673</a>] -         Upgrade commons-collections to 3.2.2
-</li>
-</ul>
-                    
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1428'>TOMEE-1428</a>] -         improve the performance of TempClassLoader$ResourceComparator
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1455'>TOMEE-1455</a>] -         for resource local pu try to guess if datasource is configured in persistence unit properties
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1461'>TOMEE-1461</a>] -         Need a machine global mechanism for &#39;get next available port&#39; to prevent &#39;address in use&#39; issues
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1547'>TOMEE-1547</a>] -         Use application classloader for resources defined in resources.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1557'>TOMEE-1557</a>] -         Support AMQ plugin config on amq5factory
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1642'>TOMEE-1642</a>] -         Would be nice that tomee logs JAXRS configuration in use (was: sends an INFO when not found the relative class for pojo-deployment in configuration [openejb-jar.xml])
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1662'>TOMEE-1662</a>] -         Ensure dangling JMS connections are closed on shutdown
-</li>
-</ul>
-            
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1442'>TOMEE-1442</a>] -         Show list of deployed applications (including EARs) in the console
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1456'>TOMEE-1456</a>] -         Support endorsed libs in the TomEE Maven Plugin
-</li>
-</ul>
-                                                                
-<h2>        Test
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1412'>TOMEE-1412</a>] -         Extra unversioned context displayed when using parallel deployment
-</li>
-</ul>
-        
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-1.7.3.adoc b/src/main/jbake/content/tomee-1.7.3.adoc
new file mode 100644
index 0000000..83bd4e5
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.3.adoc
@@ -0,0 +1,51 @@
+= Apache TomEE 1.7.3 released, Dec 9th 2015
+:jbake-type: page
+:jbake-status: published
+
+The Apache TomEE community is pleased to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.7.3], which is based on http://tomcat.apache.org/tomcat-7.0-doc/index.html[Apache Tomcat 7.0.65], including numerous fixes and updates.
+We know this has been a long time coming, so we thank you for your patience and support.
+
+Please note that the TomEE 1.7.3 drop in WAR file will not work on Apache Tomcat 8.
+If you are interested in a Tomcat 8.x version then please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+
+The Apache TomEE 1.7.3 release files can be downloaded from here:
+
+xref:download-ng.adoc[http://tomee.apache.org/downloads.html]
+
+*** Update Maven POM Files
+
+Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
+
+....
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>javaee-api</artifactId>
+	<version>6.0-6</version>
+	<scope>provided</scope>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>openejb-core</artifactId>
+	<version>4.7.3</version>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>tomee</artifactId>
+	<version>1.7.3</version>
+</dependency>
+....
+
+A complete xref:tomee-1.7.3-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-1.7.3-release-notes.adoc[tomee-1.7.3-release-notes.html]
+
+Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE].
+You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
+
+*** Java EE7 and Beyond
+
+From this point on the TomEE community will be focusing most of it's efforts on TomEE 7.0.0, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x.
+It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process.
+We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-1.7.3.md b/src/main/jbake/content/tomee-1.7.3.md
deleted file mode 100644
index 15c1f11..0000000
--- a/src/main/jbake/content/tomee-1.7.3.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Apache TomEE 1.7.3 released, Dec 9th 2015
-
-The Apache TomEE community is pleased to announce the release of [Apache TomEE 1.7.3](http://tomee.apache.org/downloads.html), which is based on [Apache Tomcat 7.0.65](http://tomcat.apache.org/tomcat-7.0-doc/index.html), including numerous fixes and updates.
-We know this has been a long time coming, so we thank you for your patience and support.
-
-Please note that the TomEE 1.7.3 drop in WAR file will not work on Apache Tomcat 8. If you are interested in a Tomcat 8.x version then please feel free to check out and [contribute to the developer branch](contribute.html) - We are always interested in any help from the community that we can get.
-
-The Apache TomEE 1.7.3 release files can be downloaded from here:
-
-[http://tomee.apache.org/downloads.html](downloads.html)
-
-###Update Maven POM Files
-
-Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
-
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>javaee-api</artifactId>
-		<version>6.0-6</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>openejb-core</artifactId>
-		<version>4.7.3</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>tomee</artifactId>
-		<version>1.7.3</version>
-	</dependency>
-
-A complete [Changelog](tomee-1.7.3-release-notes.html) can be viewed here:
-
-[tomee-1.7.3-release-notes.html](tomee-1.7.3-release-notes.html)
-
-Please feel free to jump in feet first and [get started with TomEE](documentation.html). You will nearly always find someone to help you on one of our [support channels](support.html).
-
-###Java EE7 and Beyond
-
-From this point on the TomEE community will be focusing most of it's efforts on TomEE 7.0.0, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x. It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process. We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-1.7.4-release-notes.adoc b/src/main/jbake/content/tomee-1.7.4-release-notes.adoc
new file mode 100644
index 0000000..06aa58d
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.4-release-notes.adoc
@@ -0,0 +1,15 @@
+= Release Notes - TomEE - Version 1.7.4
+:jbake-type: page
+:jbake-status: published
+
+== Bug
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1638[TOMEE-1638] - tomee:exec on Windows produces invalid tomee.zip due to backslash directory separators
+* link:https://issues.apache.org/jira/browse/TOMEE-1686[TOMEE-1686] - org.apache.openejb.core.cmp.CmpContainer#findEJBObject supposes args array is not empty
+* link:https://issues.apache.org/jira/browse/TOMEE-1705[TOMEE-1705] - Destroy application attempts to initialize lazily loaded resources
+
+==  Dependency upgrade
+
+* link:https://issues.apache.org/jira/browse/TOMEE-1677[TOMEE-1677] - tomcat 7.0.68
+
diff --git a/src/main/jbake/content/tomee-1.7.4-release-notes.html b/src/main/jbake/content/tomee-1.7.4-release-notes.html
deleted file mode 100644
index c06f998..0000000
--- a/src/main/jbake/content/tomee-1.7.4-release-notes.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Release Notes - TomEE - Version 1.7.4
-
-<h2>        Bug
-</h2>
-<ul>
-    <li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1638'>TOMEE-1638</a>] -         tomee:exec on Windows produces invalid tomee.zip due to backslash directory separators
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1686'>TOMEE-1686</a>] -         org.apache.openejb.core.cmp.CmpContainer#findEJBObject supposes args array is not empty
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1705'>TOMEE-1705</a>] -         Destroy application attempts to initialize lazily loaded resources
-    </li>
-</ul>
-
-<h2>        Dependency upgrade
-</h2>
-<ul>
-    <li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1677'>TOMEE-1677</a>] -         tomcat 7.0.68
-    </li>
-</ul>
diff --git a/src/main/jbake/content/tomee-1.7.4.adoc b/src/main/jbake/content/tomee-1.7.4.adoc
new file mode 100644
index 0000000..ad5f9ee
--- /dev/null
+++ b/src/main/jbake/content/tomee-1.7.4.adoc
@@ -0,0 +1,52 @@
+= Apache TomEE 1.7.4 released, Mar 7th 2016
+:jbake-type: page
+:jbake-status: published
+
+The Apache TomEE community is pleased to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.7.4], which is based on http://tomcat.apache.org/tomcat-7.0-doc/index.html[Apache Tomcat 7.0.68], including numerous fixes and updates.
+Part of this release an important security fix is included if EJBd is active on your instance (true by default).
+More on xref:security/tomee.adoc[CVE-2016-0779].
+
+Please note that the TomEE 1.7.4 drop in WAR file will not work on Apache Tomcat 8.
+If you are interested in a Tomcat 8.x version then please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+
+The Apache TomEE 1.7.4 release files can be downloaded from here:
+
+xref:download-ng.adoc[http://tomee.apache.org/downloads.html]
+
+*** Update Maven POM Files
+
+Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
+
+....
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>javaee-api</artifactId>
+	<version>6.0-6</version>
+	<scope>provided</scope>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>openejb-core</artifactId>
+	<version>4.7.4</version>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>tomee</artifactId>
+	<version>1.7.4</version>
+</dependency>
+....
+
+A complete xref:tomee-1.7.4-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-1.7.4-release-notes.adoc[tomee-1.7.4-release-notes.html]
+
+Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE].
+You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
+
+*** Java EE7 and Beyond
+
+From this point on the TomEE community will be focusing most of it's efforts on TomEE 7.0.0, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x.
+It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process.
+We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-1.7.4.md b/src/main/jbake/content/tomee-1.7.4.md
deleted file mode 100644
index c9a5188..0000000
--- a/src/main/jbake/content/tomee-1.7.4.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Apache TomEE 1.7.4 released, Mar 7th 2016
-
-The Apache TomEE community is pleased to announce the release of [Apache TomEE 1.7.4](http://tomee.apache.org/downloads.html), which is based on [Apache Tomcat 7.0.68](http://tomcat.apache.org/tomcat-7.0-doc/index.html), including numerous fixes and updates.
-Part of this release an important security fix is included if EJBd is active on your instance (true by default). More on [CVE-2016-0779](security/tomee.html).
-
-Please note that the TomEE 1.7.4 drop in WAR file will not work on Apache Tomcat 8. If you are interested in a Tomcat 8.x version then please feel free to check out and [contribute to the developer branch](contribute.html) - We are always interested in any help from the community that we can get.
-
-The Apache TomEE 1.7.4 release files can be downloaded from here:
-
-[http://tomee.apache.org/downloads.html](downloads.html)
-
-###Update Maven POM Files
-
-Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
-
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>javaee-api</artifactId>
-		<version>6.0-6</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>openejb-core</artifactId>
-		<version>4.7.4</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.openejb</groupId>
-		<artifactId>tomee</artifactId>
-		<version>1.7.4</version>
-	</dependency>
-
-A complete [Changelog](tomee-1.7.4-release-notes.html) can be viewed here:
-
-[tomee-1.7.4-release-notes.html](tomee-1.7.4-release-notes.html)
-
-Please feel free to jump in feet first and [get started with TomEE](documentation.html). You will nearly always find someone to help you on one of our [support channels](support.html).
-
-###Java EE7 and Beyond
-
-From this point on the TomEE community will be focusing most of it's efforts on TomEE 7.0.0, which will be the first TomEE Java EE 7 driven version running on Apache Tomcat 8.x. It is more than likely that support for Java SE 6 will be dropped so that Java SE 7 features can finally be leveraged during the development process. We will of course continue to maintain the 1.7.x branch for the foreseeable future.
diff --git a/src/main/jbake/content/tomee-7.0.0-M1-release-notes.adoc b/src/main/jbake/content/tomee-7.0.0-M1-release-notes.adoc
new file mode 100644
index 0000000..f2eb398
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.0-M1-release-notes.adoc
@@ -0,0 +1,283 @@
+= Release Notes - TomEE - Version 7.0.0-M1
+:jbake-type: page
+:jbake-status: published
+
+== Sub-task
+
+* link:https://issues.apache.org/jira/browse/TOMEE-1322[TOMEE-1322] - Client API
+
+== Bug
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1071[TOMEE-1071] - NoClassDefFoundError - SVGDocument
+* link:https://issues.apache.org/jira/browse/TOMEE-1265[TOMEE-1265] - Can not start tomee when using conf/catalina.policy
+* link:https://issues.apache.org/jira/browse/TOMEE-1266[TOMEE-1266] - Unable to configure a datasource with TomEE in context of Oracle Wallet
+* link:https://issues.apache.org/jira/browse/TOMEE-1268[TOMEE-1268] - Auto scanning of @Provider
+* link:https://issues.apache.org/jira/browse/TOMEE-1275[TOMEE-1275] - TimerExecutor as compoenent doesn&#39;t follow executor lifecycle (stop/start)
+* link:https://issues.apache.org/jira/browse/TOMEE-1281[TOMEE-1281] - JAXRS doesn&#39;t work with deltaspike in Application#getSingleton
+* link:https://issues.apache.org/jira/browse/TOMEE-1283[TOMEE-1283] - old commons-lang3 dependency in lib folder
+* link:https://issues.apache.org/jira/browse/TOMEE-1296[TOMEE-1296] - org.apache.openejb.jpa.integration.eclipselink.OpenEJBServerPlatform mbeanServer name is wrong
+* link:https://issues.apache.org/jira/browse/TOMEE-1324[TOMEE-1324] - Problem with TomEE Maven archetype
+* link:https://issues.apache.org/jira/browse/TOMEE-1325[TOMEE-1325] - Dynamic subclassing doesn&#39;t support interfaces (@Local)
+* link:https://issues.apache.org/jira/browse/TOMEE-1329[TOMEE-1329] - jars.txt doesn&#39;t support empty lines
+* link:https://issues.apache.org/jira/browse/TOMEE-1330[TOMEE-1330] - Support to include container urls in scanning
+* link:https://issues.apache.org/jira/browse/TOMEE-1333[TOMEE-1333] - NPE in releasing deployed artifacts with ArquillianSuiteExtension
+* link:https://issues.apache.org/jira/browse/TOMEE-1334[TOMEE-1334] - cdi lazy realm throws NPE cause of init handling (too early)
+* link:https://issues.apache.org/jira/browse/TOMEE-1335[TOMEE-1335] - openejb.deployer.save-deployments broken on war
+* link:https://issues.apache.org/jira/browse/TOMEE-1342[TOMEE-1342] - OutputGeneratedDescriptors doesn&#39;t output complete ejb-jar.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-1343[TOMEE-1343] - HSQL server shuts down saying no databases available
+* link:https://issues.apache.org/jira/browse/TOMEE-1344[TOMEE-1344] - URLClassLoader are not closed during scanning and with app undeployment
+* link:https://issues.apache.org/jira/browse/TOMEE-1348[TOMEE-1348] - [JAXRS] ensure static resources are handled through servlet chain (jsp case for instance)
+* link:https://issues.apache.org/jira/browse/TOMEE-1350[TOMEE-1350] - arquillian class discovering algorithm should ignore test classes which can&#39;t be EJBs
+* link:https://issues.apache.org/jira/browse/TOMEE-1351[TOMEE-1351] - jaxws doesn&#39;t support ROOT context
+* link:https://issues.apache.org/jira/browse/TOMEE-1352[TOMEE-1352] - can&#39;t start if there is a space in tomee folder path
+* link:https://issues.apache.org/jira/browse/TOMEE-1353[TOMEE-1353] - [regression] jsonproviuder no more added
+* link:https://issues.apache.org/jira/browse/TOMEE-1357[TOMEE-1357] - tomee forces new StandardManager()
+* link:https://issues.apache.org/jira/browse/TOMEE-1358[TOMEE-1358] - openejb.additional.include not respected
+* link:https://issues.apache.org/jira/browse/TOMEE-1359[TOMEE-1359] - TomEEInjectionEnricher does not always return correct AppContext
+* link:https://issues.apache.org/jira/browse/TOMEE-1362[TOMEE-1362] - WsRsTest is not correct
+* link:https://issues.apache.org/jira/browse/TOMEE-1364[TOMEE-1364] - When using the tomee-maven-plugins stop goal tomee seems to hang forever
+* link:https://issues.apache.org/jira/browse/TOMEE-1366[TOMEE-1366] - UnsupportedOperationException in CxfEndpoint.doServiceCreate
+* link:https://issues.apache.org/jira/browse/TOMEE-1379[TOMEE-1379] - TransactionSynchronizationRegistry not found in JNDI for EJB Timer started transactions
+* link:https://issues.apache.org/jira/browse/TOMEE-1381[TOMEE-1381] - wrong property passed as ValidatorFactory to JPA
+* link:https://issues.apache.org/jira/browse/TOMEE-1382[TOMEE-1382] - allow to override LoaderService of openwebbeans by app in application.properties
+* link:https://issues.apache.org/jira/browse/TOMEE-1384[TOMEE-1384] - tolerate serialization of undeployed EJB
+* link:https://issues.apache.org/jira/browse/TOMEE-1385[TOMEE-1385] - in embedded mode with embedded JUL logger allow to change consoleHandlerClazz
+* link:https://issues.apache.org/jira/browse/TOMEE-1389[TOMEE-1389] - ApplicationComposer should try all possible BeanManager for injections
+* link:https://issues.apache.org/jira/browse/TOMEE-1406[TOMEE-1406] - Compile error in openejb-core due to an encoding issue
+* link:https://issues.apache.org/jira/browse/TOMEE-1407[TOMEE-1407] - Invalid filtering configuration for assembly/openejb-standalone which causes a compile error
+* link:https://issues.apache.org/jira/browse/TOMEE-1409[TOMEE-1409] - Invalid configuration in module openejb-junit
+* link:https://issues.apache.org/jira/browse/TOMEE-1414[TOMEE-1414] - @Jars works only with a single jar and not all matching jars
+* link:https://issues.apache.org/jira/browse/TOMEE-1423[TOMEE-1423] - Packaging contains duplicate artifacts with snapshot timestamp
+* link:https://issues.apache.org/jira/browse/TOMEE-1429[TOMEE-1429] - tomee embedded broken
+* link:https://issues.apache.org/jira/browse/TOMEE-1431[TOMEE-1431] - tomee embedded ignores server.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-1433[TOMEE-1433] - Prevent error output on tomee:run<Enter>
+* link:https://issues.apache.org/jira/browse/TOMEE-1435[TOMEE-1435] - flushable datasources not destroyed
+* link:https://issues.apache.org/jira/browse/TOMEE-1438[TOMEE-1438] - cxf classloader doesn&#39;t delegate properly in equals/hashcode (lookup are broken in tomcat)
+* link:https://issues.apache.org/jira/browse/TOMEE-1448[TOMEE-1448] - container CDI classes shouldn&#39;t be filtered from CDI context
+* link:https://issues.apache.org/jira/browse/TOMEE-1449[TOMEE-1449] - allow to deploy twice (several hosts) the same app
+* link:https://issues.apache.org/jira/browse/TOMEE-1450[TOMEE-1450] - Unable to shutdown with whitespace in path because of javaagent error
+* link:https://issues.apache.org/jira/browse/TOMEE-1452[TOMEE-1452] - reloading doesn&#39;t work with jaxws services for ears
+* link:https://issues.apache.org/jira/browse/TOMEE-1457[TOMEE-1457] - OpenEJBLoginValidator shouldn&#39;t associate if in tomee
+* link:https://issues.apache.org/jira/browse/TOMEE-1460[TOMEE-1460] - deploying cxf webservice in host other than localhost
+* link:https://issues.apache.org/jira/browse/TOMEE-1462[TOMEE-1462] - ApplicationComposer hides assert errors
+* link:https://issues.apache.org/jira/browse/TOMEE-1467[TOMEE-1467] - embedded http layer doesn&#39;t support repeated query parameters
+* link:https://issues.apache.org/jira/browse/TOMEE-1468[TOMEE-1468] - ApplicationComposer + CDI for a WebApp breaks startup
+* link:https://issues.apache.org/jira/browse/TOMEE-1477[TOMEE-1477] - TomEE wont start if added maven-properties to <args>
+* link:https://issues.apache.org/jira/browse/TOMEE-1480[TOMEE-1480] - make possibility to provide conf.d-files for arquillian-tomee-remote adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-1481[TOMEE-1481] - web-fragment.xml FacesServlet declaration not supported
+* link:https://issues.apache.org/jira/browse/TOMEE-1488[TOMEE-1488] - basic support of LATEST and LATEST-SNAPSHOT in maven resolver
+* link:https://issues.apache.org/jira/browse/TOMEE-1490[TOMEE-1490] - Arquillian Test and Local context.xml file not loading correctly
+* link:https://issues.apache.org/jira/browse/TOMEE-1491[TOMEE-1491] - add a LazyValve
+* link:https://issues.apache.org/jira/browse/TOMEE-1495[TOMEE-1495] - TomEE won&#39;t load Taglibs from WEB-INF/lib/
+* link:https://issues.apache.org/jira/browse/TOMEE-1497[TOMEE-1497] - NPE When deploy genericjmsra.rar
+* link:https://issues.apache.org/jira/browse/TOMEE-1499[TOMEE-1499] - connector modules are not destroyed properly
+* link:https://issues.apache.org/jira/browse/TOMEE-1502[TOMEE-1502] - CDI interceptors dont work with MDBs
+* link:https://issues.apache.org/jira/browse/TOMEE-1503[TOMEE-1503] - for ear try to guess is webapp should use delegate loading or not
+* link:https://issues.apache.org/jira/browse/TOMEE-1504[TOMEE-1504] - undeploy doesn&#39;t always clean up correctly Deployments
+* link:https://issues.apache.org/jira/browse/TOMEE-1505[TOMEE-1505] - shutdown cxf bus when exiting services (rs/ws)
+* link:https://issues.apache.org/jira/browse/TOMEE-1507[TOMEE-1507] - openejb-rest leaks deployed apps
+* link:https://issues.apache.org/jira/browse/TOMEE-1510[TOMEE-1510] - CXF Continuations not working for REST services
+* link:https://issues.apache.org/jira/browse/TOMEE-1511[TOMEE-1511] - Parallel deployment + EJB webservice not working
+* link:https://issues.apache.org/jira/browse/TOMEE-1513[TOMEE-1513] - catalina.sh does not quote javaagent argument correctly
+* link:https://issues.apache.org/jira/browse/TOMEE-1520[TOMEE-1520] - A service as a singleton is not working
+* link:https://issues.apache.org/jira/browse/TOMEE-1521[TOMEE-1521] - Duplicate App Deployment when autoDeploy=&quot;true&quot;
+* link:https://issues.apache.org/jira/browse/TOMEE-1527[TOMEE-1527] - helper cli command to debug/introspect resources (list setters and effective tomee resources)
+* link:https://issues.apache.org/jira/browse/TOMEE-1528[TOMEE-1528] - add LogSqlPackages and openejb.log.sql.packages
+* link:https://issues.apache.org/jira/browse/TOMEE-1531[TOMEE-1531] - TomEE 2 + Mojarra 2.2.10 NPE when navigating into a flow
+* link:https://issues.apache.org/jira/browse/TOMEE-1534[TOMEE-1534] - in JAXRS ExceptionException are not always unwrapped
+* link:https://issues.apache.org/jira/browse/TOMEE-1535[TOMEE-1535] - JAX-RS Subresource paths are chosen incorrectly
+* link:https://issues.apache.org/jira/browse/TOMEE-1540[TOMEE-1540] - tomee.sh doesn&#39;t support missing JAVA_HOME var
+* link:https://issues.apache.org/jira/browse/TOMEE-1546[TOMEE-1546] - tomee forces jsf 2 cause of check of scopes
+* link:https://issues.apache.org/jira/browse/TOMEE-1549[TOMEE-1549] - org.apache.openejb.resource.activemq.ActiveMQ5Factory#createPersistenceAdapter broken for all but kahadb
+* link:https://issues.apache.org/jira/browse/TOMEE-1551[TOMEE-1551] - URLClassLoaderFirst uses its own lock and not classloader one
+* link:https://issues.apache.org/jira/browse/TOMEE-1553[TOMEE-1553] - EJBContainerRunner broken with junit 4.12
+* link:https://issues.apache.org/jira/browse/TOMEE-1566[TOMEE-1566] - [tomee-maven-plugin] Allow for name customizations for .rar apps
+* link:https://issues.apache.org/jira/browse/TOMEE-1568[TOMEE-1568] - support overriding of a failed deployment in tomcat webappdeployer
+* link:https://issues.apache.org/jira/browse/TOMEE-1569[TOMEE-1569] - openejb Logger (util package) should use container loader to create JUL loggers
+* link:https://issues.apache.org/jira/browse/TOMEE-1570[TOMEE-1570] - OpenEJBLogRecord misses logger name
+* link:https://issues.apache.org/jira/browse/TOMEE-1571[TOMEE-1571] - arquillian-openejb-embedded doesn&#39;t destroy sessions with application undeployment in embedded http mode
+* link:https://issues.apache.org/jira/browse/TOMEE-1576[TOMEE-1576] - openejb-http ServletRequest.getSession().invalidate should remove the session cached in the request
+* link:https://issues.apache.org/jira/browse/TOMEE-1577[TOMEE-1577] - [openejb-http] SessionManager.destroy cleanup does not check if Session got destroyed in the meantime
+* link:https://issues.apache.org/jira/browse/TOMEE-1580[TOMEE-1580] - Datasource JNDI Name Context not available to eclipselink non jta data source
+* link:https://issues.apache.org/jira/browse/TOMEE-1584[TOMEE-1584] - ProvisioningUtil does not escape group id for maven-metadata.xml check
+* link:https://issues.apache.org/jira/browse/TOMEE-1585[TOMEE-1585] - org.apache.openejb.core.ivm.BaseEjbProxyHandler.ProxyRegistry#liveHandleRegistry not thread safe
+* link:https://issues.apache.org/jira/browse/TOMEE-1589[TOMEE-1589] - LogSql doesn&#39;t support openjpa externalizer/stream
+* link:https://issues.apache.org/jira/browse/TOMEE-1590[TOMEE-1590] - WsFactory: ClassCastException: java.util.HashSet cannot be cast to java.util.List
+* link:https://issues.apache.org/jira/browse/TOMEE-1594[TOMEE-1594] - resource sorting for dependency management doesn&#39;t handle transitivity
+* link:https://issues.apache.org/jira/browse/TOMEE-1596[TOMEE-1596] - AutoDeployer buggy is not using hot deploy
+* link:https://issues.apache.org/jira/browse/TOMEE-1599[TOMEE-1599] - Session attributes are logged like being unused
+* link:https://issues.apache.org/jira/browse/TOMEE-1608[TOMEE-1608] - org.apache.openejb.client.RemoteInitialContextFactory doesnt logout authenticated pcp
+* link:https://issues.apache.org/jira/browse/TOMEE-1610[TOMEE-1610] - [OSGi] Version range problem in openejb-core on bean-asm5
+* link:https://issues.apache.org/jira/browse/TOMEE-1615[TOMEE-1615] - JTA JDBC proxies always create a connection even if one is already bound to the current transaction
+* link:https://issues.apache.org/jira/browse/TOMEE-1621[TOMEE-1621] - [jaxrs] EJBException should be unwrapped and rethrown - and not translated to anything else
+* link:https://issues.apache.org/jira/browse/TOMEE-1623[TOMEE-1623] - openejb-client doesnt support HTTPS KeepAlive caching of the JVM
+* link:https://issues.apache.org/jira/browse/TOMEE-1631[TOMEE-1631] - Basic Rotating JUL Handler
+* link:https://issues.apache.org/jira/browse/TOMEE-1632[TOMEE-1632] - org.apache.openejb.client.Client ignored IOException
+* link:https://issues.apache.org/jira/browse/TOMEE-1641[TOMEE-1641] - openejb deploymentid format changes WS endpoint
+* link:https://issues.apache.org/jira/browse/TOMEE-1669[TOMEE-1669] - blacklist org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan in our custom ObjectInputStream
+
+== Dependency upgrade
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1277[TOMEE-1277] - cxf 3
+* link:https://issues.apache.org/jira/browse/TOMEE-1368[TOMEE-1368] - upgrade arquillian-transaction-impl-base to 1.0.1.Final
+* link:https://issues.apache.org/jira/browse/TOMEE-1369[TOMEE-1369] - arquillian persistence sample
+* link:https://issues.apache.org/jira/browse/TOMEE-1370[TOMEE-1370] - symbolic links not supported by tomee for @WebXXX
+* link:https://issues.apache.org/jira/browse/TOMEE-1391[TOMEE-1391] - Use maven-filtering:1.2 to fix MSHARED-319 when compiling under JDK8
+* link:https://issues.apache.org/jira/browse/TOMEE-1426[TOMEE-1426] - XBean 4.4
+* link:https://issues.apache.org/jira/browse/TOMEE-1506[TOMEE-1506] - AMQ 5.12.0
+* link:https://issues.apache.org/jira/browse/TOMEE-1514[TOMEE-1514] - arquillian 1.1.7.Final, ShrinkWrap descriptor 2.0.0-alpha-7 and Shrinkwrap 1.2.2
+* link:https://issues.apache.org/jira/browse/TOMEE-1543[TOMEE-1543] - [lang3] 3.4
+* link:https://issues.apache.org/jira/browse/TOMEE-1554[TOMEE-1554] - Upgrade OpenJPA to 2.4.0
+* link:https://issues.apache.org/jira/browse/TOMEE-1564[TOMEE-1564] - geronimo connector/transaction 3.1.2
+* link:https://issues.apache.org/jira/browse/TOMEE-1620[TOMEE-1620] - dbcp2+pool2
+* link:https://issues.apache.org/jira/browse/TOMEE-1673[TOMEE-1673] - Upgrade commons-collections to 3.2.2
+
+== Documentation
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1264[TOMEE-1264] - Doc issue with &quot;cxf.jaxrs.providers&quot;
+* link:https://issues.apache.org/jira/browse/TOMEE-1605[TOMEE-1605] - Status Page for Java EE 7
+
+== Improvement
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1269[TOMEE-1269] - if a @Path interface has a single implementation add it as rest service
+* link:https://issues.apache.org/jira/browse/TOMEE-1270[TOMEE-1270] - exclude from scanning @Deprecated @Providers
+* link:https://issues.apache.org/jira/browse/TOMEE-1272[TOMEE-1272] - Do not force use of system property &#39;com.sun.management.jmxremote&#39;
+* link:https://issues.apache.org/jira/browse/TOMEE-1273[TOMEE-1273] - fix SslTomEETest to work with JDK 8 keytool
+* link:https://issues.apache.org/jira/browse/TOMEE-1328[TOMEE-1328] - Arquillian.xml &#39;additionalLibs&#39;
+must fail-fast
+* link:https://issues.apache.org/jira/browse/TOMEE-1336[TOMEE-1336] - Support classname.activated = true/false for auto discovered providers
+* link:https://issues.apache.org/jira/browse/TOMEE-1339[TOMEE-1339] - [JAXRS] try static resources first
+* link:https://issues.apache.org/jira/browse/TOMEE-1354[TOMEE-1354] - Add &#39;openejb.deployer.binaries.use&#39;
+automatically for arquillian test on remote machine
+* link:https://issues.apache.org/jira/browse/TOMEE-1371[TOMEE-1371] - if using kahadb or leveldb or any persistence adapter force broker to be persistent
+* link:https://issues.apache.org/jira/browse/TOMEE-1372[TOMEE-1372] - when trying to find persistence unit datasources ensure to try exact name first without required property constraint
+* link:https://issues.apache.org/jira/browse/TOMEE-1373[TOMEE-1373] - AlternativeDriver leaks when used (by default) from applications (resources.xml)
+* link:https://issues.apache.org/jira/browse/TOMEE-1374[TOMEE-1374] - basic detection that container loader can&#39;t create a datasource and fallback on app one
+* link:https://issues.apache.org/jira/browse/TOMEE-1375[TOMEE-1375] - add an option to deploy &quot;war classpath&quot;
+using tomee embedded maven plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-1386[TOMEE-1386] - skip org.apache.wink.common.internal.
+@Provider when using CXF
+* link:https://issues.apache.org/jira/browse/TOMEE-1387[TOMEE-1387] - tomee embedded arquillian adapter doesn&#39;t delete temp folder as fast as it should/could
+* link:https://issues.apache.org/jira/browse/TOMEE-1392[TOMEE-1392] - META-INF/org.apache.openejb.extension doesn&#39;t support multiple lines
+* link:https://issues.apache.org/jira/browse/TOMEE-1394[TOMEE-1394] - mimic official JBoss CDI enricher for method parameter
+* link:https://issues.apache.org/jira/browse/TOMEE-1411[TOMEE-1411] - allow to create an application composer webapp using all inner classes of the test
+* link:https://issues.apache.org/jira/browse/TOMEE-1418[TOMEE-1418] - Add Classpath discovery in REST annotations with virtual class path
+* link:https://issues.apache.org/jira/browse/TOMEE-1422[TOMEE-1422] - Potential NPE when stoping container.
+* link:https://issues.apache.org/jira/browse/TOMEE-1425[TOMEE-1425] - better JMX naming for cxf jaxrs endpoint
+* link:https://issues.apache.org/jira/browse/TOMEE-1430[TOMEE-1430] - add support for users/roles for tomee embedded
+* link:https://issues.apache.org/jira/browse/TOMEE-1434[TOMEE-1434] - wire roles/users to tomee embedded arquillian adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-1439[TOMEE-1439] - @Context SecurityContext doesn&#39;t use SecurityService
+* link:https://issues.apache.org/jira/browse/TOMEE-1443[TOMEE-1443] - support cxf.jaxws.wsFeatures
+* link:https://issues.apache.org/jira/browse/TOMEE-1454[TOMEE-1454] - add openejb.force-unit-type property to workaround 8.2.1.5 of JPA 2.0 spec
+* link:https://issues.apache.org/jira/browse/TOMEE-1463[TOMEE-1463] - support WebServiceFeature for @WebServiceRef as well
+* link:https://issues.apache.org/jira/browse/TOMEE-1466[TOMEE-1466] - Apply WS-Security config (cxf interceptor) when use @WebService with javax.xml.ws.Service
+* link:https://issues.apache.org/jira/browse/TOMEE-1484[TOMEE-1484] - Add JMS 2 to spec JAR
+* link:https://issues.apache.org/jira/browse/TOMEE-1486[TOMEE-1486] - add to jaxws events close to jaxrs ones for consistency (ServerCreated/Destroyed)
+* link:https://issues.apache.org/jira/browse/TOMEE-1489[TOMEE-1489] - Allow ActiveMQ scheduler activation when using kahadb persistence
+* link:https://issues.apache.org/jira/browse/TOMEE-1500[TOMEE-1500] - MultiPulse bad URI event only fires once
+* link:https://issues.apache.org/jira/browse/TOMEE-1516[TOMEE-1516] - Add method without optional parameters for Container#deployPathsAsWebapp
+* link:https://issues.apache.org/jira/browse/TOMEE-1522[TOMEE-1522] - support resources.xml in META-INF of ears
+* link:https://issues.apache.org/jira/browse/TOMEE-1529[TOMEE-1529] - BaseEjbProxyHandler#equals is super slow when parameter is not a proxy
+* link:https://issues.apache.org/jira/browse/TOMEE-1530[TOMEE-1530] - (arquillian) OpenEJBEnricher: if app context is null try to find it from classloader
+* link:https://issues.apache.org/jira/browse/TOMEE-1548[TOMEE-1548] - add @PostConstruct/@PreDestroy support for container resources as well based on Jon&#39;s work
+* link:https://issues.apache.org/jira/browse/TOMEE-1558[TOMEE-1558] - OpenEJBHttpRegistry should support getting its port from placeholder
+* link:https://issues.apache.org/jira/browse/TOMEE-1562[TOMEE-1562] - Adjust ConfigurationDeployer scan loop.
+* link:https://issues.apache.org/jira/browse/TOMEE-1565[TOMEE-1565] - org.apache.openejb.OpenEJBException: Unable to load type &#39;XXX&#39;
+for comp/env/openejb/Resource/<id>
+* link:https://issues.apache.org/jira/browse/TOMEE-1567[TOMEE-1567] - allow to override persistence-unit properties from application.properties (as we already support system props)
+* link:https://issues.apache.org/jira/browse/TOMEE-1578[TOMEE-1578] - dont override tomee.xml if existing and we need to add apps.
+* link:https://issues.apache.org/jira/browse/TOMEE-1592[TOMEE-1592] - support java:/ resource naming
+* link:https://issues.apache.org/jira/browse/TOMEE-1593[TOMEE-1593] - try to mitigate resouces.xml sorting using a LinkedSet instead of a hashset in AppModule
+* link:https://issues.apache.org/jira/browse/TOMEE-1604[TOMEE-1604] - stateless eviction thread count should be configurable and not 1 by stateless bean pool
+* link:https://issues.apache.org/jira/browse/TOMEE-1617[TOMEE-1617] - remove implicit datasource attribute conversion for pools
+* link:https://issues.apache.org/jira/browse/TOMEE-1629[TOMEE-1629] - Implement a custom integration around log4j2 org.apache.logging.log4j.core.util.ShutdownCallbackRegistry
+* link:https://issues.apache.org/jira/browse/TOMEE-1630[TOMEE-1630] - activate ejb remote in tomee embedded with a flag
+
+== New Feature
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1274[TOMEE-1274] - support additionalLibs in arquillian.xml to add libs from mvn coordinates to tomee/lib
+* link:https://issues.apache.org/jira/browse/TOMEE-1282[TOMEE-1282] - basic @Transactional @TransactionScoped support
+* link:https://issues.apache.org/jira/browse/TOMEE-1285[TOMEE-1285] - allow jaxrs providers to be CDI bean
+* link:https://issues.apache.org/jira/browse/TOMEE-1288[TOMEE-1288] - supports default in out propertyplaceholding
+* link:https://issues.apache.org/jira/browse/TOMEE-1289[TOMEE-1289] - allow user to provide a properties-provider on resources
+* link:https://issues.apache.org/jira/browse/TOMEE-1294[TOMEE-1294] - Allow to set System-Property in tomee.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-1295[TOMEE-1295] - openjpa.EntityManagerFactoryPool support for container persistence unit
+* link:https://issues.apache.org/jira/browse/TOMEE-1297[TOMEE-1297] - add @Jars annotation to ApplicationComposer
+* link:https://issues.apache.org/jira/browse/TOMEE-1298[TOMEE-1298] - Support JSR 107: JCACHE - Java Temporary Caching API
+* link:https://issues.apache.org/jira/browse/TOMEE-1332[TOMEE-1332] - support @Startup on CDI beans (@ApplicationScoped or normal scoped beans if the context is active at boot time)
+* link:https://issues.apache.org/jira/browse/TOMEE-1341[TOMEE-1341] - Arquillian support for Suite testing
+* link:https://issues.apache.org/jira/browse/TOMEE-1345[TOMEE-1345] - basic support of Tomcat embedded in tomee-embedded
+* link:https://issues.apache.org/jira/browse/TOMEE-1346[TOMEE-1346] - support ciphered values in resources
+* link:https://issues.apache.org/jira/browse/TOMEE-1347[TOMEE-1347] - allow to provide a default global properties provider for resources
+* link:https://issues.apache.org/jira/browse/TOMEE-1388[TOMEE-1388] - add @JaxrsProviders to ApplicationComposers to add provider classes quickly on WebApp
+* link:https://issues.apache.org/jira/browse/TOMEE-1420[TOMEE-1420] - tomee-maven-plugin customizers configuration to be able to call java code to customize an instance
+* link:https://issues.apache.org/jira/browse/TOMEE-1421[TOMEE-1421] - support persistence of javaagent config in tomee maven plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-1436[TOMEE-1436] - create RunAsRule
+* link:https://issues.apache.org/jira/browse/TOMEE-1437[TOMEE-1437] - create TransactionRule
+* link:https://issues.apache.org/jira/browse/TOMEE-1440[TOMEE-1440] - support singleDeploymentByArchiveName in tomee arquillian adapters (remote/embedded)
+* link:https://issues.apache.org/jira/browse/TOMEE-1444[TOMEE-1444] - allow extensions through openejb extensions of cxf-rs
+* link:https://issues.apache.org/jira/browse/TOMEE-1446[TOMEE-1446] - add event BeforeStartEjbs otherwise for timer beans it is surely too late if you want to modify it
+* link:https://issues.apache.org/jira/browse/TOMEE-1447[TOMEE-1447] - tomee-embedded-maven-plugin should support deployment of multiple applications
+* link:https://issues.apache.org/jira/browse/TOMEE-1451[TOMEE-1451] - notify through BusCreated event when cxf bus is created
+* link:https://issues.apache.org/jira/browse/TOMEE-1458[TOMEE-1458] - provide cxf configuration support for @WebServiceRef
+* link:https://issues.apache.org/jira/browse/TOMEE-1464[TOMEE-1464] - support tomee embedded shades
+* link:https://issues.apache.org/jira/browse/TOMEE-1472[TOMEE-1472] - @RandomPort for applicationComposer
+* link:https://issues.apache.org/jira/browse/TOMEE-1473[TOMEE-1473] - @SimpleLog for ApplicationComposer
+* link:https://issues.apache.org/jira/browse/TOMEE-1479[TOMEE-1479] - HttpRequestImpl login backed by security service by default
+* link:https://issues.apache.org/jira/browse/TOMEE-1482[TOMEE-1482] - add ability to log all CDI beans found (OWB scanner)
+* link:https://issues.apache.org/jira/browse/TOMEE-1483[TOMEE-1483] - support destinationLookup activation spec with activemq
+* link:https://issues.apache.org/jira/browse/TOMEE-1487[TOMEE-1487] - CDI Event based realm
+* link:https://issues.apache.org/jira/browse/TOMEE-1494[TOMEE-1494] - add a run(Class,String\...) utitlity method to ApplicationComposers
+* link:https://issues.apache.org/jira/browse/TOMEE-1498[TOMEE-1498] - basic web resource support for openejb-http
+* link:https://issues.apache.org/jira/browse/TOMEE-1512[TOMEE-1512] - create basic application composer maven plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-1517[TOMEE-1517] - TomEEEmbeddedRule
+* link:https://issues.apache.org/jira/browse/TOMEE-1518[TOMEE-1518] - ContainerRule and ApplicationRule
+* link:https://issues.apache.org/jira/browse/TOMEE-1526[TOMEE-1526] - global (conf/system.properties) openejb.datasource.pool support
+* link:https://issues.apache.org/jira/browse/TOMEE-1539[TOMEE-1539] - tomee maven plugins: allow to configure server.xml in the pom
+* link:https://issues.apache.org/jira/browse/TOMEE-1541[TOMEE-1541] - add inlinedTomEEXml to tomee maven plugins
+* link:https://issues.apache.org/jira/browse/TOMEE-1542[TOMEE-1542] - JAXRS: trailing slash not ignored/handled properly
+* link:https://issues.apache.org/jira/browse/TOMEE-1544[TOMEE-1544] - openejb.jpa.timer property to deactivate (false) jtaentitymanager timer metrics
+* link:https://issues.apache.org/jira/browse/TOMEE-1550[TOMEE-1550] - support AMQ plugin config on amq5factory
+* link:https://issues.apache.org/jira/browse/TOMEE-1552[TOMEE-1552] - add openejb.activemq.deploymentId-as-clientId flag to not force AMQ clientId to ejb deploymentId
+* link:https://issues.apache.org/jira/browse/TOMEE-1555[TOMEE-1555] - create @PersistenceUnitDefinition
+* link:https://issues.apache.org/jira/browse/TOMEE-1556[TOMEE-1556] - ApplicationComposer like API for web applications
+* link:https://issues.apache.org/jira/browse/TOMEE-1559[TOMEE-1559] - provide a basic programmatic way to secure a webapp when using tomee embedded deploy classpath
+* link:https://issues.apache.org/jira/browse/TOMEE-1560[TOMEE-1560] - tomee-embedded should support a custom realm in configuration
+* link:https://issues.apache.org/jira/browse/TOMEE-1573[TOMEE-1573] - support normal containers (ie not ra ones) in resources.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-1574[TOMEE-1574] - support Resources as return type of @Module in application composer
+* link:https://issues.apache.org/jira/browse/TOMEE-1575[TOMEE-1575] - heroku PropertiesResourceProvider
+* link:https://issues.apache.org/jira/browse/TOMEE-1579[TOMEE-1579] - support executable wars just doing an overlay of tomee embedded
+* link:https://issues.apache.org/jira/browse/TOMEE-1582[TOMEE-1582] - support endorsed and javaagent list for remote tomee arquillian adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-1595[TOMEE-1595] - ApplicationComposer should support @PersistenceRootUrl for advanced cases
+* link:https://issues.apache.org/jira/browse/TOMEE-1597[TOMEE-1597] - tomee-maven-plugin: tar:gz support for tomee:build
+* link:https://issues.apache.org/jira/browse/TOMEE-1598[TOMEE-1598] - tomee-maven-plugin: support main as customizer
+* link:https://issues.apache.org/jira/browse/TOMEE-1600[TOMEE-1600] - tomee-maven-plugin: support exploded war in tomee:build
+* link:https://issues.apache.org/jira/browse/TOMEE-1603[TOMEE-1603] - support CDI password ciphers
+* link:https://issues.apache.org/jira/browse/TOMEE-1625[TOMEE-1625] - provide a way to recreate a datasource pool - Flushable feature - automatically on SQLException - aka ResetOnError
+
+== Task
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1276[TOMEE-1276] - rework TimerExecutor
+* link:https://issues.apache.org/jira/browse/TOMEE-1278[TOMEE-1278] - tomcat 8.0.x
+* link:https://issues.apache.org/jira/browse/TOMEE-1279[TOMEE-1279] - integrate batchee
+* link:https://issues.apache.org/jira/browse/TOMEE-1280[TOMEE-1280] - myfaces 2.2.x
+* link:https://issues.apache.org/jira/browse/TOMEE-1317[TOMEE-1317] - Ensure full support of JSR-349 Bean Validation 1.1
+* link:https://issues.apache.org/jira/browse/TOMEE-1327[TOMEE-1327] - log4j2 integration
+* link:https://issues.apache.org/jira/browse/TOMEE-1331[TOMEE-1331] - rework ProvisiningUtil to allow it to support more resolvers
+* link:https://issues.apache.org/jira/browse/TOMEE-1355[TOMEE-1355] - experiment a tomee-embedded flat webapp mode
+* link:https://issues.apache.org/jira/browse/TOMEE-1356[TOMEE-1356] - tomcat resources are not always well created and can return a Context instead of the real instance
+* link:https://issues.apache.org/jira/browse/TOMEE-1588[TOMEE-1588] - move tomee to org.apache.tomee groupId
+
+== Test
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1290[TOMEE-1290] - Source build profile &#39;hibernate&#39;
+requires junit dependency
+* link:https://issues.apache.org/jira/browse/TOMEE-1338[TOMEE-1338] - Create tests for DeployerEjb
+* link:https://issues.apache.org/jira/browse/TOMEE-1523[TOMEE-1523] - Pull LegacyClientTest resources init into @BeforeClass
diff --git a/src/main/jbake/content/tomee-7.0.0-M1-release-notes.md b/src/main/jbake/content/tomee-7.0.0-M1-release-notes.md
deleted file mode 100644
index c059580..0000000
--- a/src/main/jbake/content/tomee-7.0.0-M1-release-notes.md
+++ /dev/null
@@ -1,529 +0,0 @@
-
-        Release Notes - TomEE - Version 7.0.0-M1
-    
-<h2>        Sub-task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1322'>TOMEE-1322</a>] -         Client API
-</li>
-</ul>
-                            
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1071'>TOMEE-1071</a>] -         NoClassDefFoundError - SVGDocument
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1265'>TOMEE-1265</a>] -         Can not start tomee when using conf/catalina.policy
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1266'>TOMEE-1266</a>] -         Unable to configure a datasource with TomEE in context of Oracle Wallet
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1268'>TOMEE-1268</a>] -         Auto scanning of @Provider
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1275'>TOMEE-1275</a>] -         TimerExecutor as compoenent doesn&#39;t follow executor lifecycle (stop/start)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1281'>TOMEE-1281</a>] -         JAXRS doesn&#39;t work with deltaspike in Application#getSingleton
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1283'>TOMEE-1283</a>] -         old commons-lang3 dependency in lib folder
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1296'>TOMEE-1296</a>] -         org.apache.openejb.jpa.integration.eclipselink.OpenEJBServerPlatform mbeanServer name is wrong
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1324'>TOMEE-1324</a>] -         Problem with TomEE Maven archetype
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1325'>TOMEE-1325</a>] -         Dynamic subclassing doesn&#39;t support interfaces (@Local)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1329'>TOMEE-1329</a>] -         jars.txt doesn&#39;t support empty lines
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1330'>TOMEE-1330</a>] -         Support to include container urls in scanning
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1333'>TOMEE-1333</a>] -         NPE in releasing deployed artifacts with ArquillianSuiteExtension
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1334'>TOMEE-1334</a>] -         cdi lazy realm throws NPE cause of init handling (too early)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1335'>TOMEE-1335</a>] -         openejb.deployer.save-deployments broken on war
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1342'>TOMEE-1342</a>] -         OutputGeneratedDescriptors doesn&#39;t output complete ejb-jar.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1343'>TOMEE-1343</a>] -         HSQL server shuts down saying no databases available
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1344'>TOMEE-1344</a>] -         URLClassLoader are not closed during scanning and with app undeployment
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1348'>TOMEE-1348</a>] -         [JAXRS] ensure static resources are handled through servlet chain (jsp case for instance)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1350'>TOMEE-1350</a>] -         arquillian class discovering algorithm should ignore test classes which can&#39;t be EJBs
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1351'>TOMEE-1351</a>] -         jaxws doesn&#39;t support ROOT context
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1352'>TOMEE-1352</a>] -         can&#39;t start if there is a space in tomee folder path
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1353'>TOMEE-1353</a>] -         [regression] jsonproviuder no more added 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1357'>TOMEE-1357</a>] -         tomee forces new StandardManager()
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1358'>TOMEE-1358</a>] -         openejb.additional.include not respected
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1359'>TOMEE-1359</a>] -         TomEEInjectionEnricher does not always return correct AppContext
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1362'>TOMEE-1362</a>] -         WsRsTest is not correct
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1364'>TOMEE-1364</a>] -         When using the tomee-maven-plugins stop goal tomee seems to hang forever
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1366'>TOMEE-1366</a>] -         UnsupportedOperationException in CxfEndpoint.doServiceCreate
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1379'>TOMEE-1379</a>] -         TransactionSynchronizationRegistry not found in JNDI for EJB Timer started transactions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1381'>TOMEE-1381</a>] -         wrong property passed as ValidatorFactory to JPA
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1382'>TOMEE-1382</a>] -         allow to override LoaderService of openwebbeans by app in application.properties
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1384'>TOMEE-1384</a>] -         tolerate serialization of undeployed EJB
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1385'>TOMEE-1385</a>] -         in embedded mode with embedded JUL logger allow to change consoleHandlerClazz
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1389'>TOMEE-1389</a>] -         ApplicationComposer should try all possible BeanManager for injections
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1406'>TOMEE-1406</a>] -         Compile error in openejb-core due to an encoding issue
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1407'>TOMEE-1407</a>] -         Invalid filtering configuration for assembly/openejb-standalone which causes a compile error
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1409'>TOMEE-1409</a>] -         Invalid configuration in module openejb-junit
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1414'>TOMEE-1414</a>] -         @Jars works only with a single jar and not all matching jars
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1423'>TOMEE-1423</a>] -         Packaging contains duplicate artifacts with snapshot timestamp
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1429'>TOMEE-1429</a>] -         tomee embedded broken
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1431'>TOMEE-1431</a>] -         tomee embedded ignores server.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1433'>TOMEE-1433</a>] -         Prevent error output on tomee:run&lt;Enter&gt;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1435'>TOMEE-1435</a>] -         flushable datasources not destroyed
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1438'>TOMEE-1438</a>] -         cxf classloader doesn&#39;t delegate properly in equals/hashcode (lookup are broken in tomcat)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1448'>TOMEE-1448</a>] -         container CDI classes shouldn&#39;t be filtered from CDI context
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1449'>TOMEE-1449</a>] -         allow to deploy twice (several hosts) the same app
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1450'>TOMEE-1450</a>] -         Unable to shutdown with whitespace in path because of javaagent error
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1452'>TOMEE-1452</a>] -         reloading doesn&#39;t work with jaxws services for ears
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1457'>TOMEE-1457</a>] -         OpenEJBLoginValidator shouldn&#39;t associate if in tomee
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1460'>TOMEE-1460</a>] -         deploying cxf webservice in host other than localhost
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1462'>TOMEE-1462</a>] -         ApplicationComposer hides assert errors
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1467'>TOMEE-1467</a>] -         embedded http layer doesn&#39;t support repeated query parameters
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1468'>TOMEE-1468</a>] -         ApplicationComposer + CDI for a WebApp breaks startup
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1477'>TOMEE-1477</a>] -         TomEE wont start if added maven-properties to &lt;args&gt;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1480'>TOMEE-1480</a>] -         make possibility to provide conf.d-files for arquillian-tomee-remote adapter
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1481'>TOMEE-1481</a>] -         web-fragment.xml FacesServlet declaration not supported
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1488'>TOMEE-1488</a>] -         basic support of LATEST and LATEST-SNAPSHOT in maven resolver
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1490'>TOMEE-1490</a>] -         Arquillian Test and Local context.xml file not loading correctly
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1491'>TOMEE-1491</a>] -         add a LazyValve
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1495'>TOMEE-1495</a>] -         TomEE won&#39;t load Taglibs from WEB-INF/lib/
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1497'>TOMEE-1497</a>] -         NPE When deploy genericjmsra.rar 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1499'>TOMEE-1499</a>] -         connector modules are not destroyed properly
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1502'>TOMEE-1502</a>] -         CDI interceptors dont work with MDBs
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1503'>TOMEE-1503</a>] -         for ear try to guess is webapp should use delegate loading or not
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1504'>TOMEE-1504</a>] -         undeploy doesn&#39;t always clean up correctly Deployments
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1505'>TOMEE-1505</a>] -         shutdown cxf bus when exiting services (rs/ws)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1507'>TOMEE-1507</a>] -         openejb-rest leaks deployed apps
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1510'>TOMEE-1510</a>] -         CXF Continuations not working for REST services
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1511'>TOMEE-1511</a>] -         Parallel deployment + EJB webservice not working
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1513'>TOMEE-1513</a>] -         catalina.sh does not quote javaagent argument correctly
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1520'>TOMEE-1520</a>] -         A service as a singleton is not working
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1521'>TOMEE-1521</a>] -         Duplicate App Deployment when autoDeploy=&quot;true&quot;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1527'>TOMEE-1527</a>] -         helper cli command to debug/introspect resources (list setters and effective tomee resources)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1528'>TOMEE-1528</a>] -         add LogSqlPackages and openejb.log.sql.packages
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1531'>TOMEE-1531</a>] -         TomEE 2 + Mojarra 2.2.10 NPE when navigating into a flow
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1534'>TOMEE-1534</a>] -         in JAXRS ExceptionException are not always unwrapped
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1535'>TOMEE-1535</a>] -         JAX-RS Subresource paths are chosen incorrectly
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1540'>TOMEE-1540</a>] -         tomee.sh doesn&#39;t support missing JAVA_HOME var
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1546'>TOMEE-1546</a>] -         tomee forces jsf 2 cause of check of scopes
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1549'>TOMEE-1549</a>] -         org.apache.openejb.resource.activemq.ActiveMQ5Factory#createPersistenceAdapter broken for all but kahadb
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1551'>TOMEE-1551</a>] -         URLClassLoaderFirst uses its own lock and not classloader one
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1553'>TOMEE-1553</a>] -         EJBContainerRunner broken with junit 4.12
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1566'>TOMEE-1566</a>] -         [tomee-maven-plugin] Allow for name customizations for .rar apps
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1568'>TOMEE-1568</a>] -         support overriding of a failed deployment in tomcat webappdeployer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1569'>TOMEE-1569</a>] -         openejb Logger (util package) should use container loader to create JUL loggers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1570'>TOMEE-1570</a>] -         OpenEJBLogRecord misses logger name
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1571'>TOMEE-1571</a>] -         arquillian-openejb-embedded doesn&#39;t destroy sessions with application undeployment in embedded http mode
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1576'>TOMEE-1576</a>] -         openejb-http ServletRequest.getSession().invalidate should remove the session cached in the request
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1577'>TOMEE-1577</a>] -         [openejb-http] SessionManager.destroy cleanup does not check if Session got destroyed in the meantime
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1580'>TOMEE-1580</a>] -         Datasource JNDI Name Context not available to eclipselink non jta data source
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1584'>TOMEE-1584</a>] -         ProvisioningUtil does not escape group id for maven-metadata.xml check
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1585'>TOMEE-1585</a>] -         org.apache.openejb.core.ivm.BaseEjbProxyHandler.ProxyRegistry#liveHandleRegistry not thread safe
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1589'>TOMEE-1589</a>] -         LogSql doesn&#39;t support openjpa externalizer/stream
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1590'>TOMEE-1590</a>] -         WsFactory: ClassCastException: java.util.HashSet cannot be cast to java.util.List
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1594'>TOMEE-1594</a>] -         resource sorting for dependency management doesn&#39;t handle transitivity
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1596'>TOMEE-1596</a>] -         AutoDeployer buggy is not using hot deploy
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1599'>TOMEE-1599</a>] -         Session attributes are logged like being unused
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1608'>TOMEE-1608</a>] -         org.apache.openejb.client.RemoteInitialContextFactory doesnt logout authenticated pcp
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1610'>TOMEE-1610</a>] -         [OSGi] Version range problem in openejb-core on bean-asm5
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1615'>TOMEE-1615</a>] -         JTA JDBC proxies always create a connection even if one is already bound to the current transaction
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1621'>TOMEE-1621</a>] -         [jaxrs] EJBException should be unwrapped and rethrown - and not translated to anything else
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1623'>TOMEE-1623</a>] -         openejb-client doesnt support HTTPS KeepAlive caching of the JVM
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1631'>TOMEE-1631</a>] -         Basic Rotating JUL Handler
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1632'>TOMEE-1632</a>] -         org.apache.openejb.client.Client ignored IOException
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1641'>TOMEE-1641</a>] -         openejb deploymentid format changes WS endpoint
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1669'>TOMEE-1669</a>] -         blacklist org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan in our custom ObjectInputStream
-</li>
-</ul>
-    
-<h2>        Dependency upgrade
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1277'>TOMEE-1277</a>] -         cxf 3
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1368'>TOMEE-1368</a>] -         upgrade arquillian-transaction-impl-base to 1.0.1.Final
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1369'>TOMEE-1369</a>] -         arquillian persistence sample
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1370'>TOMEE-1370</a>] -         symbolic links not supported by tomee for @WebXXX
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1391'>TOMEE-1391</a>] -         Use maven-filtering:1.2 to fix MSHARED-319 when compiling under JDK8
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1426'>TOMEE-1426</a>] -         XBean 4.4
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1506'>TOMEE-1506</a>] -         AMQ 5.12.0
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1514'>TOMEE-1514</a>] -         arquillian 1.1.7.Final, ShrinkWrap descriptor 2.0.0-alpha-7 and Shrinkwrap 1.2.2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1543'>TOMEE-1543</a>] -         [lang3] 3.4
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1554'>TOMEE-1554</a>] -         Upgrade OpenJPA to 2.4.0
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1564'>TOMEE-1564</a>] -         geronimo connector/transaction 3.1.2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1620'>TOMEE-1620</a>] -         dbcp2+pool2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1673'>TOMEE-1673</a>] -         Upgrade commons-collections to 3.2.2
-</li>
-</ul>
-    
-<h2>        Documentation
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1264'>TOMEE-1264</a>] -         Doc issue with &quot;cxf.jaxrs.providers&quot;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1605'>TOMEE-1605</a>] -         Status Page for Java EE 7
-</li>
-</ul>
-                
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1269'>TOMEE-1269</a>] -         if a @Path interface has a single implementation add it as rest service
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1270'>TOMEE-1270</a>] -         exclude from scanning @Deprecated @Providers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1272'>TOMEE-1272</a>] -         Do not force use of system property &#39;com.sun.management.jmxremote&#39;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1273'>TOMEE-1273</a>] -         fix SslTomEETest to work with JDK 8 keytool
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1328'>TOMEE-1328</a>] -         Arquillian.xml &#39;additionalLibs&#39; must fail-fast
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1336'>TOMEE-1336</a>] -         Support classname.activated = true/false for auto discovered providers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1339'>TOMEE-1339</a>] -         [JAXRS] try static resources first
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1354'>TOMEE-1354</a>] -         Add &#39;openejb.deployer.binaries.use&#39; automatically for arquillian test on remote machine
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1371'>TOMEE-1371</a>] -         if using kahadb or leveldb or any persistence adapter force broker to be persistent
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1372'>TOMEE-1372</a>] -         when trying to find persistence unit datasources ensure to try exact name first without required property constraint
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1373'>TOMEE-1373</a>] -         AlternativeDriver leaks when used (by default) from applications (resources.xml)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1374'>TOMEE-1374</a>] -         basic detection that container loader can&#39;t create a datasource and fallback on app one
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1375'>TOMEE-1375</a>] -         add an option to deploy &quot;war classpath&quot; using tomee embedded maven plugin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1386'>TOMEE-1386</a>] -         skip org.apache.wink.common.internal. @Provider when using CXF
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1387'>TOMEE-1387</a>] -         tomee embedded arquillian adapter doesn&#39;t delete temp folder as fast as it should/could
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1392'>TOMEE-1392</a>] -         META-INF/org.apache.openejb.extension doesn&#39;t support multiple lines
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1394'>TOMEE-1394</a>] -         mimic official JBoss CDI enricher for method parameter
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1411'>TOMEE-1411</a>] -         allow to create an application composer webapp using all inner classes of the test
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1418'>TOMEE-1418</a>] -         Add Classpath discovery in REST annotations with virtual class path
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1422'>TOMEE-1422</a>] -         Potential NPE when stoping container.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1425'>TOMEE-1425</a>] -         better JMX naming for cxf jaxrs endpoint
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1430'>TOMEE-1430</a>] -         add support for users/roles for tomee embedded
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1434'>TOMEE-1434</a>] -         wire roles/users to tomee embedded arquillian adapter
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1439'>TOMEE-1439</a>] -         @Context SecurityContext doesn&#39;t use SecurityService
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1443'>TOMEE-1443</a>] -         support cxf.jaxws.wsFeatures
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1454'>TOMEE-1454</a>] -         add openejb.force-unit-type property to workaround 8.2.1.5 of JPA 2.0 spec
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1463'>TOMEE-1463</a>] -         support WebServiceFeature for @WebServiceRef as well
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1466'>TOMEE-1466</a>] -         Apply WS-Security config (cxf interceptor) when use @WebService with javax.xml.ws.Service
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1484'>TOMEE-1484</a>] -         Add JMS 2 to spec JAR
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1486'>TOMEE-1486</a>] -         add to jaxws events close to jaxrs ones for consistency (ServerCreated/Destroyed)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1489'>TOMEE-1489</a>] -         Allow ActiveMQ scheduler activation when using kahadb persistence
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1500'>TOMEE-1500</a>] -         MultiPulse bad URI event only fires once
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1516'>TOMEE-1516</a>] -         Add method without optional parameters for Container#deployPathsAsWebapp
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1522'>TOMEE-1522</a>] -         support resources.xml in META-INF of ears
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1529'>TOMEE-1529</a>] -         BaseEjbProxyHandler#equals is super slow when parameter is not a proxy
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1530'>TOMEE-1530</a>] -         (arquillian) OpenEJBEnricher: if app context is null try to find it from classloader
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1548'>TOMEE-1548</a>] -         add @PostConstruct/@PreDestroy support for container resources as well based on Jon&#39;s work
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1558'>TOMEE-1558</a>] -         OpenEJBHttpRegistry should support getting its port from placeholder
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1562'>TOMEE-1562</a>] -         Adjust ConfigurationDeployer scan loop.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1565'>TOMEE-1565</a>] -          org.apache.openejb.OpenEJBException: Unable to load type &#39;XXX&#39; for comp/env/openejb/Resource/&lt;id&gt;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1567'>TOMEE-1567</a>] -         allow to override persistence-unit properties from application.properties (as we already support system props)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1578'>TOMEE-1578</a>] -         dont override tomee.xml if existing and we need to add apps.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1592'>TOMEE-1592</a>] -         support java:/ resource naming
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1593'>TOMEE-1593</a>] -         try to mitigate resouces.xml sorting using a LinkedSet instead of a hashset in AppModule
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1604'>TOMEE-1604</a>] -         stateless eviction thread count should be configurable and not 1 by stateless bean pool
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1617'>TOMEE-1617</a>] -         remove implicit datasource attribute conversion for pools
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1629'>TOMEE-1629</a>] -         Implement a custom integration around log4j2 org.apache.logging.log4j.core.util.ShutdownCallbackRegistry
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1630'>TOMEE-1630</a>] -         activate ejb remote in tomee embedded with a flag
-</li>
-</ul>
-            
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1274'>TOMEE-1274</a>] -         support additionalLibs in arquillian.xml to add libs from mvn coordinates to tomee/lib
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1282'>TOMEE-1282</a>] -         basic @Transactional @TransactionScoped support
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1285'>TOMEE-1285</a>] -         allow jaxrs providers to be CDI bean
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1288'>TOMEE-1288</a>] -         supports default in out propertyplaceholding
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1289'>TOMEE-1289</a>] -         allow user to provide a properties-provider on resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1294'>TOMEE-1294</a>] -         Allow to set System-Property in tomee.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1295'>TOMEE-1295</a>] -         openjpa.EntityManagerFactoryPool support for container persistence unit
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1297'>TOMEE-1297</a>] -         add @Jars annotation to ApplicationComposer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1298'>TOMEE-1298</a>] -         Support JSR 107: JCACHE - Java Temporary Caching API
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1332'>TOMEE-1332</a>] -         support @Startup on CDI beans (@ApplicationScoped or normal scoped beans if the context is active at boot time)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1341'>TOMEE-1341</a>] -         Arquillian support for Suite testing
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1345'>TOMEE-1345</a>] -         basic support of Tomcat embedded in tomee-embedded
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1346'>TOMEE-1346</a>] -         support ciphered values in resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1347'>TOMEE-1347</a>] -         allow to provide a default global properties provider for resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1388'>TOMEE-1388</a>] -         add @JaxrsProviders to ApplicationComposers to add provider classes quickly on WebApp
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1420'>TOMEE-1420</a>] -         tomee-maven-plugin customizers configuration to be able to call java code to customize an instance
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1421'>TOMEE-1421</a>] -         support persistence of javaagent config in tomee maven plugin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1436'>TOMEE-1436</a>] -         create RunAsRule
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1437'>TOMEE-1437</a>] -         create TransactionRule
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1440'>TOMEE-1440</a>] -         support singleDeploymentByArchiveName in tomee arquillian adapters (remote/embedded)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1444'>TOMEE-1444</a>] -         allow extensions through openejb extensions of cxf-rs
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1446'>TOMEE-1446</a>] -         add event BeforeStartEjbs otherwise for timer beans it is surely too late if you want to modify it
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1447'>TOMEE-1447</a>] -         tomee-embedded-maven-plugin should support deployment of multiple applications
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1451'>TOMEE-1451</a>] -         notify through BusCreated event when cxf bus is created
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1458'>TOMEE-1458</a>] -         provide cxf configuration support for @WebServiceRef
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1464'>TOMEE-1464</a>] -         support tomee embedded shades
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1472'>TOMEE-1472</a>] -         @RandomPort for applicationComposer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1473'>TOMEE-1473</a>] -         @SimpleLog for ApplicationComposer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1479'>TOMEE-1479</a>] -         HttpRequestImpl login backed by security service by default
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1482'>TOMEE-1482</a>] -         add ability to log all CDI beans found (OWB scanner)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1483'>TOMEE-1483</a>] -         support destinationLookup activation spec with activemq
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1487'>TOMEE-1487</a>] -         CDI Event based realm
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1494'>TOMEE-1494</a>] -         add a run(Class,String...) utitlity method to ApplicationComposers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1498'>TOMEE-1498</a>] -         basic web resource support for openejb-http
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1512'>TOMEE-1512</a>] -         create basic application composer maven plugin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1517'>TOMEE-1517</a>] -         TomEEEmbeddedRule
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1518'>TOMEE-1518</a>] -         ContainerRule and ApplicationRule
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1526'>TOMEE-1526</a>] -         global (conf/system.properties) openejb.datasource.pool support
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1539'>TOMEE-1539</a>] -         tomee maven plugins: allow to configure server.xml in the pom
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1541'>TOMEE-1541</a>] -         add inlinedTomEEXml to tomee maven plugins
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1542'>TOMEE-1542</a>] -         JAXRS: trailing slash not ignored/handled properly
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1544'>TOMEE-1544</a>] -         openejb.jpa.timer property to deactivate (false) jtaentitymanager timer metrics
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1550'>TOMEE-1550</a>] -         support AMQ plugin config on amq5factory
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1552'>TOMEE-1552</a>] -         add openejb.activemq.deploymentId-as-clientId flag to not force AMQ clientId to ejb deploymentId
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1555'>TOMEE-1555</a>] -         create @PersistenceUnitDefinition
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1556'>TOMEE-1556</a>] -         ApplicationComposer like API for web applications
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1559'>TOMEE-1559</a>] -         provide a basic programmatic way to secure a webapp when using tomee embedded deploy classpath
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1560'>TOMEE-1560</a>] -         tomee-embedded should support a custom realm in configuration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1573'>TOMEE-1573</a>] -         support normal containers (ie not ra ones) in resources.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1574'>TOMEE-1574</a>] -         support Resources as return type of @Module in application composer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1575'>TOMEE-1575</a>] -         heroku PropertiesResourceProvider
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1579'>TOMEE-1579</a>] -         support executable wars just doing an overlay of tomee embedded
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1582'>TOMEE-1582</a>] -         support endorsed and javaagent list for remote tomee arquillian adapter
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1595'>TOMEE-1595</a>] -         ApplicationComposer should support @PersistenceRootUrl for advanced cases
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1597'>TOMEE-1597</a>] -         tomee-maven-plugin: tar:gz support for tomee:build
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1598'>TOMEE-1598</a>] -         tomee-maven-plugin: support main as customizer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1600'>TOMEE-1600</a>] -         tomee-maven-plugin: support exploded war in tomee:build
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1603'>TOMEE-1603</a>] -         support CDI password ciphers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1625'>TOMEE-1625</a>] -         provide a way to recreate a datasource pool - Flushable feature - automatically on SQLException - aka ResetOnError
-</li>
-</ul>
-                                                        
-<h2>        Task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1276'>TOMEE-1276</a>] -         rework TimerExecutor
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1278'>TOMEE-1278</a>] -         tomcat 8.0.x
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1279'>TOMEE-1279</a>] -         integrate batchee
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1280'>TOMEE-1280</a>] -         myfaces 2.2.x
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1317'>TOMEE-1317</a>] -         Ensure full support of JSR-349 Bean Validation 1.1
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1327'>TOMEE-1327</a>] -         log4j2 integration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1331'>TOMEE-1331</a>] -         rework ProvisiningUtil to allow it to support more resolvers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1355'>TOMEE-1355</a>] -         experiment a tomee-embedded flat webapp mode
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1356'>TOMEE-1356</a>] -         tomcat resources are not always well created and can return a Context instead of the real instance
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1588'>TOMEE-1588</a>] -         move tomee to org.apache.tomee groupId
-</li>
-</ul>
-        
-<h2>        Test
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1290'>TOMEE-1290</a>] -         Source build profile &#39;hibernate&#39; requires junit dependency
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1338'>TOMEE-1338</a>] -         Create tests for DeployerEjb
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1523'>TOMEE-1523</a>] -         Pull LegacyClientTest resources init into @BeforeClass
-</li>
-</ul>
-        
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-7.0.0-M1.adoc b/src/main/jbake/content/tomee-7.0.0-M1.adoc
new file mode 100644
index 0000000..4ff1a6e
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.0-M1.adoc
@@ -0,0 +1,49 @@
+= Apache TomEE 7.0.0-M1 released, Dec 11th 2015
+:jbake-type: page
+:jbake-status: published
+
+The Apache TomEE community is proud to announce the release of xref:tomee-7.0.0-M1.adoc[Apache TomEE 7.0.0-M1], which is based on link:http://tomcat.apache.org/tomcat-8.0-doc/index.html[Apache Tomcat 8.0.30] and is our first milestone release towards EE7.
+We know this has been a long time coming, so we thank you for your patience and support.
+
+Please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+
+This version is not certified and is provided to the community as a milestone preview of the current development version.
+It is however an extremly well tested version.
+So please do test your applications and give us your feedback.
+
+The Apache TomEE 7.0.0-M1 release files can be downloaded from here:
+
+xref:download/tomee-7.0.0-M1.adoc[http://tomee.apache.org/download/tomee-7.0.0-M1.html]
+
+== Update Maven POM Files - The OpenEJB version and groupId have been aligned
+
+Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
+
+[source,xml]
+----
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>javaee-api</artifactId>
+	<version>7.0</version>
+	<scope>provided</scope>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>openejb-core</artifactId>
+	<version>7.0.0-M1</version>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>tomee</artifactId>
+	<version>7.0.0-M1</version>
+</dependency>
+----
+
+A complete xref:tomee-7.0.0-M1-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-7.0.0-M1-release-notes.adoc[tomee-7.0.0-M1-release-notes.html]
+
+Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE].
+You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
diff --git a/src/main/jbake/content/tomee-7.0.0-M1.md b/src/main/jbake/content/tomee-7.0.0-M1.md
deleted file mode 100644
index 095da65..0000000
--- a/src/main/jbake/content/tomee-7.0.0-M1.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Apache TomEE 7.0.0-M1 released, Dec 11th 2015
-
-The Apache TomEE community is proud to announce the release of [Apache TomEE 7.0.0-M1](download/tomee-7.0.0-M1.html), which is based on [Apache Tomcat 8.0.30](http://tomcat.apache.org/tomcat-8.0-doc/index.html) and is our first milestone release towards EE7.
-We know this has been a long time coming, so we thank you for your patience and support.
-
-Please feel free to check out and [contribute to the developer branch](contribute.html) - We are always interested in any help from the community that we can get.
-
-This version is not certified and is provided to the community as a milestone preview of the current development version. It is however an extremly well tested version. So please do test your applications and give us your feedback.
-
-The Apache TomEE 7.0.0-M1 release files can be downloaded from here:
-
-[http://tomee.apache.org/download/tomee-7.0.0-M1.html](download/tomee-7.0.0-M1.html)
-
-###Update Maven POM Files - The OpenEJB version and groupId have been aligned
-
-Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
-
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>javaee-api</artifactId>
-		<version>7.0</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>openejb-core</artifactId>
-		<version>7.0.0-M1</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>tomee</artifactId>
-		<version>7.0.0-M1</version>
-	</dependency>
-
-A complete [Changelog](tomee-7.0.0-M1-release-notes.html) can be viewed here:
-
-[tomee-7.0.0-M1-release-notes.html](tomee-7.0.0-M1-release-notes.html)
-
-Please feel free to jump in feet first and [get started with TomEE](documentation.html). You will nearly always find someone to help you on one of our [support channels](support.html).
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-7.0.0-M2-release-notes.adoc b/src/main/jbake/content/tomee-7.0.0-M2-release-notes.adoc
new file mode 100644
index 0000000..e81c679
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.0-M2-release-notes.adoc
@@ -0,0 +1,80 @@
+= Release Notes - TomEE - Version 7.0.0-M2
+:jbake-type: page
+:jbake-status: published
+
+== Bug
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1640[TOMEE-1640] - TomEE should &quot;scan&quot;
+a possible CDI beans if a NoClassDefFoundError occurs before registering it
+* link:https://issues.apache.org/jira/browse/TOMEE-1644[TOMEE-1644] - synchronization ignored for entity managers using extended contexts
+* link:https://issues.apache.org/jira/browse/TOMEE-1645[TOMEE-1645] - tomee.sh ignored common.loader
+* link:https://issues.apache.org/jira/browse/TOMEE-1646[TOMEE-1646] - tomee.sh cipher swallows exceptions
+* link:https://issues.apache.org/jira/browse/TOMEE-1649[TOMEE-1649] - Websockets Memory Leak
+* link:https://issues.apache.org/jira/browse/TOMEE-1655[TOMEE-1655] - ApplicationComposers not isolating @Configuration for each test class.
+* link:https://issues.apache.org/jira/browse/TOMEE-1663[TOMEE-1663] - org.apache.openejb.assembler.classic.Assembler#destroyResourceTree doesnt detect resource adapter properly, can lead to bad connection factory shutdown
+* link:https://issues.apache.org/jira/browse/TOMEE-1672[TOMEE-1672] - user transaction not accessible during startup in webapps
+* link:https://issues.apache.org/jira/browse/TOMEE-1681[TOMEE-1681] - Upgrade &#39;<cxf.version>&#39;
+property in openejb.pom to 3.1.3
+* link:https://issues.apache.org/jira/browse/TOMEE-1685[TOMEE-1685] - Persistence and PersistenceUnit shouldnt be counted as module and lead webapps to be considered as ear in application composer
+* link:https://issues.apache.org/jira/browse/TOMEE-1686[TOMEE-1686] - org.apache.openejb.core.cmp.CmpContainer#findEJBObject supposes args array is not empty
+* link:https://issues.apache.org/jira/browse/TOMEE-1687[TOMEE-1687] - ServletContext not accesible during ApplicationScoped Initialized event
+* link:https://issues.apache.org/jira/browse/TOMEE-1689[TOMEE-1689] - arquillian tomee remote can miss test classes in webapp of ears
+* link:https://issues.apache.org/jira/browse/TOMEE-1695[TOMEE-1695] - ManagedExecutorService not propagating a request.login() when used in a servlet
+* link:https://issues.apache.org/jira/browse/TOMEE-1696[TOMEE-1696] - Lazy resources can use app classloader instead of container loader
+* link:https://issues.apache.org/jira/browse/TOMEE-1698[TOMEE-1698] - BeanManager no more set in ServletContext attributes
+* link:https://issues.apache.org/jira/browse/TOMEE-1699[TOMEE-1699] - [tomee-maven-plugin] dont quote systemVariables
+* link:https://issues.apache.org/jira/browse/TOMEE-1702[TOMEE-1702] - BaseEjbProxyHandler live proxy registry can leak for cmp beans
+* link:https://issues.apache.org/jira/browse/TOMEE-1703[TOMEE-1703] - finder not available for ear webapp making ServletcContextInitializer broken
+* link:https://issues.apache.org/jira/browse/TOMEE-1704[TOMEE-1704] - makes active config property override working and support placeholders
+* link:https://issues.apache.org/jira/browse/TOMEE-1705[TOMEE-1705] - Destroy application attempts to initialize lazily loaded resources
+* link:https://issues.apache.org/jira/browse/TOMEE-1706[TOMEE-1706] - Standalone WAR (autoWar) gets not deployed at / (ROOT)
+* link:https://issues.apache.org/jira/browse/TOMEE-1710[TOMEE-1710] - resources.xml resource ClassCastException
+* link:https://issues.apache.org/jira/browse/TOMEE-1711[TOMEE-1711] - cxf-rs doesn&#39;t work in embedded mode if request is wrapped in HttpServletRequestWrapper
+* link:https://issues.apache.org/jira/browse/TOMEE-1713[TOMEE-1713] - ensure OpenWebBeans services can be extended using application.properties
+* link:https://issues.apache.org/jira/browse/TOMEE-1721[TOMEE-1721] - no module (webapp here) webservices can lead to NPE
+
+== Dependency upgrade
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1633[TOMEE-1633] - upgrade javamail to 1.9.0-alpha-2
+* link:https://issues.apache.org/jira/browse/TOMEE-1659[TOMEE-1659] - upgrade to mojarra 2.2.9
+* link:https://issues.apache.org/jira/browse/TOMEE-1670[TOMEE-1670] - xbean 4.5
+* link:https://issues.apache.org/jira/browse/TOMEE-1674[TOMEE-1674] - tomcat 8.0.32
+* link:https://issues.apache.org/jira/browse/TOMEE-1676[TOMEE-1676] - ActiveMQ 5.13
+* link:https://issues.apache.org/jira/browse/TOMEE-1679[TOMEE-1679] - myfaces 2.2.9
+* link:https://issues.apache.org/jira/browse/TOMEE-1680[TOMEE-1680] - mojarra 2.2.12
+* link:https://issues.apache.org/jira/browse/TOMEE-1684[TOMEE-1684] - CXF 3.1.5
+* link:https://issues.apache.org/jira/browse/TOMEE-1700[TOMEE-1700] - upgrade Johnzon to 0.9.3
+* link:https://issues.apache.org/jira/browse/TOMEE-1707[TOMEE-1707] - bval 1.1.1
+* link:https://issues.apache.org/jira/browse/TOMEE-1716[TOMEE-1716] - openjpa 2.4.1
+* link:https://issues.apache.org/jira/browse/TOMEE-1717[TOMEE-1717] - OpenWebBeans 1.6.3
+
+== Improvement
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1642[TOMEE-1642] - Would be nice that tomee logs JAXRS configuration in use (was: sends an INFO when not found the relative class for pojo-deployment in configuration [openejb-jar.xml])
+* link:https://issues.apache.org/jira/browse/TOMEE-1643[TOMEE-1643] - XADataSource can leak connections/skip the pool
+* link:https://issues.apache.org/jira/browse/TOMEE-1650[TOMEE-1650] - ignore tomee webapp and internal application by default
+* link:https://issues.apache.org/jira/browse/TOMEE-1656[TOMEE-1656] - {jaxrs provider qualifier name}.activated ignored for mandatory providers
+* link:https://issues.apache.org/jira/browse/TOMEE-1657[TOMEE-1657] - skip ValidationExceptionMapper if the user registers one
+* link:https://issues.apache.org/jira/browse/TOMEE-1694[TOMEE-1694] - remove workaround for websockets CDI releasing since tomcat cleans server endpoints
+* link:https://issues.apache.org/jira/browse/TOMEE-1708[TOMEE-1708] - [arquillian] use configured temp dir (arquillian.xml) instead of target to download tomee
+
+== New Feature
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1651[TOMEE-1651] - support char[] password decryption (not String)
+* link:https://issues.apache.org/jira/browse/TOMEE-1652[TOMEE-1652] - add cdiStereotypes() to @Classes in ApplicationComposer API
+* link:https://issues.apache.org/jira/browse/TOMEE-1653[TOMEE-1653] - add hooks in tomee:exec runner
+* link:https://issues.apache.org/jira/browse/TOMEE-1660[TOMEE-1660] - tomee embedded should support web resource cache configuration
+* link:https://issues.apache.org/jira/browse/TOMEE-1667[TOMEE-1667] - add published-url in cxf.jax*.
+properties in openejb-jar.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-1668[TOMEE-1668] - add objectName configuration to @MBean
+* link:https://issues.apache.org/jira/browse/TOMEE-1675[TOMEE-1675] - TomEE embedded EJBContainer implementation ignores container properties
+* link:https://issues.apache.org/jira/browse/TOMEE-1682[TOMEE-1682] - support tomee archives without a root folder in tomee maven plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-1690[TOMEE-1690] - [tomee maven plugin] add jsCustomizers and groovyCustomizers option
+* link:https://issues.apache.org/jira/browse/TOMEE-1701[TOMEE-1701] - add a single instance ApplicationComposer (SingleApplicationComposerRunner)
+* link:https://issues.apache.org/jira/browse/TOMEE-1709[TOMEE-1709] - [tomee-embedded-maven-plugin] LiveReload integration
+* link:https://issues.apache.org/jira/browse/TOMEE-1714[TOMEE-1714] - add TomEEProxyHandler property in datasources to support custom proxying
+* link:https://issues.apache.org/jira/browse/TOMEE-1715[TOMEE-1715] - basic part support in openejb-http (embedded)
diff --git a/src/main/jbake/content/tomee-7.0.0-M2-release-notes.md b/src/main/jbake/content/tomee-7.0.0-M2-release-notes.md
deleted file mode 100644
index ef57dc6..0000000
--- a/src/main/jbake/content/tomee-7.0.0-M2-release-notes.md
+++ /dev/null
@@ -1,138 +0,0 @@
-
-        Release Notes - TomEE - Version 7.0.0-M2
-
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1640'>TOMEE-1640</a>] -         TomEE should &quot;scan&quot; a possible CDI beans if a NoClassDefFoundError occurs before registering it
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1644'>TOMEE-1644</a>] -         synchronization ignored for entity managers using extended contexts
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1645'>TOMEE-1645</a>] -         tomee.sh ignored common.loader
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1646'>TOMEE-1646</a>] -         tomee.sh cipher swallows exceptions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1649'>TOMEE-1649</a>] -         Websockets Memory Leak
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1655'>TOMEE-1655</a>] -         ApplicationComposers not isolating @Configuration for each test class.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1663'>TOMEE-1663</a>] -         org.apache.openejb.assembler.classic.Assembler#destroyResourceTree doesnt detect resource adapter properly, can lead to bad connection factory shutdown
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1672'>TOMEE-1672</a>] -         user transaction not accessible during startup in webapps
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1681'>TOMEE-1681</a>] -         Upgrade &#39;&lt;cxf.version&gt;&#39; property in openejb.pom to 3.1.3
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1685'>TOMEE-1685</a>] -         Persistence and PersistenceUnit shouldnt be counted as module and lead webapps to be considered as ear in application composer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1686'>TOMEE-1686</a>] -         org.apache.openejb.core.cmp.CmpContainer#findEJBObject supposes args array is not empty
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1687'>TOMEE-1687</a>] -         ServletContext not accesible during ApplicationScoped Initialized event
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1689'>TOMEE-1689</a>] -         arquillian tomee remote can miss test classes in webapp of ears
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1695'>TOMEE-1695</a>] -         ManagedExecutorService not propagating a request.login() when used in a servlet
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1696'>TOMEE-1696</a>] -         Lazy resources can use app classloader instead of container loader
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1698'>TOMEE-1698</a>] -         BeanManager no more set in ServletContext attributes
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1699'>TOMEE-1699</a>] -         [tomee-maven-plugin] dont quote systemVariables
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1702'>TOMEE-1702</a>] -         BaseEjbProxyHandler live proxy registry can leak for cmp beans
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1703'>TOMEE-1703</a>] -         finder not available for ear webapp making ServletcContextInitializer broken
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1704'>TOMEE-1704</a>] -         makes active config property override working and support placeholders
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1705'>TOMEE-1705</a>] -         Destroy application attempts to initialize lazily loaded resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1706'>TOMEE-1706</a>] -         Standalone WAR (autoWar) gets not deployed at / (ROOT)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1710'>TOMEE-1710</a>] -         resources.xml resource ClassCastException
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1711'>TOMEE-1711</a>] -         cxf-rs doesn&#39;t work in embedded mode if request is wrapped in HttpServletRequestWrapper
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1713'>TOMEE-1713</a>] -         ensure OpenWebBeans services can be extended using application.properties
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1721'>TOMEE-1721</a>] -         no module (webapp here) webservices can lead to NPE
-</li>
-</ul>
-
-<h2>        Dependency upgrade
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1633'>TOMEE-1633</a>] -         upgrade javamail to 1.9.0-alpha-2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1659'>TOMEE-1659</a>] -         upgrade to mojarra 2.2.9
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1670'>TOMEE-1670</a>] -         xbean 4.5
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1674'>TOMEE-1674</a>] -         tomcat 8.0.32
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1676'>TOMEE-1676</a>] -         ActiveMQ 5.13
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1679'>TOMEE-1679</a>] -         myfaces 2.2.9
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1680'>TOMEE-1680</a>] -         mojarra 2.2.12
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1684'>TOMEE-1684</a>] -         CXF 3.1.5
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1700'>TOMEE-1700</a>] -         upgrade Johnzon to 0.9.3
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1707'>TOMEE-1707</a>] -         bval 1.1.1
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1716'>TOMEE-1716</a>] -         openjpa 2.4.1
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1717'>TOMEE-1717</a>] -         OpenWebBeans 1.6.3
-</li>
-</ul>
-
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1642'>TOMEE-1642</a>] -         Would be nice that tomee logs JAXRS configuration in use (was: sends an INFO when not found the relative class for pojo-deployment in configuration [openejb-jar.xml])
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1643'>TOMEE-1643</a>] -         XADataSource can leak connections/skip the pool
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1650'>TOMEE-1650</a>] -         ignore tomee webapp and internal application by default
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1656'>TOMEE-1656</a>] -         {jaxrs provider qualifier name}.activated ignored for mandatory providers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1657'>TOMEE-1657</a>] -         skip ValidationExceptionMapper if the user registers one
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1694'>TOMEE-1694</a>] -         remove workaround for websockets CDI releasing since tomcat cleans server endpoints
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1708'>TOMEE-1708</a>] -         [arquillian] use configured temp dir (arquillian.xml) instead of target to download tomee
-</li>
-</ul>
-
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1651'>TOMEE-1651</a>] -         support char[] password decryption (not String)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1652'>TOMEE-1652</a>] -         add cdiStereotypes() to @Classes in ApplicationComposer API
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1653'>TOMEE-1653</a>] -         add hooks in tomee:exec runner
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1660'>TOMEE-1660</a>] -         tomee embedded should support web resource cache configuration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1667'>TOMEE-1667</a>] -         add published-url in cxf.jax*. properties in openejb-jar.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1668'>TOMEE-1668</a>] -         add objectName configuration to @MBean
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1675'>TOMEE-1675</a>] -         TomEE embedded EJBContainer implementation ignores container properties
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1682'>TOMEE-1682</a>] -         support tomee archives without a root folder in tomee maven plugin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1690'>TOMEE-1690</a>] -         [tomee maven plugin] add jsCustomizers and groovyCustomizers option
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1701'>TOMEE-1701</a>] -         add a single instance ApplicationComposer (SingleApplicationComposerRunner)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1709'>TOMEE-1709</a>] -         [tomee-embedded-maven-plugin] LiveReload integration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1714'>TOMEE-1714</a>] -         add TomEEProxyHandler property in datasources to support custom proxying
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1715'>TOMEE-1715</a>] -         basic part support in openejb-http (embedded)
-</li>
-</ul>
diff --git a/src/main/jbake/content/tomee-7.0.0-M2.adoc b/src/main/jbake/content/tomee-7.0.0-M2.adoc
new file mode 100644
index 0000000..f5fc049
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.0-M2.adoc
@@ -0,0 +1,52 @@
+= Apache TomEE 7.0.0-M2 released, Feb 29th 2016
+:jbake-type: page
+:jbake-status: published
+
+The Apache TomEE community is proud to announce the release of 
+//FIXME CHOOSE ONE
+xref:tomee-7.0.0-M2.adoc[]
+xref:tomee-7.0.0-M2.adoc[Apache TomEE 7.0.0-M2], which is based on http://tomcat.apache.org/tomcat-8.0-doc/index.html[Apache Tomcat 8.0.32] and is our first milestone release towards EE7.
+We know this has been a long time coming, so we thank you for your patience and support.
+
+Please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+
+This version is not certified and is provided to the community as a milestone preview of the current development version.
+It is however an extremly well tested version.
+So please do test your applications and give us your feedback.
+
+The Apache TomEE 7.0.0-M2 release files can be downloaded from here:
+
+xref:download/tomee-7.0.0-M2.adoc[http://tomee.apache.org/download/tomee-7.0.0-M2.html]
+
+== Update Maven POM Files - The OpenEJB version and groupId have been aligned
+
+Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
+
+[source,xml]
+----
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>javaee-api</artifactId>
+	<version>7.0</version>
+	<scope>provided</scope>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>openejb-core</artifactId>
+	<version>7.0.0-M2</version>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>tomee</artifactId>
+	<version>7.0.0-M2</version>
+</dependency>
+----
+
+A complete xref:tomee-7.0.0-M2-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-7.0.0-M2-release-notes.adoc[tomee-7.0.0-M2-release-notes.html]
+
+Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE].
+You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
diff --git a/src/main/jbake/content/tomee-7.0.0-M2.md b/src/main/jbake/content/tomee-7.0.0-M2.md
deleted file mode 100644
index 8f2b5b3..0000000
--- a/src/main/jbake/content/tomee-7.0.0-M2.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Apache TomEE 7.0.0-M2 released, Feb 29th 2016
-
-The Apache TomEE community is proud to announce the release of [Apache TomEE 7.0.0-M2](download/tomee-7.0.0-M2.html), which is based on [Apache Tomcat 8.0.32](http://tomcat.apache.org/tomcat-8.0-doc/index.html) and is our first milestone release towards EE7.
-We know this has been a long time coming, so we thank you for your patience and support.
-
-Please feel free to check out and [contribute to the developer branch](contribute.html) - We are always interested in any help from the community that we can get.
-
-This version is not certified and is provided to the community as a milestone preview of the current development version. It is however an extremly well tested version. So please do test your applications and give us your feedback.
-
-The Apache TomEE 7.0.0-M2 release files can be downloaded from here:
-
-[http://tomee.apache.org/download/tomee-7.0.0-M2.html](download/tomee-7.0.0-M2.html)
-
-###Update Maven POM Files - The OpenEJB version and groupId have been aligned
-
-Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
-
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>javaee-api</artifactId>
-		<version>7.0</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>openejb-core</artifactId>
-		<version>7.0.0-M2</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>tomee</artifactId>
-		<version>7.0.0-M2</version>
-	</dependency>
-
-A complete [Changelog](tomee-7.0.0-M2-release-notes.html) can be viewed here:
-
-[tomee-7.0.0-M2-release-notes.html](tomee-7.0.0-M2-release-notes.html)
-
-Please feel free to jump in feet first and [get started with TomEE](documentation.html). You will nearly always find someone to help you on one of our [support channels](support.html).
diff --git a/src/main/jbake/content/tomee-7.0.0-M3-release-notes.adoc b/src/main/jbake/content/tomee-7.0.0-M3-release-notes.adoc
new file mode 100644
index 0000000..d8c6a4b
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.0-M3-release-notes.adoc
@@ -0,0 +1,12 @@
+= Release Notes - TomEE - Version 7.0.0-M3
+:jbake-type: page
+:jbake-status: published
+
+== Bug
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1638[TOMEE-1638] - tomee:exec on Windows produces invalid tomee.zip due to backslash directory separators
+* link:https://issues.apache.org/jira/browse/TOMEE-1718[TOMEE-1718] - Potential NPE when servlet class is not set defining a JAXRS application mapping
+* link:https://issues.apache.org/jira/browse/TOMEE-1719[TOMEE-1719] - support application/*+json by default
+* link:https://issues.apache.org/jira/browse/TOMEE-1721[TOMEE-1721] - no module (webapp here) webservices can lead to NPE
+* link:https://issues.apache.org/jira/browse/TOMEE-1724[TOMEE-1724] - BVal enforces java 8 usage
diff --git a/src/main/jbake/content/tomee-7.0.0-M3-release-notes.md b/src/main/jbake/content/tomee-7.0.0-M3-release-notes.md
deleted file mode 100644
index 04fb75b..0000000
--- a/src/main/jbake/content/tomee-7.0.0-M3-release-notes.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-        Release Notes - TomEE - Version 7.0.0-M3
-
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1638'>TOMEE-1638</a>] -         tomee:exec on Windows produces invalid tomee.zip due to backslash directory separators
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1718'>TOMEE-1718</a>] -         Potential NPE when servlet class is not set defining a JAXRS application mapping
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1719'>TOMEE-1719</a>] -         support application/*+json by default
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1721'>TOMEE-1721</a>] -         no module (webapp here) webservices can lead to NPE
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1724'>TOMEE-1724</a>] -         BVal enforces java 8 usage
-</li>
-</ul>
diff --git a/src/main/jbake/content/tomee-7.0.0-M3.adoc b/src/main/jbake/content/tomee-7.0.0-M3.adoc
new file mode 100644
index 0000000..538f066
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.0-M3.adoc
@@ -0,0 +1,50 @@
+= Apache TomEE 7.0.0-M3 released, Mar 06th 2016
+:jbake-type: page
+:jbake-status: published
+
+The Apache TomEE community is proud to announce the release of xref:tomee-7.0.0-M3.adoc[Apache TomEE 7.0.0-M3], which is based on http://tomcat.apache.org/tomcat-8.0-doc/index.html[Apache Tomcat 8.0.32] and is our first milestone release towards EE7.
+Part of this release an important security fix is included if EJBd is active on your instance (true by default).
+More on xref:security/tomee.adoc[CVE-2016-0779].
+
+Please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+
+This version is not certified and is provided to the community as a milestone preview of the current development version.
+It is however an extremly well tested version.
+So please do test your applications and give us your feedback.
+
+The Apache TomEE 7.0.0-M3 release files can be downloaded from here:
+
+xref:download/tomee-7.0.0-M3.adoc[http://tomee.apache.org/download/tomee-7.0.0-M3.html]
+
+== Update Maven POM Files - The OpenEJB version and groupId have been aligned
+
+Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
+
+[source,xml]
+----
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>javaee-api</artifactId>
+	<version>7.0</version>
+	<scope>provided</scope>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>openejb-core</artifactId>
+	<version>7.0.0-M3</version>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>tomee</artifactId>
+	<version>7.0.0-M3</version>
+</dependency>
+----
+
+A complete xref:tomee-7.0.0-M3-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-7.0.0-M3-release-notes.adoc[tomee-7.0.0-M3-release-notes.html]
+
+Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE].
+You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
diff --git a/src/main/jbake/content/tomee-7.0.0-M3.md b/src/main/jbake/content/tomee-7.0.0-M3.md
deleted file mode 100644
index e0ef9aa..0000000
--- a/src/main/jbake/content/tomee-7.0.0-M3.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Apache TomEE 7.0.0-M3 released, Mar 06th 2016
-
-The Apache TomEE community is proud to announce the release of [Apache TomEE 7.0.0-M3](download/tomee-7.0.0-M3.html), which is based on [Apache Tomcat 8.0.32](http://tomcat.apache.org/tomcat-8.0-doc/index.html) and is our first milestone release towards EE7.
-Part of this release an important security fix is included if EJBd is active on your instance (true by default). More on [CVE-2016-0779](security/tomee.html).
-
-Please feel free to check out and [contribute to the developer branch](contribute.html) - We are always interested in any help from the community that we can get.
-
-This version is not certified and is provided to the community as a milestone preview of the current development version. It is however an extremly well tested version. So please do test your applications and give us your feedback.
-
-The Apache TomEE 7.0.0-M3 release files can be downloaded from here:
-
-[http://tomee.apache.org/download/tomee-7.0.0-M3.html](download/tomee-7.0.0-M3.html)
-
-###Update Maven POM Files - The OpenEJB version and groupId have been aligned
-
-Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
-
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>javaee-api</artifactId>
-		<version>7.0</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>openejb-core</artifactId>
-		<version>7.0.0-M3</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>tomee</artifactId>
-		<version>7.0.0-M3</version>
-	</dependency>
-
-A complete [Changelog](tomee-7.0.0-M3-release-notes.html) can be viewed here:
-
-[tomee-7.0.0-M3-release-notes.html](tomee-7.0.0-M3-release-notes.html)
-
-Please feel free to jump in feet first and [get started with TomEE](documentation.html). You will nearly always find someone to help you on one of our [support channels](support.html).
diff --git a/src/main/jbake/content/tomee-7.0.0-release-notes.adoc b/src/main/jbake/content/tomee-7.0.0-release-notes.adoc
new file mode 100644
index 0000000..8c945e4
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.0-release-notes.adoc
@@ -0,0 +1,154 @@
+= Release Notes - TomEE - Version 7.0.0
+:jbake-type: page
+:jbake-status: published
+
+== Sub-task
+
+* link:https://issues.apache.org/jira/browse/TOMEE-1322[TOMEE-1322] - Client API
+
+== Bug
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1266[TOMEE-1266] - Unable to configure a datasource with TomEE in context of Oracle Wallet
+* link:https://issues.apache.org/jira/browse/TOMEE-1268[TOMEE-1268] - Auto scanning of @Provider
+* link:https://issues.apache.org/jira/browse/TOMEE-1275[TOMEE-1275] - TimerExecutor as compoenent doesn&#39;t follow executor lifecycle (stop/start)
+* link:https://issues.apache.org/jira/browse/TOMEE-1281[TOMEE-1281] - JAXRS doesn&#39;t work with deltaspike in Application#getSingleton
+* link:https://issues.apache.org/jira/browse/TOMEE-1296[TOMEE-1296] - org.apache.openejb.jpa.integration.eclipselink.OpenEJBServerPlatform mbeanServer name is wrong
+* link:https://issues.apache.org/jira/browse/TOMEE-1324[TOMEE-1324] - Problem with TomEE Maven archetype
+* link:https://issues.apache.org/jira/browse/TOMEE-1325[TOMEE-1325] - Dynamic subclassing doesn&#39;t support interfaces (@Local)
+* link:https://issues.apache.org/jira/browse/TOMEE-1329[TOMEE-1329] - jars.txt doesn&#39;t support empty lines
+* link:https://issues.apache.org/jira/browse/TOMEE-1330[TOMEE-1330] - Support to include container urls in scanning
+* link:https://issues.apache.org/jira/browse/TOMEE-1334[TOMEE-1334] - cdi lazy realm throws NPE cause of init handling (too early)
+* link:https://issues.apache.org/jira/browse/TOMEE-1335[TOMEE-1335] - openejb.deployer.save-deployments broken on war
+* link:https://issues.apache.org/jira/browse/TOMEE-1342[TOMEE-1342] - OutputGeneratedDescriptors doesn&#39;t output complete ejb-jar.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-1343[TOMEE-1343] - HSQL server shuts down saying no databases available
+* link:https://issues.apache.org/jira/browse/TOMEE-1364[TOMEE-1364] - When using the tomee-maven-plugins stop goal tomee seems to hang forever
+* link:https://issues.apache.org/jira/browse/TOMEE-1376[TOMEE-1376] - Invalid package within groovy script
+* link:https://issues.apache.org/jira/browse/TOMEE-1398[TOMEE-1398] - The project maven-util doesn&#39;t contain the Log interface on it&#39;s classpath
+* link:https://issues.apache.org/jira/browse/TOMEE-1400[TOMEE-1400] - Potential NPE in TomeeAnnotationProvider
+* link:https://issues.apache.org/jira/browse/TOMEE-1408[TOMEE-1408] - Incorrect assertions within the testcode
+* link:https://issues.apache.org/jira/browse/TOMEE-1409[TOMEE-1409] - Invalid configuration in module openejb-junit
+* link:https://issues.apache.org/jira/browse/TOMEE-1509[TOMEE-1509] - PropertyPlaceHolderHelper does not work with cipher:
+* link:https://issues.apache.org/jira/browse/TOMEE-1519[TOMEE-1519] - SetupCommand fails to delete file/dir on Windows
+* link:https://issues.apache.org/jira/browse/TOMEE-1606[TOMEE-1606] - Bad conversion of DataSource password containing special characters
+* link:https://issues.apache.org/jira/browse/TOMEE-1626[TOMEE-1626] - Maven Tomee Exec Mojo failed when provided server.xml use env vars
+* link:https://issues.apache.org/jira/browse/TOMEE-1725[TOMEE-1725] - ManagedConnection#equals broken when not using dbcp
+* link:https://issues.apache.org/jira/browse/TOMEE-1726[TOMEE-1726] - StreamOutput not considered as a stream
+* link:https://issues.apache.org/jira/browse/TOMEE-1727[TOMEE-1727] - Application.getSingletons doesn&#39;t handle @Provider right creating warnings
+* link:https://issues.apache.org/jira/browse/TOMEE-1728[TOMEE-1728] - ApplicationComposers.run calls twice @PostConstruct of the application
+* link:https://issues.apache.org/jira/browse/TOMEE-1729[TOMEE-1729] - empty context path for application composer applications can lead to wrong http routing
+* link:https://issues.apache.org/jira/browse/TOMEE-1730[TOMEE-1730] - bad regex for embedded http layer and filter mapping when ending by *
+* link:https://issues.apache.org/jira/browse/TOMEE-1731[TOMEE-1731] - web.xml should override @ApplicationPath and not concatenate both paths
+* link:https://issues.apache.org/jira/browse/TOMEE-1739[TOMEE-1739] - Javaagent arguments ignored by tomee-maven-plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-1740[TOMEE-1740] - Ensure Contexts propagates in ManagedExecutors the exchange to be able to inject RS @Context in async endpoints
+* link:https://issues.apache.org/jira/browse/TOMEE-1741[TOMEE-1741] - Incorrect log message
+* link:https://issues.apache.org/jira/browse/TOMEE-1742[TOMEE-1742] - application composer mvn plugins don&#39;t work with maven > 3.0
+* link:https://issues.apache.org/jira/browse/TOMEE-1748[TOMEE-1748] - managed executor factory should support a Threadfactory (not a Managed one) as thread factory
+* link:https://issues.apache.org/jira/browse/TOMEE-1751[TOMEE-1751] - RemoteServer doesnt support system properties with equals in values
+* link:https://issues.apache.org/jira/browse/TOMEE-1759[TOMEE-1759] - JSF NPE in FashImpl with nested/forward request
+* link:https://issues.apache.org/jira/browse/TOMEE-1764[TOMEE-1764] - JSP @Resource not honored if only in JSP
+* link:https://issues.apache.org/jira/browse/TOMEE-1765[TOMEE-1765] - @Transactional doesn&#39;t throw as cause synchronization exceptions
+* link:https://issues.apache.org/jira/browse/TOMEE-1767[TOMEE-1767] - @DataSourceDefinition doesn&#39;t support XADataSource
+* link:https://issues.apache.org/jira/browse/TOMEE-1770[TOMEE-1770] - @Initialized(AppScoped) not using the right classloader in tomee-embedded
+* link:https://issues.apache.org/jira/browse/TOMEE-1772[TOMEE-1772] - Singleton DependsOnTest fails most of the times
+* link:https://issues.apache.org/jira/browse/TOMEE-1777[TOMEE-1777] - some resources are not properly removed from OpenEjbConfiguration
+* link:https://issues.apache.org/jira/browse/TOMEE-1785[TOMEE-1785] - activate bean validation with jaxrs by default
+* link:https://issues.apache.org/jira/browse/TOMEE-1786[TOMEE-1786] - BvalCdiFilter is not active
+* link:https://issues.apache.org/jira/browse/TOMEE-1787[TOMEE-1787] - EJBExceptionMapper can end up in a NPE
+* link:https://issues.apache.org/jira/browse/TOMEE-1788[TOMEE-1788] - TomEE fails to start embedded ActiveMQ
+* link:https://issues.apache.org/jira/browse/TOMEE-1791[TOMEE-1791] - property-provider should be properties-provider for tomee.xml on resources
+* link:https://issues.apache.org/jira/browse/TOMEE-1792[TOMEE-1792] - Eclipselink integration not working in flat classloader mode
+* link:https://issues.apache.org/jira/browse/TOMEE-1796[TOMEE-1796] - dont add war resources when running a .war with tomee embedded
+* link:https://issues.apache.org/jira/browse/TOMEE-1799[TOMEE-1799] - Java 8 : java.lang.IllegalArgumentException: Comparison method violates its general contract!
+* link:https://issues.apache.org/jira/browse/TOMEE-1800[TOMEE-1800] - SystemProperty not merged when using Import in tomee.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-1805[TOMEE-1805] - HttpServletRequest#logout doesn&#39;t clear authenticated identity in EJB
+* link:https://issues.apache.org/jira/browse/TOMEE-1806[TOMEE-1806] - GeronimoConnectionManager background connection validation not working
+* link:https://issues.apache.org/jira/browse/TOMEE-1811[TOMEE-1811] - IllegalArgumentException - File [xxxxxx.jar!/META-INF/persistence.xml] does not exist:
+* link:https://issues.apache.org/jira/browse/TOMEE-1816[TOMEE-1816] - java.lang.NoSuchFieldException: pool in Connector Resource Adapter deploy
+
+== Dependency upgrade
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1391[TOMEE-1391] - Use maven-filtering:1.2 to fix MSHARED-319 when compiling under JDK8
+* link:https://issues.apache.org/jira/browse/TOMEE-1754[TOMEE-1754] - Tomcat 8.5.2
+* link:https://issues.apache.org/jira/browse/TOMEE-1757[TOMEE-1757] - [plume] eclipselinks 2.6.3
+* link:https://issues.apache.org/jira/browse/TOMEE-1760[TOMEE-1760] - CXf 3.1.6
+* link:https://issues.apache.org/jira/browse/TOMEE-1776[TOMEE-1776] - myfaces 2.2.10
+* link:https://issues.apache.org/jira/browse/TOMEE-1781[TOMEE-1781] - slf4j 1.7.21
+* link:https://issues.apache.org/jira/browse/TOMEE-1803[TOMEE-1803] - upgrade to AMQ 5.13.3
+
+== Improvement
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1269[TOMEE-1269] - if a @Path interface has a single implementation add it as rest service
+* link:https://issues.apache.org/jira/browse/TOMEE-1270[TOMEE-1270] - exclude from scanning @Deprecated @Providers
+* link:https://issues.apache.org/jira/browse/TOMEE-1273[TOMEE-1273] - fix SslTomEETest to work with JDK 8 keytool
+* link:https://issues.apache.org/jira/browse/TOMEE-1328[TOMEE-1328] - Arquillian.xml &#39;additionalLibs&#39;
+must fail-fast
+* link:https://issues.apache.org/jira/browse/TOMEE-1336[TOMEE-1336] - Support classname.activated = true/false for auto discovered providers
+* link:https://issues.apache.org/jira/browse/TOMEE-1339[TOMEE-1339] - [JAXRS] try static resources first
+* link:https://issues.apache.org/jira/browse/TOMEE-1365[TOMEE-1365] - Updated to use try statement RemoteServer
+* link:https://issues.apache.org/jira/browse/TOMEE-1367[TOMEE-1367] - add singleDumpByArchiveName parameter to arquillian tomee adapters
+* link:https://issues.apache.org/jira/browse/TOMEE-1736[TOMEE-1736] - more explicit message if ejbd fails cause of class filtering (introduced for 0-day vulnerability fixed in previous release)
+* link:https://issues.apache.org/jira/browse/TOMEE-1737[TOMEE-1737] - activating default EE resources in the distribution but not in others modes
+* link:https://issues.apache.org/jira/browse/TOMEE-1738[TOMEE-1738] - basic configuration for TomEEJarScanner
+* link:https://issues.apache.org/jira/browse/TOMEE-1744[TOMEE-1744] - Ensure tomee embedded uses default tomcat connector by default (nio)
+* link:https://issues.apache.org/jira/browse/TOMEE-1745[TOMEE-1745] - allow to configure on command line server.xml and tomee.xml to use for tomee embedded provided main(String[])
+* link:https://issues.apache.org/jira/browse/TOMEE-1746[TOMEE-1746] - support connector configuration for tomee embedded with properties starting with connector.xxx (xxx being a connector option)
+* link:https://issues.apache.org/jira/browse/TOMEE-1747[TOMEE-1747] - for managed executor, thread factory option should support resource name
+* link:https://issues.apache.org/jira/browse/TOMEE-1749[TOMEE-1749] - [ApplicationComposer] support Gradle test/main as we support Maven for @Default
+* link:https://issues.apache.org/jira/browse/TOMEE-1750[TOMEE-1750] - support Gradle as invalid folders (for name identification)
+* link:https://issues.apache.org/jira/browse/TOMEE-1766[TOMEE-1766] - ensure default org.apache.johnzon.max-string-length size is 4k
+* link:https://issues.apache.org/jira/browse/TOMEE-1784[TOMEE-1784] - try to force persistence enhancement in tomee-embedded
+* link:https://issues.apache.org/jira/browse/TOMEE-1789[TOMEE-1789] - Expose Pool flush() through JMX
+* link:https://issues.apache.org/jira/browse/TOMEE-1790[TOMEE-1790] - Allow primitive arrays to be serialized/deserialized over (http)ejbd
+* link:https://issues.apache.org/jira/browse/TOMEE-1802[TOMEE-1802] - support network connector configuration on AMQ uri syntax (tomee.xml)
+* link:https://issues.apache.org/jira/browse/TOMEE-1807[TOMEE-1807] - exclude jaxb and junit from tomee embedded
+
+== New Feature
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1274[TOMEE-1274] - support additionalLibs in arquillian.xml to add libs from mvn coordinates to tomee/lib
+* link:https://issues.apache.org/jira/browse/TOMEE-1282[TOMEE-1282] - basic @Transactional @TransactionScoped support
+* link:https://issues.apache.org/jira/browse/TOMEE-1288[TOMEE-1288] - supports default in out propertyplaceholding
+* link:https://issues.apache.org/jira/browse/TOMEE-1289[TOMEE-1289] - allow user to provide a properties-provider on resources
+* link:https://issues.apache.org/jira/browse/TOMEE-1294[TOMEE-1294] - Allow to set System-Property in tomee.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-1295[TOMEE-1295] - openjpa.EntityManagerFactoryPool support for container persistence unit
+* link:https://issues.apache.org/jira/browse/TOMEE-1297[TOMEE-1297] - add @Jars annotation to ApplicationComposer
+* link:https://issues.apache.org/jira/browse/TOMEE-1298[TOMEE-1298] - Support JSR 107: JCACHE - Java Temporary Caching API
+* link:https://issues.apache.org/jira/browse/TOMEE-1332[TOMEE-1332] - support @Startup on CDI beans (@ApplicationScoped or normal scoped beans if the context is active at boot time)
+* link:https://issues.apache.org/jira/browse/TOMEE-1341[TOMEE-1341] - Arquillian support for Suite testing
+* link:https://issues.apache.org/jira/browse/TOMEE-1487[TOMEE-1487] - CDI Event based realm
+* link:https://issues.apache.org/jira/browse/TOMEE-1735[TOMEE-1735] - basic JMSContext implementation
+* link:https://issues.apache.org/jira/browse/TOMEE-1755[TOMEE-1755] - add tomee.tomcat.cookieProcessor to be able to use old cookie behavior
+* link:https://issues.apache.org/jira/browse/TOMEE-1756[TOMEE-1756] - add ConfigurationCustomizer for tomee embedded configuration
+* link:https://issues.apache.org/jira/browse/TOMEE-1758[TOMEE-1758] - support remove:prefix in additionalLibs in remote arquillian adapter
+* link:https://issues.apache.org/jira/browse/TOMEE-1761[TOMEE-1761] - allow to take a thread dump if a resource takes more than X to be destroyed
+* link:https://issues.apache.org/jira/browse/TOMEE-1769[TOMEE-1769] - Allow to configure formatter pattern on LocalfileHandler
+* link:https://issues.apache.org/jira/browse/TOMEE-1771[TOMEE-1771] - Expose Deployer reload() function through JMX
+* link:https://issues.apache.org/jira/browse/TOMEE-1775[TOMEE-1775] - tomee embedded single instance runner
+* link:https://issues.apache.org/jira/browse/TOMEE-1780[TOMEE-1780] - basic tomee-embedded gradle plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-1783[TOMEE-1783] - allow tomee embedded (+maven + gradle) to force the webapp loader to be the boot one for deploy classpath method
+* link:https://issues.apache.org/jira/browse/TOMEE-1798[TOMEE-1798] - can&#39;t load JTA and Common annotation on Java 9
+* link:https://issues.apache.org/jira/browse/TOMEE-1804[TOMEE-1804] - add Monkey tomee-maven-plugin customizer
+* link:https://issues.apache.org/jira/browse/TOMEE-1808[TOMEE-1808] - create a tomee embedded shade jaxrs oriented (without activemq)
+* link:https://issues.apache.org/jira/browse/TOMEE-1809[TOMEE-1809] - Run jaxws webservices using tomee embedded using --path parameter
+
+== Task
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1276[TOMEE-1276] - rework TimerExecutor
+* link:https://issues.apache.org/jira/browse/TOMEE-1279[TOMEE-1279] - integrate batchee
+* link:https://issues.apache.org/jira/browse/TOMEE-1280[TOMEE-1280] - myfaces 2.2.x
+* link:https://issues.apache.org/jira/browse/TOMEE-1317[TOMEE-1317] - Ensure full support of JSR-349 Bean Validation 1.1
+* link:https://issues.apache.org/jira/browse/TOMEE-1327[TOMEE-1327] - log4j2 integration
+* link:https://issues.apache.org/jira/browse/TOMEE-1331[TOMEE-1331] - rework ProvisiningUtil to allow it to support more resolvers
+* link:https://issues.apache.org/jira/browse/TOMEE-1410[TOMEE-1410] - Cleanup poms to update the filtering of EXE files.
+* link:https://issues.apache.org/jira/browse/TOMEE-1572[TOMEE-1572] - adopt latest OWB-1.6.0 changes
+
+== Test
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1290[TOMEE-1290] - Source build profile &#39;hibernate&#39;
+requires junit dependency
+* link:https://issues.apache.org/jira/browse/TOMEE-1338[TOMEE-1338] - Create tests for DeployerEjb
diff --git a/src/main/jbake/content/tomee-7.0.0-release-notes.md b/src/main/jbake/content/tomee-7.0.0-release-notes.md
deleted file mode 100644
index 331ad89..0000000
--- a/src/main/jbake/content/tomee-7.0.0-release-notes.md
+++ /dev/null
@@ -1,281 +0,0 @@
-        Release Notes - TomEE - Version 7.0.0
-    
-<h2>        Sub-task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1322'>TOMEE-1322</a>] -         Client API
-</li>
-</ul>
-                            
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1266'>TOMEE-1266</a>] -         Unable to configure a datasource with TomEE in context of Oracle Wallet
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1268'>TOMEE-1268</a>] -         Auto scanning of @Provider
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1275'>TOMEE-1275</a>] -         TimerExecutor as compoenent doesn&#39;t follow executor lifecycle (stop/start)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1281'>TOMEE-1281</a>] -         JAXRS doesn&#39;t work with deltaspike in Application#getSingleton
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1296'>TOMEE-1296</a>] -         org.apache.openejb.jpa.integration.eclipselink.OpenEJBServerPlatform mbeanServer name is wrong
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1324'>TOMEE-1324</a>] -         Problem with TomEE Maven archetype
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1325'>TOMEE-1325</a>] -         Dynamic subclassing doesn&#39;t support interfaces (@Local)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1329'>TOMEE-1329</a>] -         jars.txt doesn&#39;t support empty lines
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1330'>TOMEE-1330</a>] -         Support to include container urls in scanning
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1334'>TOMEE-1334</a>] -         cdi lazy realm throws NPE cause of init handling (too early)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1335'>TOMEE-1335</a>] -         openejb.deployer.save-deployments broken on war
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1342'>TOMEE-1342</a>] -         OutputGeneratedDescriptors doesn&#39;t output complete ejb-jar.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1343'>TOMEE-1343</a>] -         HSQL server shuts down saying no databases available
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1364'>TOMEE-1364</a>] -         When using the tomee-maven-plugins stop goal tomee seems to hang forever
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1376'>TOMEE-1376</a>] -         Invalid package within groovy script
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1398'>TOMEE-1398</a>] -         The project maven-util doesn&#39;t contain the Log interface on it&#39;s classpath
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1400'>TOMEE-1400</a>] -         Potential NPE in TomeeAnnotationProvider
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1408'>TOMEE-1408</a>] -         Incorrect assertions within the testcode
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1409'>TOMEE-1409</a>] -         Invalid configuration in module openejb-junit
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1509'>TOMEE-1509</a>] -         PropertyPlaceHolderHelper does not work with cipher:
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1519'>TOMEE-1519</a>] -         SetupCommand fails to delete file/dir on Windows
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1606'>TOMEE-1606</a>] -         Bad conversion of DataSource password containing special characters
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1626'>TOMEE-1626</a>] -         Maven Tomee Exec Mojo failed when provided server.xml use env vars
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1725'>TOMEE-1725</a>] -         ManagedConnection#equals broken when not using dbcp
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1726'>TOMEE-1726</a>] -         StreamOutput not considered as a stream
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1727'>TOMEE-1727</a>] -         Application.getSingletons doesn&#39;t handle @Provider right creating warnings
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1728'>TOMEE-1728</a>] -         ApplicationComposers.run calls twice @PostConstruct of the application
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1729'>TOMEE-1729</a>] -         empty context path for application composer applications can lead to wrong http routing
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1730'>TOMEE-1730</a>] -         bad regex for embedded http layer and filter mapping when ending by *
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1731'>TOMEE-1731</a>] -         web.xml should override @ApplicationPath and not concatenate both paths
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1739'>TOMEE-1739</a>] -         Javaagent arguments ignored by tomee-maven-plugin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1740'>TOMEE-1740</a>] -         Ensure Contexts propagates in ManagedExecutors the exchange to be able to inject RS @Context in async endpoints
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1741'>TOMEE-1741</a>] -         Incorrect log message
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1742'>TOMEE-1742</a>] -         application composer mvn plugins don&#39;t work with maven &gt; 3.0
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1748'>TOMEE-1748</a>] -         managed executor factory should support a Threadfactory (not a Managed one) as thread factory
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1751'>TOMEE-1751</a>] -         RemoteServer doesnt support system properties with equals in values
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1759'>TOMEE-1759</a>] -         JSF NPE in FashImpl with nested/forward request
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1764'>TOMEE-1764</a>] -         JSP @Resource not honored if only in JSP
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1765'>TOMEE-1765</a>] -         @Transactional doesn&#39;t throw as cause synchronization exceptions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1767'>TOMEE-1767</a>] -         @DataSourceDefinition doesn&#39;t support XADataSource
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1770'>TOMEE-1770</a>] -         @Initialized(AppScoped) not using the right classloader in tomee-embedded
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1772'>TOMEE-1772</a>] -         Singleton DependsOnTest fails most of the times
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1777'>TOMEE-1777</a>] -         some resources are not properly removed from OpenEjbConfiguration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1785'>TOMEE-1785</a>] -         activate bean validation with jaxrs by default
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1786'>TOMEE-1786</a>] -         BvalCdiFilter is not active
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1787'>TOMEE-1787</a>] -         EJBExceptionMapper can end up in a NPE
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1788'>TOMEE-1788</a>] -         TomEE fails to start embedded ActiveMQ
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1791'>TOMEE-1791</a>] -         property-provider should be properties-provider for tomee.xml on resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1792'>TOMEE-1792</a>] -         Eclipselink integration not working in flat classloader mode
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1796'>TOMEE-1796</a>] -         dont add war resources when running a .war with tomee embedded
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1799'>TOMEE-1799</a>] -         Java 8 : java.lang.IllegalArgumentException: Comparison method violates its general contract!
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1800'>TOMEE-1800</a>] -         SystemProperty not merged when using Import in tomee.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1805'>TOMEE-1805</a>] -         HttpServletRequest#logout doesn&#39;t clear authenticated identity in EJB
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1806'>TOMEE-1806</a>] -         GeronimoConnectionManager background connection validation not working
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1811'>TOMEE-1811</a>] -         IllegalArgumentException - File [xxxxxx.jar!/META-INF/persistence.xml] does not exist:
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1816'>TOMEE-1816</a>] -         java.lang.NoSuchFieldException: pool in Connector Resource Adapter deploy
-</li>
-</ul>
-    
-<h2>        Dependency upgrade
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1391'>TOMEE-1391</a>] -         Use maven-filtering:1.2 to fix MSHARED-319 when compiling under JDK8
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1754'>TOMEE-1754</a>] -         Tomcat 8.5.2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1757'>TOMEE-1757</a>] -         [plume] eclipselinks 2.6.3
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1760'>TOMEE-1760</a>] -         CXf 3.1.6
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1776'>TOMEE-1776</a>] -         myfaces 2.2.10
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1781'>TOMEE-1781</a>] -         slf4j 1.7.21
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1803'>TOMEE-1803</a>] -         upgrade to AMQ 5.13.3
-</li>
-</ul>
-                    
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1269'>TOMEE-1269</a>] -         if a @Path interface has a single implementation add it as rest service
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1270'>TOMEE-1270</a>] -         exclude from scanning @Deprecated @Providers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1273'>TOMEE-1273</a>] -         fix SslTomEETest to work with JDK 8 keytool
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1328'>TOMEE-1328</a>] -         Arquillian.xml &#39;additionalLibs&#39; must fail-fast
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1336'>TOMEE-1336</a>] -         Support classname.activated = true/false for auto discovered providers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1339'>TOMEE-1339</a>] -         [JAXRS] try static resources first
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1365'>TOMEE-1365</a>] -         Updated to use try statement RemoteServer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1367'>TOMEE-1367</a>] -         add singleDumpByArchiveName parameter to arquillian tomee adapters
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1736'>TOMEE-1736</a>] -         more explicit message if ejbd fails cause of class filtering (introduced for 0-day vulnerability fixed in previous release)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1737'>TOMEE-1737</a>] -         activating default EE resources in the distribution but not in others modes
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1738'>TOMEE-1738</a>] -         basic configuration for TomEEJarScanner
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1744'>TOMEE-1744</a>] -         Ensure tomee embedded uses default tomcat connector by default (nio)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1745'>TOMEE-1745</a>] -         allow to configure on command line server.xml and tomee.xml to use for tomee embedded provided main(String[])
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1746'>TOMEE-1746</a>] -         support connector configuration for tomee embedded with properties starting with connector.xxx (xxx being a connector option)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1747'>TOMEE-1747</a>] -         for managed executor, thread factory option should support resource name
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1749'>TOMEE-1749</a>] -         [ApplicationComposer] support Gradle test/main as we support Maven for @Default
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1750'>TOMEE-1750</a>] -         support Gradle as invalid folders (for name identification)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1766'>TOMEE-1766</a>] -         ensure default org.apache.johnzon.max-string-length size is 4k
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1784'>TOMEE-1784</a>] -         try to force persistence enhancement in tomee-embedded
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1789'>TOMEE-1789</a>] -         Expose Pool flush() through JMX
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1790'>TOMEE-1790</a>] -         Allow primitive arrays to be serialized/deserialized over (http)ejbd
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1802'>TOMEE-1802</a>] -         support network connector configuration on AMQ uri syntax (tomee.xml)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1807'>TOMEE-1807</a>] -         exclude jaxb and junit from tomee embedded
-</li>
-</ul>
-            
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1274'>TOMEE-1274</a>] -         support additionalLibs in arquillian.xml to add libs from mvn coordinates to tomee/lib
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1282'>TOMEE-1282</a>] -         basic @Transactional @TransactionScoped support
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1288'>TOMEE-1288</a>] -         supports default in out propertyplaceholding
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1289'>TOMEE-1289</a>] -         allow user to provide a properties-provider on resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1294'>TOMEE-1294</a>] -         Allow to set System-Property in tomee.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1295'>TOMEE-1295</a>] -         openjpa.EntityManagerFactoryPool support for container persistence unit
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1297'>TOMEE-1297</a>] -         add @Jars annotation to ApplicationComposer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1298'>TOMEE-1298</a>] -         Support JSR 107: JCACHE - Java Temporary Caching API
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1332'>TOMEE-1332</a>] -         support @Startup on CDI beans (@ApplicationScoped or normal scoped beans if the context is active at boot time)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1341'>TOMEE-1341</a>] -         Arquillian support for Suite testing
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1487'>TOMEE-1487</a>] -         CDI Event based realm
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1735'>TOMEE-1735</a>] -         basic JMSContext implementation
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1755'>TOMEE-1755</a>] -         add tomee.tomcat.cookieProcessor to be able to use old cookie behavior
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1756'>TOMEE-1756</a>] -         add ConfigurationCustomizer for tomee embedded configuration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1758'>TOMEE-1758</a>] -         support remove:prefix in additionalLibs in remote arquillian adapter
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1761'>TOMEE-1761</a>] -         allow to take a thread dump if a resource takes more than X to be destroyed
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1769'>TOMEE-1769</a>] -         Allow to configure formatter pattern on LocalfileHandler
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1771'>TOMEE-1771</a>] -         Expose Deployer reload() function through JMX
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1775'>TOMEE-1775</a>] -         tomee embedded single instance runner
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1780'>TOMEE-1780</a>] -         basic tomee-embedded gradle plugin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1783'>TOMEE-1783</a>] -         allow tomee embedded (+maven + gradle) to force the webapp loader to be the boot one for deploy classpath method
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1798'>TOMEE-1798</a>] -         can&#39;t load JTA and Common annotation on Java 9
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1804'>TOMEE-1804</a>] -         add Monkey tomee-maven-plugin customizer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1808'>TOMEE-1808</a>] -         create a tomee embedded shade jaxrs oriented (without activemq)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1809'>TOMEE-1809</a>] -         Run jaxws webservices using tomee embedded using --path parameter
-</li>
-</ul>
-                                                        
-<h2>        Task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1276'>TOMEE-1276</a>] -         rework TimerExecutor
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1279'>TOMEE-1279</a>] -         integrate batchee
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1280'>TOMEE-1280</a>] -         myfaces 2.2.x
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1317'>TOMEE-1317</a>] -         Ensure full support of JSR-349 Bean Validation 1.1
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1327'>TOMEE-1327</a>] -         log4j2 integration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1331'>TOMEE-1331</a>] -         rework ProvisiningUtil to allow it to support more resolvers
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1410'>TOMEE-1410</a>] -         Cleanup poms to update the filtering of EXE files.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1572'>TOMEE-1572</a>] -         adopt latest OWB-1.6.0 changes
-</li>
-</ul>
-        
-<h2>        Test
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1290'>TOMEE-1290</a>] -         Source build profile &#39;hibernate&#39; requires junit dependency
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1338'>TOMEE-1338</a>] -         Create tests for DeployerEjb
-</li>
-</ul>
-        
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-7.0.1-release-notes.adoc b/src/main/jbake/content/tomee-7.0.1-release-notes.adoc
new file mode 100644
index 0000000..ec20d68
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.1-release-notes.adoc
@@ -0,0 +1,56 @@
+= Release Notes - TomEE - Version 7.0.1
+:jbake-type: page
+:jbake-status: published
+
+== Bug
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1813[TOMEE-1813] - tomee.sh fails on cygwin
+* link:https://issues.apache.org/jira/browse/TOMEE-1817[TOMEE-1817] - java.lang.NullPointerException in Connector Resource Adapter deploy
+* link:https://issues.apache.org/jira/browse/TOMEE-1819[TOMEE-1819] - OWB configuration not respected
+* link:https://issues.apache.org/jira/browse/TOMEE-1822[TOMEE-1822] - SecurityService not available in TomEERealm: Principal can be the default one instead of the logged one
+* link:https://issues.apache.org/jira/browse/TOMEE-1827[TOMEE-1827] - Possible java.util.ConcurrentModificationException with ValidatingGenericConnectionManager
+* link:https://issues.apache.org/jira/browse/TOMEE-1828[TOMEE-1828] - OpenEJB application fails to find singleton container when openejb.offline = true
+* link:https://issues.apache.org/jira/browse/TOMEE-1829[TOMEE-1829] - com.sun.mail doesn&#39;t work in webapp out of the box
+* link:https://issues.apache.org/jira/browse/TOMEE-1832[TOMEE-1832] - dbcp2 datasource lock contention on createDataSource + illogical locking
+* link:https://issues.apache.org/jira/browse/TOMEE-1839[TOMEE-1839] - TomEE doesn&#39;t work with Arquillian servlet module 1.1.11.Final
+* link:https://issues.apache.org/jira/browse/TOMEE-1841[TOMEE-1841] - webapp version ignored
+* link:https://issues.apache.org/jira/browse/TOMEE-1844[TOMEE-1844] - bval can conflict with JAXRS bval integration
+* link:https://issues.apache.org/jira/browse/TOMEE-1845[TOMEE-1845] - dbcp2 openejb datasource JMX warning message at datasource unregistration
+
+== Dependency upgrade
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1850[TOMEE-1850] - Tomcat 8.5.3
+
+== Improvement
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1821[TOMEE-1821] - Allow to filter CDI extensions
+* link:https://issues.apache.org/jira/browse/TOMEE-1823[TOMEE-1823] - double johnzon max size (8k) and add a comment in system.properties
+* link:https://issues.apache.org/jira/browse/TOMEE-1824[TOMEE-1824] - support date configuration for johnzon
+* link:https://issues.apache.org/jira/browse/TOMEE-1825[TOMEE-1825] - allow to configure converters for johnzon jaxrs provider
+* link:https://issues.apache.org/jira/browse/TOMEE-1830[TOMEE-1830] - Set TomEEJarScanner TomEEFilter to delegate to standard jar scan filter as default
+* link:https://issues.apache.org/jira/browse/TOMEE-1838[TOMEE-1838] - (Un)DeployMojo not supporting HTTPS
+* link:https://issues.apache.org/jira/browse/TOMEE-1843[TOMEE-1843] - resources.xml errors unclear about the file
+* link:https://issues.apache.org/jira/browse/TOMEE-1849[TOMEE-1849] - JaccProvider hard to override
+
+== New Feature
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1812[TOMEE-1812] - add reload command to tomee embedded maven plugin
+* link:https://issues.apache.org/jira/browse/TOMEE-1818[TOMEE-1818] - add depends-on to Resource
+* link:https://issues.apache.org/jira/browse/TOMEE-1826[TOMEE-1826] - [CXF] openejb.cxf.monitoring.jmx config entry to activate counter repository
+* link:https://issues.apache.org/jira/browse/TOMEE-1831[TOMEE-1831] - Enrich failover router to support error handling
+* link:https://issues.apache.org/jira/browse/TOMEE-1833[TOMEE-1833] - add ExceptionSelector to Router (dynamic datasource routing)
+* link:https://issues.apache.org/jira/browse/TOMEE-1834[TOMEE-1834] - Add an all in one routed datasource and failover router
+* link:https://issues.apache.org/jira/browse/TOMEE-1835[TOMEE-1835] - add openshift properties provider for mysql and postgresql
+* link:https://issues.apache.org/jira/browse/TOMEE-1836[TOMEE-1836] - add create/destroy server events for resource
+* link:https://issues.apache.org/jira/browse/TOMEE-1846[TOMEE-1846] - allow to fully configure a resource programmatically
+* link:https://issues.apache.org/jira/browse/TOMEE-1847[TOMEE-1847] - allow to control API used to export a resource using classpath attribute
+* link:https://issues.apache.org/jira/browse/TOMEE-1848[TOMEE-1848] - add @Configuration support for TomEEEmbeddedSingleRunner
+
+== Task
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1814[TOMEE-1814] - upgrade copyright year to 2016
diff --git a/src/main/jbake/content/tomee-7.0.1-release-notes.md b/src/main/jbake/content/tomee-7.0.1-release-notes.md
deleted file mode 100644
index 08d7159..0000000
--- a/src/main/jbake/content/tomee-7.0.1-release-notes.md
+++ /dev/null
@@ -1,93 +0,0 @@
-        Release Notes - TomEE - Version 7.0.1
-                                
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1813'>TOMEE-1813</a>] -         tomee.sh fails on cygwin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1817'>TOMEE-1817</a>] -         java.lang.NullPointerException in Connector Resource Adapter deploy
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1819'>TOMEE-1819</a>] -         OWB configuration not respected
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1822'>TOMEE-1822</a>] -         SecurityService not available in TomEERealm: Principal can be the default one instead of the logged one
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1827'>TOMEE-1827</a>] -         Possible java.util.ConcurrentModificationException with ValidatingGenericConnectionManager
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1828'>TOMEE-1828</a>] -         OpenEJB application fails to find singleton container when openejb.offline = true
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1829'>TOMEE-1829</a>] -         com.sun.mail doesn&#39;t work in webapp out of the box
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1832'>TOMEE-1832</a>] -         dbcp2 datasource lock contention on createDataSource + illogical locking
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1839'>TOMEE-1839</a>] -         TomEE doesn&#39;t work with Arquillian servlet module 1.1.11.Final
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1841'>TOMEE-1841</a>] -         webapp version ignored
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1844'>TOMEE-1844</a>] -         bval can conflict with JAXRS bval integration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1845'>TOMEE-1845</a>] -         dbcp2 openejb datasource JMX warning message at datasource unregistration
-</li>
-</ul>
-    
-<h2>        Dependency upgrade
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1850'>TOMEE-1850</a>] -         Tomcat 8.5.3
-</li>
-</ul>
-                    
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1821'>TOMEE-1821</a>] -         Allow to filter CDI extensions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1823'>TOMEE-1823</a>] -         double johnzon max size (8k) and add a comment in system.properties
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1824'>TOMEE-1824</a>] -         support date configuration for johnzon
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1825'>TOMEE-1825</a>] -         allow to configure converters for johnzon jaxrs provider
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1830'>TOMEE-1830</a>] -         Set TomEEJarScanner TomEEFilter to delegate to standard jar scan filter as default
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1838'>TOMEE-1838</a>] -         (Un)DeployMojo not supporting HTTPS
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1843'>TOMEE-1843</a>] -         resources.xml errors unclear about the file
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1849'>TOMEE-1849</a>] -         JaccProvider hard to override
-</li>
-</ul>
-            
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1812'>TOMEE-1812</a>] -         add reload command to tomee embedded maven plugin
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1818'>TOMEE-1818</a>] -         add depends-on to Resource
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1826'>TOMEE-1826</a>] -         [CXF] openejb.cxf.monitoring.jmx config entry to activate counter repository
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1831'>TOMEE-1831</a>] -         Enrich failover router to support error handling
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1833'>TOMEE-1833</a>] -         add ExceptionSelector to Router (dynamic datasource routing)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1834'>TOMEE-1834</a>] -         Add an all in one routed datasource and failover router
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1835'>TOMEE-1835</a>] -         add openshift properties provider for mysql and postgresql
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1836'>TOMEE-1836</a>] -         add create/destroy server events for resource 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1846'>TOMEE-1846</a>] -         allow to fully configure a resource programmatically
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1847'>TOMEE-1847</a>] -         allow to control API used to export a resource using classpath attribute
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1848'>TOMEE-1848</a>] -         add @Configuration support for TomEEEmbeddedSingleRunner
-</li>
-</ul>
-                                                        
-<h2>        Task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1814'>TOMEE-1814</a>] -         upgrade copyright year to 2016
-</li>
-</ul>
-                
\ No newline at end of file
diff --git a/src/main/jbake/content/tomee-7.0.1.adoc b/src/main/jbake/content/tomee-7.0.1.adoc
new file mode 100644
index 0000000..2eeaff6
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.1.adoc
@@ -0,0 +1,48 @@
+= Apache TomEE 7.0.1 released, June 27th 2016
+:jbake-type: page
+:jbake-status: published
+
+The Apache TomEE community is proud to announce the release of xref:tomee-7.0.1.adoc[Apache TomEE 7.0.1], which is based on http://tomcat.apache.org/tomcat-8.5-doc/index.html[Apache Tomcat 8.5.3] and mainly aims to fix a security issue found in Tomcat 8.5.2.
+
+Please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+
+This version is not certified and is provided to the community as a milestone preview of the current development version.
+It is however an extremly well tested version.
+So please do test your applications and give us your feedback.
+
+The Apache TomEE 7.0.1 release files can be downloaded from here:
+
+xref:download/tomee-7.0.1.adoc[http://tomee.apache.org/download/tomee-7.0.1.html]
+
+== Update Maven POM Files - The OpenEJB version and groupId have been aligned
+
+Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
+
+[source,xml]
+----
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>javaee-api</artifactId>
+	<version>7.0</version>
+	<scope>provided</scope>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>openejb-core</artifactId>
+	<version>7.0.1</version>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.tomee</groupId>
+	<artifactId>tomee</artifactId>
+	<version>7.0.1</version>
+</dependency>
+----
+
+A complete xref:tomee-7.0.1-release-notes.adoc[Changelog] can be viewed here:
+
+xref:tomee-7.0.1-release-notes.adoc[tomee-7.0.1-release-notes.html]
+
+Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE].
+You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
diff --git a/src/main/jbake/content/tomee-7.0.1.md b/src/main/jbake/content/tomee-7.0.1.md
deleted file mode 100644
index 8b20885..0000000
--- a/src/main/jbake/content/tomee-7.0.1.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Apache TomEE 7.0.1 released, June 27th 2016
-
-The Apache TomEE community is proud to announce the release of [Apache TomEE 7.0.1](download/tomee-7.0.1.html), which is based on [Apache Tomcat 8.5.3](http://tomcat.apache.org/tomcat-8.5-doc/index.html) and mainly aims to fix a security issue found in Tomcat 8.5.2.
-
-Please feel free to check out and [contribute to the developer branch](contribute.html) - We are always interested in any help from the community that we can get.
-
-This version is not certified and is provided to the community as a milestone preview of the current development version. It is however an extremly well tested version. So please do test your applications and give us your feedback.
-
-The Apache TomEE 7.0.1 release files can be downloaded from here:
-
-[http://tomee.apache.org/download/tomee-7.0.1.html](download/tomee-7.0.1.html)
-
-###Update Maven POM Files - The OpenEJB version and groupId have been aligned
-
-Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entries to point to the latest versions:
-
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>javaee-api</artifactId>
-		<version>7.0</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>openejb-core</artifactId>
-		<version>7.0.1</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.tomee</groupId>
-		<artifactId>tomee</artifactId>
-		<version>7.0.1</version>
-	</dependency>
-
-A complete [Changelog](tomee-7.0.1-release-notes.html) can be viewed here:
-
-[tomee-7.0.1-release-notes.html](tomee-7.0.1-release-notes.html)
-
-Please feel free to jump in feet first and [get started with TomEE](documentation.html). You will nearly always find someone to help you on one of our [support channels](support.html).
diff --git a/src/main/jbake/content/tomee-7.0.2-release-notes.adoc b/src/main/jbake/content/tomee-7.0.2-release-notes.adoc
new file mode 100644
index 0000000..dbd9c23
--- /dev/null
+++ b/src/main/jbake/content/tomee-7.0.2-release-notes.adoc
@@ -0,0 +1,109 @@
+= Release Notes - TomEE - Version 7.0.2
+:jbake-type: page
+:jbake-status: published
+
+== Bug
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1545[TOMEE-1545] - Problem with parallel deployment + REST
+* link:https://issues.apache.org/jira/browse/TOMEE-1778[TOMEE-1778] - XAPoolTest fails because lock on XA log file cannot be acquired
+* link:https://issues.apache.org/jira/browse/TOMEE-1851[TOMEE-1851] - ear classloading can&#39;t be webapp first without a custom classloader
+* link:https://issues.apache.org/jira/browse/TOMEE-1852[TOMEE-1852] - JAXWS services without CDI can lead to NPE
+* link:https://issues.apache.org/jira/browse/TOMEE-1856[TOMEE-1856] - Empty log files from AsyncConsoleHandler
+* link:https://issues.apache.org/jira/browse/TOMEE-1857[TOMEE-1857] - Logger.getInstance leaks
+* link:https://issues.apache.org/jira/browse/TOMEE-1858[TOMEE-1858] - tomee.bat doesn&#39;t work
+* link:https://issues.apache.org/jira/browse/TOMEE-1859[TOMEE-1859] - support debug command on tomee.sh
+* link:https://issues.apache.org/jira/browse/TOMEE-1860[TOMEE-1860] - Potential NPE with DBCP if a shared connection is closed
+* link:https://issues.apache.org/jira/browse/TOMEE-1862[TOMEE-1862] - TomcatWebAppBuilder: no need to track contextXml inputstream
+* link:https://issues.apache.org/jira/browse/TOMEE-1865[TOMEE-1865] - NPE when injected request used in bean called from JASPIC SAM
+* link:https://issues.apache.org/jira/browse/TOMEE-1866[TOMEE-1866] - Authenticators don&#39;t have access to the request in CDI beans (@RequestScoped)
+* link:https://issues.apache.org/jira/browse/TOMEE-1871[TOMEE-1871] - deactivate tomee gui link since it is no more provided by default
+* link:https://issues.apache.org/jira/browse/TOMEE-1875[TOMEE-1875] - TomcatWebAppBuilder forces ConfigurationFactory impl
+* link:https://issues.apache.org/jira/browse/TOMEE-1878[TOMEE-1878] - AlternateDriver should be used only if datasource defines a classpath attribute
+* link:https://issues.apache.org/jira/browse/TOMEE-1879[TOMEE-1879] - DefinitionEncoding typo in Assembler
+* link:https://issues.apache.org/jira/browse/TOMEE-1881[TOMEE-1881] - org.apache.openejb.server.httpd.ServerServlet activated init param not respected
+* link:https://issues.apache.org/jira/browse/TOMEE-1887[TOMEE-1887] - Cipher command exception swalled
+* link:https://issues.apache.org/jira/browse/TOMEE-1888[TOMEE-1888] - tomcat context.xml datasource can be created twice in a different way when singleton
+* link:https://issues.apache.org/jira/browse/TOMEE-1890[TOMEE-1890] - arquillian remote tomee adapter should allow to configure options on the provider url (like timeout etc)
+* link:https://issues.apache.org/jira/browse/TOMEE-1893[TOMEE-1893] - JAXRS undeploys all contexts matching context prefix
+* link:https://issues.apache.org/jira/browse/TOMEE-1894[TOMEE-1894] - MvnResolver uses openejb.m2.home for settings location
+* link:https://issues.apache.org/jira/browse/TOMEE-1896[TOMEE-1896] - TomcatWebAppBuilder overwrites the last added event listener when the application doesn&#39;t use CDI
+* link:https://issues.apache.org/jira/browse/TOMEE-1898[TOMEE-1898] - NPE in PojoEndpoint.java:110 when deploying JAX-WS application
+* link:https://issues.apache.org/jira/browse/TOMEE-1899[TOMEE-1899] - deny-uncovered-http-methods not supported in web.xml
+* link:https://issues.apache.org/jira/browse/TOMEE-1900[TOMEE-1900] - XAConnection wrongly pooled when not fully handled in transaction (JPA case)
+* link:https://issues.apache.org/jira/browse/TOMEE-1901[TOMEE-1901] - @Inject not working for EJB module
+* link:https://issues.apache.org/jira/browse/TOMEE-1902[TOMEE-1902] - [plume] NPE when CDI is not used
+* link:https://issues.apache.org/jira/browse/TOMEE-1903[TOMEE-1903] - JTA component lookup fails in CDI extensions
+* link:https://issues.apache.org/jira/browse/TOMEE-1904[TOMEE-1904] - allow to sort cdi extensions
+* link:https://issues.apache.org/jira/browse/TOMEE-1907[TOMEE-1907] - tomee arquillian enricher shouldn&#39;t log a warning for junit rules/statements
+* link:https://issues.apache.org/jira/browse/TOMEE-1909[TOMEE-1909] - CDI not available for JSP
+* link:https://issues.apache.org/jira/browse/TOMEE-1911[TOMEE-1911] - gradle plugin broken with gradle 3 and gradle wrapper
+* link:https://issues.apache.org/jira/browse/TOMEE-1913[TOMEE-1913] - CDI.current().getBeanManager() returns BeanManager of another webapp
+* link:https://issues.apache.org/jira/browse/TOMEE-1922[TOMEE-1922] - openejb-http doesn&#39;t support multiple header values
+* link:https://issues.apache.org/jira/browse/TOMEE-1923[TOMEE-1923] - @WebXXX ignored with antijarlocking activated
+* link:https://issues.apache.org/jira/browse/TOMEE-1925[TOMEE-1925] - WebContext#isWeb doesn&#39;t contain all web artifacts
+* link:https://issues.apache.org/jira/browse/TOMEE-1928[TOMEE-1928] - use src/main/webapp by default as webresource for TomEEEmbeddedSingleRunner
+* link:https://issues.apache.org/jira/browse/TOMEE-1933[TOMEE-1933] - InputStreamLeak in IO.java
+* link:https://issues.apache.org/jira/browse/TOMEE-1935[TOMEE-1935] - Leaked streams to files/classloader resources
+* link:https://issues.apache.org/jira/browse/TOMEE-1936[TOMEE-1936] - JMS message.getBody(String.class) is not working in MDB
+* link:https://issues.apache.org/jira/browse/TOMEE-1940[TOMEE-1940] - AbstractMethodError: org.apache.activemq.ActiveMQSession.createDurableConsumer(
+* link:https://issues.apache.org/jira/browse/TOMEE-1941[TOMEE-1941] - Logger.configure should also take into account openejb.logger.external
+* link:https://issues.apache.org/jira/browse/TOMEE-1946[TOMEE-1946] - TomEE relies on deafult locale
+* link:https://issues.apache.org/jira/browse/TOMEE-1951[TOMEE-1951] - BeanManager missing from javax.persistence.bean.manager entry in the map passed to JPA
+* link:https://issues.apache.org/jira/browse/TOMEE-1952[TOMEE-1952] - openejb.ejbd.authenticate-with-request hides authentication exception
+* link:https://issues.apache.org/jira/browse/TOMEE-1960[TOMEE-1960] - JarFiles are not closed
+* link:https://issues.apache.org/jira/browse/TOMEE-1962[TOMEE-1962] - deprecate org.apache.openejb.core.LocalInitialContextFactory
+
+== Dependency upgrade
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1864[TOMEE-1864] - tomcat 8.5.6
+* link:https://issues.apache.org/jira/browse/TOMEE-1869[TOMEE-1869] - upgrade xmlsec to 2.0.6
+* link:https://issues.apache.org/jira/browse/TOMEE-1880[TOMEE-1880] - johnzon 0.9.4
+* link:https://issues.apache.org/jira/browse/TOMEE-1905[TOMEE-1905] - ActiveMQ 5.14.1
+* link:https://issues.apache.org/jira/browse/TOMEE-1906[TOMEE-1906] - CXF 3.1.8
+* link:https://issues.apache.org/jira/browse/TOMEE-1920[TOMEE-1920] - Upgrade OpenWebBeans to 1.7.0
+* link:https://issues.apache.org/jira/browse/TOMEE-1939[TOMEE-1939] - myfaces 2.2.11
+* link:https://issues.apache.org/jira/browse/TOMEE-1948[TOMEE-1948] - batchee 0.4
+
+== Improvement
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1855[TOMEE-1855] - JSP can leak under no luck conditions
+* link:https://issues.apache.org/jira/browse/TOMEE-1861[TOMEE-1861] - org.apache.tomee.jul.formatter.AsyncConsoleHandler not configurable
+* link:https://issues.apache.org/jira/browse/TOMEE-1870[TOMEE-1870] - Don&#39;t scan jars if scan.xml is used with classes only
+* link:https://issues.apache.org/jira/browse/TOMEE-1882[TOMEE-1882] - tomee.sh/tomee.bat ignore tomcat boot classpat (tomcat-juli typically)
+* link:https://issues.apache.org/jira/browse/TOMEE-1885[TOMEE-1885] - Improve MyFaces default properties
+* link:https://issues.apache.org/jira/browse/TOMEE-1886[TOMEE-1886] - add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add caller code
+* link:https://issues.apache.org/jira/browse/TOMEE-1921[TOMEE-1921] - [tomee embedded] support to load configuration from a properties file in the classpath
+* link:https://issues.apache.org/jira/browse/TOMEE-1927[TOMEE-1927] - Update Maven page for TomEE 7.x
+* link:https://issues.apache.org/jira/browse/TOMEE-1929[TOMEE-1929] - Do not unnecessarily allocate an array
+* link:https://issues.apache.org/jira/browse/TOMEE-1931[TOMEE-1931] - InputStreamLeak in CxfRsHttpListener
+* link:https://issues.apache.org/jira/browse/TOMEE-1949[TOMEE-1949] - remove ejb-jar.xml and openejb-jar.xml from openejb-core
+* link:https://issues.apache.org/jira/browse/TOMEE-1950[TOMEE-1950] - tomee embedded should support descriptors in classpath for --as-war
+* link:https://issues.apache.org/jira/browse/TOMEE-1958[TOMEE-1958] - Mockito doesn&#39;t @MockInjector to be set as container properties
+
+== New Feature
+
+[.compact]
+* link:https://issues.apache.org/jira/browse/TOMEE-1810[TOMEE-1810] - Default context should be &#39;/&#39;
+or ROOT if --context is not specified for embedded tomee
+* link:https://issues.apache.org/jira/browse/TOMEE-1872[TOMEE-1872] - Map tomee embedded Configuration to its main
+* link:https://issues.apache.org/jira/browse/TOMEE-1873[TOMEE-1873] - Add FatApp main which is designed for fatjar case and delegates to tomee embedded Main with fatjar config
+* link:https://issues.apache.org/jira/browse/TOMEE-1883[TOMEE-1883] - provide tomee embedded classpath scanner through an event
+* link:https://issues.apache.org/jira/browse/TOMEE-1884[TOMEE-1884] - provide a component to propagate command line and args of tomee embedded
+* link:https://issues.apache.org/jira/browse/TOMEE-1889[TOMEE-1889] - EJBd http client BASIC support
+* link:https://issues.apache.org/jira/browse/TOMEE-1895[TOMEE-1895] - support maven coordinates in classpaths element
+* link:https://issues.apache.org/jira/browse/TOMEE-1914[TOMEE-1914] - org.apache.openejb.util.ContainerClassesFilter ignores jaxws exclusions
+* link:https://issues.apache.org/jira/browse/TOMEE-1915[TOMEE-1915] - add --interactive=true or -i options to tomee embedded main to exist typing &quot;exit&quot;
+* link:https://issues.apache.org/jira/browse/TOMEE-1916[TOMEE-1916] - add conf option to tomee embedded configuration
+* link:https://issues.apache.org/jira/browse/TOMEE-1917[TOMEE-1917] - Provide means to bypass CountingInputStream/OutputStream
+* link:https://issues.apache.org/jira/browse/TOMEE-1918[TOMEE-1918] - propagate gradle plugin configuration to gradle extension
+* link:https://issues.apache.org/jira/browse/TOMEE-1919[TOMEE-1919] - gradle tomee embedde task configuration not working
+* link:https://issues.apache.org/jira/browse/TOMEE-1926[TOMEE-1926] - add Configurer hook to TomEEEmbeddedSingleRunner to configure the Configuration instance
+* link:https://issues.apache.org/jira/browse/TOMEE-1938[TOMEE-1938] - @JMSDestinationDefinition ignored
+* link:https://issues.apache.org/jira/browse/TOMEE-1944[TOMEE-1944] - add --classes-filter to tomee embedded
+* link:https://issues.apache.org/jira/browse/TOMEE-1953[TOMEE-1953] - TomEE Embedded Mojo should support additional web resource directories
+* link:https://issues.apache.org/jira/browse/TOMEE-1957[TOMEE-1957] - add @Args to tomee-embedded application runner
+* link:https://issues.apache.org/jira/browse/TOMEE-1959[TOMEE-1959] - add js/groovy customizers to tomee embedded maven plugin based on tomee standalone ones
+* link:https://issues.apache.org/jira/browse/TOMEE-1964[TOMEE-1964] - support to always return false for isSameResource on XADataSource
diff --git a/src/main/jbake/content/tomee-7.0.2-release-notes.md b/src/main/jbake/content/tomee-7.0.2-release-notes.md
deleted file mode 100644
index de23d88..0000000
--- a/src/main/jbake/content/tomee-7.0.2-release-notes.md
+++ /dev/null
@@ -1,200 +0,0 @@
-
-        Release Notes - TomEE - Version 7.0.2
-
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1545'>TOMEE-1545</a>] -         Problem with parallel deployment + REST
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1778'>TOMEE-1778</a>] -         XAPoolTest fails because lock on XA log file cannot be acquired
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1851'>TOMEE-1851</a>] -         ear classloading can&#39;t be webapp first without a custom classloader
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1852'>TOMEE-1852</a>] -         JAXWS services without CDI can lead to NPE
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1856'>TOMEE-1856</a>] -         Empty log files from AsyncConsoleHandler
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1857'>TOMEE-1857</a>] -         Logger.getInstance leaks
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1858'>TOMEE-1858</a>] -         tomee.bat doesn&#39;t work
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1859'>TOMEE-1859</a>] -         support debug command on tomee.sh
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1860'>TOMEE-1860</a>] -         Potential NPE with DBCP if a shared connection is closed
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1862'>TOMEE-1862</a>] -         TomcatWebAppBuilder: no need to track contextXml inputstream
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1865'>TOMEE-1865</a>] -         NPE when injected request used in bean called from JASPIC SAM
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1866'>TOMEE-1866</a>] -         Authenticators don&#39;t have access to the request in CDI beans (@RequestScoped)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1871'>TOMEE-1871</a>] -         deactivate tomee gui link since it is no more provided by default
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1875'>TOMEE-1875</a>] -         TomcatWebAppBuilder forces ConfigurationFactory impl
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1878'>TOMEE-1878</a>] -         AlternateDriver should be used only if datasource defines a classpath attribute
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1879'>TOMEE-1879</a>] -         DefinitionEncoding typo in Assembler
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1881'>TOMEE-1881</a>] -         org.apache.openejb.server.httpd.ServerServlet activated init param not respected
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1887'>TOMEE-1887</a>] -         Cipher command exception swalled
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1888'>TOMEE-1888</a>] -         tomcat context.xml datasource can be created twice in a different way when singleton
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1890'>TOMEE-1890</a>] -         arquillian remote tomee adapter should allow to configure options on the provider url (like timeout etc)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1893'>TOMEE-1893</a>] -         JAXRS undeploys all contexts matching context prefix
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1894'>TOMEE-1894</a>] -         MvnResolver uses openejb.m2.home for settings location
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1896'>TOMEE-1896</a>] -         TomcatWebAppBuilder overwrites the last added event listener when the application doesn&#39;t use CDI
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1898'>TOMEE-1898</a>] -         NPE in PojoEndpoint.java:110 when deploying JAX-WS application
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1899'>TOMEE-1899</a>] -         deny-uncovered-http-methods not supported in web.xml
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1900'>TOMEE-1900</a>] -         XAConnection wrongly pooled when not fully handled in transaction (JPA case)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1901'>TOMEE-1901</a>] -         @Inject not working for EJB module
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1902'>TOMEE-1902</a>] -         [plume] NPE when CDI is not used
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1903'>TOMEE-1903</a>] -         JTA component lookup fails in CDI extensions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1904'>TOMEE-1904</a>] -         allow to sort cdi extensions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1907'>TOMEE-1907</a>] -         tomee arquillian enricher shouldn&#39;t log a warning for junit rules/statements
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1909'>TOMEE-1909</a>] -         CDI not available for JSP
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1911'>TOMEE-1911</a>] -         gradle plugin broken with gradle 3 and gradle wrapper
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1913'>TOMEE-1913</a>] -         CDI.current().getBeanManager() returns BeanManager of another webapp
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1922'>TOMEE-1922</a>] -         openejb-http doesn&#39;t support multiple header values
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1923'>TOMEE-1923</a>] -         @WebXXX ignored with antijarlocking activated
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1925'>TOMEE-1925</a>] -         WebContext#isWeb doesn&#39;t contain all web artifacts
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1928'>TOMEE-1928</a>] -         use src/main/webapp by default as webresource for TomEEEmbeddedSingleRunner
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1933'>TOMEE-1933</a>] -         InputStreamLeak in IO.java
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1935'>TOMEE-1935</a>] -         Leaked streams to files/classloader resources
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1936'>TOMEE-1936</a>] -         JMS message.getBody(String.class) is not working in MDB
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1940'>TOMEE-1940</a>] -         AbstractMethodError: org.apache.activemq.ActiveMQSession.createDurableConsumer(
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1941'>TOMEE-1941</a>] -         Logger.configure should also take into account openejb.logger.external
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1946'>TOMEE-1946</a>] -         TomEE relies on deafult locale
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1951'>TOMEE-1951</a>] -         BeanManager missing from javax.persistence.bean.manager entry in the map passed to JPA
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1952'>TOMEE-1952</a>] -         openejb.ejbd.authenticate-with-request hides authentication exception
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1960'>TOMEE-1960</a>] -         JarFiles are not closed
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1962'>TOMEE-1962</a>] -         deprecate org.apache.openejb.core.LocalInitialContextFactory
-</li>
-</ul>
-
-<h2>        Dependency upgrade
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1864'>TOMEE-1864</a>] -         tomcat 8.5.6
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1869'>TOMEE-1869</a>] -         upgrade xmlsec to 2.0.6
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1880'>TOMEE-1880</a>] -         johnzon 0.9.4
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1905'>TOMEE-1905</a>] -         ActiveMQ 5.14.1
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1906'>TOMEE-1906</a>] -         CXF 3.1.8
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1920'>TOMEE-1920</a>] -         Upgrade OpenWebBeans to 1.7.0
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1939'>TOMEE-1939</a>] -         myfaces 2.2.11
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1948'>TOMEE-1948</a>] -         batchee 0.4
-</li>
-</ul>
-
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1855'>TOMEE-1855</a>] -         JSP can leak under no luck conditions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1861'>TOMEE-1861</a>] -         org.apache.tomee.jul.formatter.AsyncConsoleHandler not configurable
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1870'>TOMEE-1870</a>] -         Don&#39;t scan jars if scan.xml is used with classes only
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1882'>TOMEE-1882</a>] -         tomee.sh/tomee.bat ignore tomcat boot classpat (tomcat-juli typically)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1885'>TOMEE-1885</a>] -         Improve MyFaces default properties
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1886'>TOMEE-1886</a>] -         add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add caller code
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1921'>TOMEE-1921</a>] -         [tomee embedded] support to load configuration from a properties file in the classpath
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1927'>TOMEE-1927</a>] -         Update Maven page for TomEE 7.x
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1929'>TOMEE-1929</a>] -         Do not unnecessarily allocate an array
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1931'>TOMEE-1931</a>] -         InputStreamLeak in CxfRsHttpListener
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1949'>TOMEE-1949</a>] -         remove ejb-jar.xml and openejb-jar.xml from openejb-core
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1950'>TOMEE-1950</a>] -         tomee embedded should support descriptors in classpath for --as-war
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1958'>TOMEE-1958</a>] -         Mockito doesn&#39;t @MockInjector to be set as container properties
-</li>
-</ul>
-
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1810'>TOMEE-1810</a>] -         Default context should be &#39;/&#39; or ROOT if --context is not specified for embedded tomee
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1872'>TOMEE-1872</a>] -         Map tomee embedded Configuration to its main
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1873'>TOMEE-1873</a>] -         Add FatApp main which is designed for fatjar case and delegates to tomee embedded Main with fatjar config
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1883'>TOMEE-1883</a>] -         provide tomee embedded classpath scanner through an event
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1884'>TOMEE-1884</a>] -         provide a component to propagate command line and args of tomee embedded
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1889'>TOMEE-1889</a>] -         EJBd http client BASIC support
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1895'>TOMEE-1895</a>] -         support maven coordinates in classpaths element
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1914'>TOMEE-1914</a>] -         org.apache.openejb.util.ContainerClassesFilter ignores jaxws exclusions
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1915'>TOMEE-1915</a>] -         add --interactive=true or -i options to tomee embedded main to exist typing &quot;exit&quot;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1916'>TOMEE-1916</a>] -         add conf option to tomee embedded configuration
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1917'>TOMEE-1917</a>] -         Provide means to bypass CountingInputStream/OutputStream
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1918'>TOMEE-1918</a>] -         propagate gradle plugin configuration to gradle extension
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1919'>TOMEE-1919</a>] -         gradle tomee embedde task configuration not working
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1926'>TOMEE-1926</a>] -         add Configurer hook to TomEEEmbeddedSingleRunner to configure the Configuration instance
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1938'>TOMEE-1938</a>] -         @JMSDestinationDefinition ignored
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1944'>TOMEE-1944</a>] -         add --classes-filter to tomee embedded
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1953'>TOMEE-1953</a>] -         TomEE Embedded Mojo should support additional web resource directories
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1957'>TOMEE-1957</a>] -         add @Args to tomee-embedded application runner
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1959'>TOMEE-1959</a>] -         add js/groovy customizers to tomee embedded maven plugin based on tomee standalone ones
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TOMEE-1964'>TOMEE-1964</a>] -         support to always return false for isSameResource on XADataSource
-</li>
-</ul>
diff --git a/src/main/jbake/content/unit-testing-transactions.adoc b/src/main/jbake/content/unit-testing-transactions.adoc
new file mode 100644
index 0000000..21b427e
--- /dev/null
+++ b/src/main/jbake/content/unit-testing-transactions.adoc
@@ -0,0 +1,184 @@
+= Unit Testing Transactions
+:jbake-type: page
+:jbake-status: published
+
+
+== Basic setup
+
+Add the following interface and bean to your test sources (they could even be inner classes of a test case):
+
+
+=== Business interface
+
+ public interface Caller {
+     public <V> V call(Callable<V> callable) throws Exception;
+ }
+
+
+=== Bean Implementation(s)
+
+....
+import java.util.concurrent.Callable;
+
+@Stateless
+@TransactionAttribute(REQUIRES_NEW)
+public class TransactionBean implements Caller {
+    public <V> V call(Callable<V> callable) throws Exception {
+	return callable.call();
+    }
+}
+....
+
+
+=== Have them discovered
+
+In src/test/resources/ (or related) create an META-INF/ejb-jar.xml containing the text "+++<ejb-jar>++++++</ejb-jar>+++"
+
+
+=== What we accomplished
+
+Essentially what we've done is added an ejb that will be picked up as part of your test code and deployed.
+You can then look it up and use it to execute test code with any particular transaction or security constraints that you want.
+The above bean specifies REQUIRES_NEW;
+functionally the same as REQUIRED as the test case itself won't have a transaction, but a little cleaner and more explicit.
+
+You could also annotate the bean with @RunAs("manager") for example and test that your security restrictions are how you like them.
+You can have as many of these test beans in your test code as you like, each with it's own transaction and security constraints allowing you to write some incredibly thorough tests.
+
+You do not need to use java.util.concurrent.Callable, any similar interface of your creation could work just as well.
+You may want something with return type void, for example, to eliminate useless 'return null' statements.
+
+
+== Usage
+
+There are a number of style choices for using the above bean, specifically around the creation of the Callable object you pass in, and it all really depends on what looks nice to you.
+
+In the examples below, the Movies bean being tested is simply a thin layer around JPA that allows us to use enforce various transaction semantics.
+
+....
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import static javax.ejb.TransactionAttributeType.MANDATORY;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Query;
+import java.util.List;
+
+@Stateful(name == "Movies")
+@TransactionAttribute(MANDATORY)
+public class MoviesImpl implements Movies {
+
+    @PersistenceContext(unitName == "movie-unit", type == PersistenceContextType.TRANSACTION)
+    private EntityManager entityManager;
+
+    public void addMovie(Movie movie) throws Exception {
+	entityManager.persist(movie);
+    }
+
+    public void deleteMovie(Movie movie) throws Exception {
+	entityManager.remove(movie);
+    }
+
+    public List<Movie> getMovies() throws Exception {
+	Query query == entityManager.createQuery("SELECT m from Movie asm");
+    return query.getResultList();
+    }
+}
+....
+
+Test code below.
+
+
+=== Pure inlined
+
+The Callable can be created right in the test method itself.
+
+....
+public class MoviesTest extends TestCase {
+    private Context context;
+
+    protected void setUp() throws Exception {
+	// initialize jndi context as usual
+    }
+
+    public void test() throws Exception {
+	Caller transactionBean == (Caller)
+    context.lookup("TransactionBeanLocal");
+
+	transactionBean.call(new Callable() {
+	    public Object call() throws Exception {
+		Movies movies == (Movies) context.lookup("MoviesLocal");
+
+		movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+		movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
+		movies.addMovie(new Movie("Joel Coen", "The Big Lebowski",1998));
+
+		List<Movie> list == movies.getMovies();
+		assertEquals("List.size()", 3, list.size());
+
+		for (Movie movie : list) {
+		    movies.deleteMovie(movie);
+		}
+
+		assertEquals("Movies.getMovies()", 0,movies.getMovies().size());
+
+		return null;
+	    }
+	});
+    }
+}
+....
+
+
+=== Same test code, different transaction scenarios
+
+Maybe you'd like to test how things behave with and without a transaction to guarantee everyone is doing the right thing in all situations.
+Negative testing is often a very good way to stomp out dangerous bugs.
+
+....
+public class MoviesTest extends TestCase {
+    private Context context;
+
+    protected void setUp() throws Exception {
+	// initialize jndi context as usual
+    }
+
+    private void doWork() throws Exception {
+	      Movies movies == (Movies) context.lookup("MoviesLocal");
+
+	      movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs",1992));
+          movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
+	      movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
+
+	      List<Movie> list == movies.getMovies();
+	      assertEquals("List.size()", 3, list.size());
+
+	      for (Movie movie : list) {
+	          movies.deleteMovie(movie);
+	      }
+
+	      assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
+    }
+
+    public void testWithTransaction() throws Exception {
+	      Caller transactionBean == (Caller)context.lookup("TransactionBeanLocal");
+
+	      transactionBean.call(new Callable(){
+	            public Object call() throws Exception {
+		          doWork();
+		          return null;
+	            }
+	      });
+    }
+
+    public void testWithoutTransaction() throws Exception {
+	      try {
+	            doWork();
+	            fail("The Movies bean should be using TransactionAttributeType.MANDATORY");
+	      } catch (javax.transaction.TransactionRequiredException e) {
+	            // good, our Movies bean is using TransactionAttributeType.MANDATORY as we want
+	      }
+    }
+}
+....
diff --git a/src/main/jbake/content/webadmin.adoc b/src/main/jbake/content/webadmin.adoc
new file mode 100644
index 0000000..1bc45d7
--- /dev/null
+++ b/src/main/jbake/content/webadmin.adoc
@@ -0,0 +1,132 @@
+= Webadmin
+:jbake-type: page
+:jbake-status: published
+
+The Webadmin is a new addition to OpenEJB 1.0 and very innovative in that it lets you plug-in your own admin beans.
+Here are some screenshots:
+
+* http://tomee.apache.org/images/webadmin-main.png[Main]
+* http://tomee.apache.org/images/webadmin-ejbdetails.png[EJB Details]
+* http://tomee.apache.org/images/webadmin-listlogs.png[List Logs]
+* http://tomee.apache.org/images/webadmin-properties.png[System Properties]
+* http://tomee.apache.org/images/webadmin-viewjndi.png[JNDI Viewer]
+* http://tomee.apache.org/images/webadmin-ejbviewer.png[EJB Viewer]
+* http://tomee.apache.org/images/webadmin-objectinvoker.png[Object and EJB Invoker]
+
+== Enabling the Webadmin in 1.0 beta 1
+
+The Webadmin console is in the 1.0 beta 1 release.
+To enable it, simply move into the openejb.home directory and _copy_ the openejb-webadmin-main.jar from the _beans_ directory into the _lib_ directory.
+Then start the server.
+
+....
+mingus:~/
+$ cd /usr/local/openejb-1.0-beta1
+
+mingus:/usr/local/openejb-1.0-beta1 03:37:33
+$ cp beans/openejb-webadmin-main.jar lib/
+
+mingus:/usr/local/openejb-1.0-beta1 03:37:52
+$ ./bin/openejb start
+OPENEJB_HOME = /usr/local/openejb-1.0-beta1
+OpenEJB 1.0-beta1    build: 20050829-2233
+http://www.openejb.org
+resources 1
+OpenEJB ready.
+[init]  OpenEJB Remote Server
+  ** Starting Services **
+  NAME		       IP	       PORT
+  admin thread	       127.0.0.1       4200
+  ejbd		       127.0.0.1       4201
+  telnet	       127.0.0.1       4202
+  webadmin	       127.0.0.1       4203
+-------
+Ready!
+....
+
+Now you can open your browser to go to http://localhost:4203/
+
+== WebAdmin Beans
+
+To create an EJB and have it included as part of the WebAdmin, simply subclass from WebAdminBean and include it in your ejb-jar.xml file as such:
+
+ <session>
+   <description>A JNDI viewer</description>
+   <ejb-name>webadmin/ViewJndi</ejb-name>
+   <home>org.openejb.webadmin.HttpHome</home>
+   <remote>org.openejb.webadmin.HttpObject</remote>
+   <ejb-class>org.openejb.webadmin.clienttools.ViewJndiBean</ejb-class>
+   <session-type>Stateless</session-type>
+   <transaction-type>Bean</transaction-type>
+ </session>
+
+The ejb-name is used to create the menus and should follow the format of 'menu-section/menu-item'.
+WebAdminBeans are grouped together by the 'menu-section' portion of their ejb-name.
+The 'menu-item' is the clickable link that causes the EJB code to be execute.
+Very simple and makes it possible to package administrative components with your EJB applications.
+
+== WebAdmin Plugins
+
+[cols=2*]
+|===
+| Here is a project that already takes advantage of the new feature.
+[BeanGen
+| http://beangen.sourceforge.net]
+|===
+
+== Developers guide
+
+Below is David Blevins' email on how webadmin worked.
+Please have a look at the text below before you start working on porting the existing WebAdmin to version 3.
+
+Plain old stateless beans were used as the "servlets".
+To make a bean that would show up in the Webadmin Console you simply had to implement the HttpBean interface (i think it's now called HttpListener) and give your bean a deploymentId following this format "webadmin/\{section}/\{page}".
+Anyone could add to the Webadmin console by doing both of these things, which is really cool as people developing EJB apps can also deploy beans for administering those apps right in the exact same jar.
+This is not only easy for packaging but means new sections can be added/removed on the fly.
+
+Using the described "webadmin/\{section}/\{page}" deploymentId format, things end up automagically grouped in the JNDI tree.
+There's a 'webadmin' context we grab which will contain any number of "section" contexts ("ClientTools", "EJBGenerator", etc.).
+Each of those section subcontexts will contain several beans which we will use to make the pages.
+Making the menu is pretty easy as we just iterate over the webadmin section of the global jndi tree.
+
+When an http request came in we just took the path part of the GET or POST request, prepended "webadmin/" and then went looking for a bean with that deployment id and invoked it via it's HttpBean (now called HttpListener) interface passing in a HttpRequest and HttpResponse objects which are trimmed down versions of similar servlet classes.
+There'll be some changes to this as now we support our plain ejb protocol over our http implementation, so the two will have to find a way to share the URL space.
+See the openejb-http module.
+
+To implement session state, we had a stateful session bean implementing an HttpSession interface (again, similar to the servlet equivalent) and simply wrote the internal ID of the bean instance into a Cookie sent to the browser.
+For some reason we would write the javax.ejb.Handle of the stateful bean's EJBObject to disk and read it back out on subsequent requests then used it to get a reference to the EJBObject again.
+I'm not sure why we didn't just keep a static hashmap and put the EJBObject right in it using an ID we could just make up like UUID (that would have been way simpler).
+
+We had a standard superclass we favored for beans that implemented the HttpBean (HttpListener) interface that did templating and the aforementioned menu  construction.
+The templating was perhaps too tricky as we used a non-printable character to determine where to insert data.
+Now we could just use swizzle-stream for some pretty decent templating ability or even velocity.
+I'd be hesitant to endorse velocity as we already have a dep on swizzle-stream and wouldn't want to see us add another meg to our distro size if we can avoid it -- we have like 3 times as many deps as 1.0 did and we should probably start tightening the belt.
+
+To serve static things like images, we had a "default" HttpBean which searched for the items in the classpath and wrote them into the response setting the mime type, etc.
+correctly.
+One thing that we never did which still needs to happen is that the bean didn't have the logic to set the modification information into the response so the "If modified since" header which would allow the browser to rely on it's cache instead of requesting the same images over and over again.
+
+That pretty much covers the way it was put together.
+
+* The Jndi Viewer, Class Viewer, Ejb Viewer, and Object Invoker were written by yours truly
+* The EJB Generator was written by Jeremy Whitlock
+* Everything else was written by Tim Urberg.
+Tim was "WebAdmin guy" for a good long while.
+Before Tim came along the webadmin was just some experimental code I had in a branch, he did more than he realizes by putting his energy into it -- active people attract/ create more active people.
+Maybe we can convince him to come back and work on it ;)
+
+And of course I have to mention our own Paulo Lopes who wrote a really cool project out in SF.net (http://beangen.sourceforge.net/) which was the first plugin for the OpenEJB Webadmin.
+He wrote it before we even had shipped a release containing the Webadmin or had any docs at all on it, which in my mind shows just how neat the idea of using ejb's and simple conventions to do the console really is.
+
+Some notes going forward is that we have a truck load of meta-data now available via SystemInstance.get().get (OpenEjbConfiguration.class).
+Certainly JSR-77 is one option, but we could do far better with plain old java code.
+That tree is the primary source of meta-data for OpenEJB, it's what was used to construct every container, bean, resource adapter, database connector and _everything_ in the system (well, sans the protocols).
+Someone new to the project can look at it and understand it without having to read any abstract specs.
+Something to consider.
+The tree is read only in it's function, however it is possible to copy then edit and make new containers, etc.
+based on existing definitions.
+
+Additionally, using this same data structure it's possible to show the potential services available via the service-jar.xml files in the classpath that detail containers, resource adapters, database connectors, etc.
+which can be configured/created at runtime.
+So we could also display a sort of catalogue of components (aka.
+services) that someone could click and deploy via the console.
diff --git a/src/main/jbake/content/webadmin.md b/src/main/jbake/content/webadmin.md
deleted file mode 100644
index 6cd7116..0000000
--- a/src/main/jbake/content/webadmin.md
+++ /dev/null
@@ -1,169 +0,0 @@
-Title: Webadmin
-The Webadmin is a new addition to OpenEJB 1.0 and very innovative in that
-it lets you plug-in your own admin beans.  Here are some screenshots:
-
-- [Main](http://tomee.apache.org/images/webadmin-main.png)
-- [EJB Details](http://tomee.apache.org/images/webadmin-ejbdetails.png)
-- [List Logs](http://tomee.apache.org/images/webadmin-listlogs.png)
-- [System Properties](http://tomee.apache.org/images/webadmin-properties.png)
-- [JNDI Viewer](http://tomee.apache.org/images/webadmin-viewjndi.png)
-- [EJB Viewer](http://tomee.apache.org/images/webadmin-ejbviewer.png)
-- [Object and EJB Invoker](http://tomee.apache.org/images/webadmin-objectinvoker.png)
-
-<a name="Webadmin-EnablingtheWebadminin1.0beta1"></a>
-## Enabling the Webadmin in 1.0 beta 1
-
-The Webadmin console is in the 1.0 beta 1 release.  To enable it, simply
-move into the openejb.home directory and *copy* the
-openejb-webadmin-main.jar from the _beans_ directory into the _lib_
-directory.  Then start the server.
-
-
-    mingus:~/
-    $ cd /usr/local/openejb-1.0-beta1
-    
-    mingus:/usr/local/openejb-1.0-beta1 03:37:33 
-    $ cp beans/openejb-webadmin-main.jar lib/
-    
-    mingus:/usr/local/openejb-1.0-beta1 03:37:52 
-    $ ./bin/openejb start
-    OPENEJB_HOME = /usr/local/openejb-1.0-beta1
-    OpenEJB 1.0-beta1    build: 20050829-2233
-    http://www.openejb.org
-    resources 1
-    OpenEJB ready.
-    [init]
- OpenEJB Remote Server
-      ** Starting Services **
-      NAME		       IP	       PORT  
-      admin thread	       127.0.0.1       4200  
-      ejbd		       127.0.0.1       4201  
-      telnet	       127.0.0.1       4202  
-      webadmin	       127.0.0.1       4203  
-    -------
-    Ready!
-
-
-Now you can open your browser to go to http://localhost:4203/
-
-<a name="Webadmin-WebAdminBeans"></a>
-# WebAdmin Beans
-
-To create an EJB and have it included as part of the WebAdmin, simply
-subclass from WebAdminBean and include it in your ejb-jar.xml file as such:
-
-    <session>
-      <description>A JNDI viewer</description>
-      <ejb-name>webadmin/ViewJndi</ejb-name>
-      <home>org.openejb.webadmin.HttpHome</home>
-      <remote>org.openejb.webadmin.HttpObject</remote>
-      <ejb-class>org.openejb.webadmin.clienttools.ViewJndiBean</ejb-class>
-      <session-type>Stateless</session-type>
-      <transaction-type>Bean</transaction-type>
-    </session>
-
-    
-The ejb-name is used to create the menus and should follow the format of
-'menu-section/menu-item'. WebAdminBeans are grouped together by the
-'menu-section' portion of their ejb-name. The 'menu-item' is the clickable
-link that causes the EJB code to be execute. Very simple and makes it
-possible to package administrative components with your EJB applications.
-
-# WebAdmin Plugins
-
-Here is a project that already takes advantage of the new feature. [BeanGen|http://beangen.sourceforge.net]
-
-# Developers guide
-Below is David Blevins' email on how webadmin worked. Please have a look at
-the text below before you start working on porting the existing WebAdmin to
-version 3.
-
-Plain old stateless beans were used as the "servlets".	To make a bean that
-would show up in the Webadmin Console you simply had to implement the
-HttpBean interface (i think it's now called HttpListener) and give your
-bean a deploymentId following this format "webadmin/{section}/\{page\}". 
-Anyone could add to the Webadmin console by doing both of these things,
-which is really cool as people developing EJB apps can also deploy beans
-for administering those apps right in the exact same jar.  This is not only
-easy for packaging but means new sections can be added/removed on the fly.
-
-Using the described "webadmin/{section}/\{page\}" deploymentId format,
-things end up automagically grouped in the JNDI tree.  There's a 'webadmin'
-context we grab which will contain any number of "section" contexts
-("ClientTools", "EJBGenerator", etc.).	Each of those section subcontexts
-will contain several beans which we will use to make the pages.  Making the
-menu is pretty easy as we just iterate over the webadmin section of the
-global jndi tree.
-
-When an http request came in we just took the path part of the GET or POST
-request, prepended "webadmin/" and then went looking for a bean with that
-deployment id and invoked it via it's HttpBean (now called HttpListener)
-interface passing in a HttpRequest and HttpResponse objects which are
-trimmed down versions of similar servlet classes.
-There'll be some changes to this as now we support our plain ejb protocol
-over our http implementation, so the two will have to find a way to share
-the URL space.	See the openejb-http module.
-
-To implement session state, we had a stateful session bean implementing an
-HttpSession interface (again, similar to the servlet equivalent) and simply
-wrote the internal ID of the bean instance into a Cookie sent to the
-browser.  For some reason we would write the javax.ejb.Handle of the
-stateful bean's EJBObject to disk and
-read it back out on subsequent requests then used it to get a reference to
-the EJBObject again.  I'm not sure why we didn't just keep a static hashmap
-and put the EJBObject right in it using an ID we could just make up like
-UUID (that would have been way simpler).
-
-We had a standard superclass we favored for beans that implemented the
-HttpBean (HttpListener) interface that did templating and the
-aforementioned menu  construction.  The templating was perhaps too tricky
-as we used a non-printable character to determine where to insert data. 
-Now we could just use swizzle-stream for some pretty decent templating
-ability or even velocity.  I'd be hesitant to endorse velocity as we
-already have a dep on swizzle-stream and wouldn't want to see us add
-another meg to our distro size if we can avoid it -- we have like 3 times
-as many deps as 1.0 did and we should probably start tightening the belt.
-
-To serve static things like images, we had a "default" HttpBean which
-searched for the items in the classpath and wrote them into the response
-setting the mime type, etc. correctly.	One thing that we never did which
-still needs to happen is that the bean didn't have the logic to set the
-modification information into the response so the "If modified since"
-header which would allow the browser to rely on it's cache instead of
-requesting the same images over and over again.
-
-That pretty much covers the way it was put together.
-    
-    
-  - The Jndi Viewer, Class Viewer, Ejb Viewer, and Object Invoker were written by yours truly
-  - The EJB Generator was written by Jeremy Whitlock
-  - Everything else was written by Tim Urberg.	Tim was "WebAdmin guy" for
-    a good long while.  Before Tim came along the webadmin was just some
-    experimental code I had in a branch, he did more than he realizes by putting his energy
-    into it -- active people attract/ create more active people.  Maybe we can
-    convince him to come back and work on it ;)
-    
-And of course I have to mention our own Paulo Lopes who wrote a really cool
-project out in SF.net (http://beangen.sourceforge.net/) which was the first
-plugin for the OpenEJB Webadmin.  He wrote it before we even had shipped a
-release containing the Webadmin or had any docs at all on it, which in my
-mind shows just how neat the idea of using ejb's and simple conventions to
-do the console really is.
-
-Some notes going forward is that we have a truck load of meta-data now
-available via SystemInstance.get().get (OpenEjbConfiguration.class). 
-Certainly JSR-77 is one option, but we could do far better with plain old
-java code.  That tree is the primary source of meta-data for OpenEJB, it's
-what was used to construct every container, bean, resource adapter,
-database connector and *everything* in the system (well, sans the
-protocols).  Someone new to the project can look at it and understand it
-without having to read any abstract specs.  Something to consider.  The
-tree is read only in it's function, however it is possible to copy then
-edit and make new containers, etc. based on existing definitions.
-
-Additionally, using this same data structure it's possible to show the
-potential services available via the service-jar.xml files in the classpath
-that detail containers, resource adapters, database connectors, etc. which
-can be configured/created at runtime.  So we could also display a sort of
-catalogue of components (aka. services) that someone could click and deploy
-via the console.
diff --git a/src/main/jbake/content/webobjects.adoc b/src/main/jbake/content/webobjects.adoc
new file mode 100644
index 0000000..5b88212
--- /dev/null
+++ b/src/main/jbake/content/webobjects.adoc
@@ -0,0 +1,7 @@
+= WebObjects
+:jbake-type: page
+:jbake-status: published
+
+We don't officially support the WebObjects OpenEJB integration, but we are happy to offer up this page for those users to place information on usage of EJBs in WebObjects 5.1.
+
+Click the edit link above, sign up for an wiki account and edit away!
diff --git a/src/main/jbake/content/webobjects.md b/src/main/jbake/content/webobjects.md
deleted file mode 100644
index 73bd9ac..0000000
--- a/src/main/jbake/content/webobjects.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Title: WebObjects
-
-We don't officially support the WebObjects OpenEJB integration, but we are
-happy to offer up this page for those users to place information on usage
-of EJBs in WebObjects 5.1.
-
-Click the edit link above, sign up for an wiki account and edit away!
diff --git a/src/main/jbake/templates/contributors.gsp b/src/main/jbake/templates/contributors.gsp
index c4049d8..afd4fb3 100755
--- a/src/main/jbake/templates/contributors.gsp
+++ b/src/main/jbake/templates/contributors.gsp
@@ -16,23 +16,18 @@
         </div>
         <div class="row">
             <div class="col-md-12 contributors">
-              <div class="text-center" style="padding-bottom: 2em;">A <i class="fa fa-star-o" style="color:#F38F24;"></i> means the contributor is also a committer.</div>
+              <div class="text-center" style="padding-bottom: 2em;">We want to thank the following individuals for contributing to Apache TomEE. An up to date contributor list can be found <a href="https://github.com/apache/tomee/graphs/contributors">here</a>. The current list of committers can be found <a href="https://projects.apache.org/committee.html?tomee">here</a>.</div>
               <ul>
                 <%
-                    org.apache.tomee.website.Contributors.load(content.body).each {contributor ->
+                    org.apache.tomee.website.contributors.Contributors.load(content.body).each { contributor ->
                 %>
                   <div class="col-sm-4">
                     <div class="photo col-sm-5">
-                      <img alt="${contributor.name}" src="${contributor.gravatar}" style="width:140px">
-                      <% if (contributor.committer){ %><i class="pull-right fa fa-star-o" style="color:#F38F24;"></i><% } %>
+                      <img src="${contributor.avatar}" style="width:140px">
                     </div>
                     <div class="col-sm-7">
-                      <h3 class="contributor-name" style="font-size:1.4em;">${contributor.name}</h3>
+                        <h5 class="contributor-name" style="font-size:1.0em;"><a href="${contributor.github}">${contributor.name}</a></h5>
                       <p></p>
-                      <ul class="list-inline">
-                      <%contributor.link.each {l ->%>
-                      <li><a href="${l.url}">${l.name}</a></li>
-                      <%}%>
                     </div>
                   </div>
               <% } %>
diff --git a/src/main/jbake/templates/footer.gsp b/src/main/jbake/templates/footer.gsp
index 71c4da7..e627254 100755
--- a/src/main/jbake/templates/footer.gsp
+++ b/src/main/jbake/templates/footer.gsp
@@ -1,3 +1,4 @@
+<div style="margin-bottom: 30px;"></div>
 <footer>
 		<div class="container">
 			<div class="row">
@@ -7,7 +8,6 @@
 					<ul class="social-footer">
 						<li><a href="https://www.facebook.com/ApacheTomEE/"><i class="fa fa-facebook"></i></a></li>
 						<li><a href="https://twitter.com/apachetomee"><i class="fa fa-twitter"></i></a></li>
-						<li><a href="https://plus.google.com/communities/105208241852045684449"><i class="fa fa-google-plus"></i></a></li>
 					</ul>
 				</div>
 				<div class="col-sm-6 text-center-mobile">
@@ -51,7 +51,7 @@
 			</div>
 			<div class="row bottom-footer text-center-mobile">
 				<div class="col-sm-12 light-white">
-					<p>Copyright &copy; 1999-2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache TomEE, TomEE, Apache, the Apache feather logo, and the Apache TomEE project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+					<p>Copyright &copy; 1999-2021 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache TomEE, TomEE, Apache, the Apache feather logo, and the Apache TomEE project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
 				</div>
 			</div>
 		</div>
diff --git a/src/main/jbake/templates/index.gsp b/src/main/jbake/templates/index.gsp
index 227f1d7..6623db7 100755
--- a/src/main/jbake/templates/index.gsp
+++ b/src/main/jbake/templates/index.gsp
@@ -10,45 +10,171 @@
                             Apache TomEE
                         </div>
                         <div class="col-md-12 text-center">
-                            <h2 class="white typed">MicroProfile and Jakarta EE on Tomcat</h2>
-                            <span class="typed-cursor">|</span>
+                            <h2 class="white">Now Jakarta EE 9.1 Web Profile Certified!</h2>
                         </div>
                     </div>
+                    <div style="opacity: 0;" class="row animated fadeInUp text-left header-links">
+                        <div class="col-md-3 no-padding">
+                        </div>
+                        <div class="col-md-3 no-padding">
+                            <a href="docs.html">
+                                <div class="link-block">
+                                    <i class="icon_documents_alt white circled-icon"></i>
+                                    <div class="bottom">
+                                        <h4 class="white">Documentation</h4>
+                                        <h5 class="white">Learn more about Apache TomEE</h5>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        <div class="col-md-3 no-padding">
+                            <a href="community/index.html">
+                                <div class="link-block">
+                                    <i class="icon_group white circled-icon"></i>
+                                    <div class="bottom">
+                                        <h4 class="white">Community</h4>
+                                        <h5 class="white">How can I contribute to TomEE?</h5>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        <div class="col-md-3 no-padding">
+                            <a href="download.html">
+                                <div class="link-block">
+                                    <i class="icon_download white circled-icon"></i>
+                                    <div class="bottom">
+                                        <h4 class="white">Downloads</h4>
+                                        <h5 class="white">How can I download Apache TomEE?</h5>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+			        </div>
                 </div>
             </div>
         </div>
     </header>
-
     <section>
-		<div class="cut cut-top" style="border-right-width: 1899px;"></div>
 		<div class="container">
-			<div class="row intro-tables animated fadeInUp" style="opacity: 0;">
-				<div class="col-md-4">
-				    <div class="intro-table intro-table1 intro-table-hover1 intro-table-hover">
-                        <h5 class="white heading hide-hover">Learn more about TomEE</h5>
-                        <div class="bottom">
-                            <h4 class="white heading small-heading no-margin regular">Documentation</h4>
-                            <a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>/docs.html" class="btn btn-white-fill expand">Learn more...</a>
+			<div class="row animated fadeInUp d-flex section" style="opacity: 0;">
+				<div class="col-md-9 text-center m-auto">
+                        <h3 class="lead muted">Apache TomEE, pronounced “Tommy”, is an all-Apache Jakarta EE 9.1 certified application server extends Apache Tomcat that is assembled from a vanilla Apache Tomcat zip file. We start with Apache Tomcat, add our jars, and zip up the rest.
+                            The result is Tomcat plus EE features - TomEE.</h3>
+				</div>
+			</div>
+            <div class="row animated fadeInUp d-flex section no-padding" style="opacity: 0;">  
+				<div class="col-md-6 d-flex f-column-start accented-block accent-violet f-space-between">
+                    <div class="block-content">
+                        <h5 class="muted">Final Release - javax namespace</h5>
+                        <h4 class="muted">apache-tomee-8.0.6</h4>
+                        <p>Stable and ready for production, Apache TomEE 8.0 implements Java EE 8 / Jakarta EE 8 and supports the javax namespace.  Runs on Java 8 or higher.</p>
+                    </div>
+                    <a class="btn btn-accent btn-primary square"  href="download.html#tomee-8.0"><i class="icon_plus"></i>Download</a>
+				</div>
+                <div class="col-md-6 d-flex f-column-end accented-block accent-red f-space-between">
+                    <div class="block-content">
+                        <h5 class="muted">Latest Milestone - Jakarta namespace</h5>
+                        <h4 class="muted">apache-tomee-9.0.0-M7</h4>
+                        <p>
+                            Jakarta EE 9.1 Web Profile compliant and supports the new jakarta namespace.  Runs on Java 8 or higher.
+                            <br>
+                            <div class="compatible-badge">Jakarte EE Compatible</div>
+                        </p>
+                    </div>
+                    <a class="btn btn-accent btn-primary square"  href="download.html#tomee-9.0"><i class="icon_plus"></i>Download</a>
+				</div>
+			</div>
+            <div class="row animated fadeInUp d-flex section" style="opacity: 0;">  
+				<div class="col-md-6 d-flex f-space-between">
+                    <div class="flavours-block">
+                        <div class="flavours-title">
+                            Flavors
+                        </div>
+                        <div class="flavour flavour-plus">
+                            <div class="flavour-icon">+</div>
+                            <div class="flavour-content">
+                                <div class="flavour-artifact">APACHE TOMEE</div>
+                                <div class="flavour-identifier">PLUS</div>
+                            </div>
+                        </div>
+                        <div class="flavour flavour-plume">
+                            <div class="flavour-icon">P</div>
+                            <div class="flavour-content">
+                                <div class="flavour-artifact">APACHE TOMEE</div>
+                                <div class="flavour-identifier">PLUME</div>
+                            </div>
+                        </div>
+                        <div class="flavour flavour-webprofile">
+                            <div class="flavour-icon">W</div>
+                            <div class="flavour-content">
+                                <div class="flavour-artifact">APACHE TOMEE</div>
+                                <div class="flavour-identifier">WEBPROFILE</div>
+                            </div>
+                        </div>
+                        <div class="flavour flavour-microprofile">
+                            <div class="flavour-icon">M</div>
+                            <div class="flavour-content">
+                                <div class="flavour-artifact">APACHE TOMEE</div>
+                                <div class="flavour-identifier">MICROPROFILE</div>
+                            </div>
                         </div>
                     </div>
 				</div>
-				<div class="col-md-4">
-					<div class="intro-table intro-table2 intro-table-hover2 intro-table-hover">
-						<h5 class="white heading hide-hover">How can I contribute to TomEE?</h5>
-						<div class="bottom">
-							<h4 class="white heading small-heading no-margin regular">Community</h4>
-							<a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>/community/index.html" class="btn btn-white-fill expand">Learn more...</a>
-						</div>
-					</div>
-				</div>
-				<div class="col-md-4">
-                    <div class="intro-table intro-table3 intro-table-hover3 intro-table-hover">
-                        <h5 class="white heading hide-hover">How can I download TomEE?</h5>
-                        <div class="bottom">
-                            <h4 class="white heading small-heading no-margin regular">Downloads</h4>
-                            <a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>/download-ng.html" class="btn btn-white-fill expand">Learn more...</a>
-                        </div>
+                <div class="col-md-6 d-flex f-column-start accented-block accent-orange f-space-between">
+                    <div class="block-content">
+                        <h5 class="muted">What is your flavor?</h5>
+                        <h4 class="muted">TomEE Flavors</h4>
+                        <p>
+                            Apache TomEE comes with four different flavors, Web Profile, MicroProfile, Plus and Plume. Apache TomEE Web Profile delivers Servlets, JSP, JSF, JTA, JPA, CDI, Bean Validation and EJB Lite. Apache TomEE MicroProfile adds support for MicroProfile.  Apache TomEE Plus and Plume add support for JMS, JAX-WS and more.
+                        </p>
                     </div>
+                    <a class="btn btn-accent btn-primary square"  href="comparison.html"><i class="icon_plus"></i>See Comparison</a>
+				</div>
+			</div>    
+        </div>
+    </section>
+    <section class="committers-info-section">
+        <div class="container">
+            <div class="row animated fadeInUp" style="opacity: 0;">  
+				<div class="col-md-3">
+                    <div class="info-count">100</div>
+                    <div class="info-title">Contributors</div>
+				</div>
+                <div class="col-md-3">
+                    <div class="info-count">10k</div>
+                    <div class="info-title">Coffees</div>
+				</div>
+                <div class="col-md-3">
+                    <div class="info-count">800k</div>
+                    <div class="info-title">Lines of code</div>
+				</div>
+                <div class="col-md-3">
+                    <div class="info-count">13k</div>
+                    <div class="info-title">Commits</div>
+				</div>
+			</div>
+        </div>
+    </section>
+    <section>
+		<div class="container">
+            <div class="row animated fadeInUp d-flex section" style="opacity: 0;">  
+				<div class="col-md-6 d-flex f-column-start accented-block accent-violet f-space-between">
+                    <div class="block-content">
+                        <h5 class="muted">Learn TomEE with</h5>
+                        <div class="jakarta-ee-logo"></div>
+                        <p>Jakarta EE, powered by participation, is focused on enabling community-driven collaboration and open innovation for the cloud. </p>
+                    </div>
+                    <a class="btn btn-accent btn-primary square"  href="latest/examples/"><i class="icon_plus"></i>Examples</a>
+				</div>
+                <div class="col-md-6 d-flex f-column-end accented-block accent-red f-space-between">
+                    <div class="block-content">
+                        <h5 class="muted">Learn TomEE with</h5>
+                        <div class="microprofile-logo"></div>
+                        <p>
+                            MicroProfile is an open forum that optimizes Enterprise Java for a microservice architecture by innovating across multiple implementations and collaborating on common areas of interest with a goal of standardization.
+                        </p>
+                    </div>
+                    <a class="btn btn-accent btn-primary square"  href="latest/examples/"><i class="icon_plus"></i>Examples</a>
 				</div>
 			</div>
 		</div>
diff --git a/src/main/jbake/templates/menu.gsp b/src/main/jbake/templates/menu.gsp
index db28af6..fd432c0 100755
--- a/src/main/jbake/templates/menu.gsp
+++ b/src/main/jbake/templates/menu.gsp
@@ -10,19 +10,25 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="/">
+				<a class="navbar-brand" href="/" title="Apache TomEE">
 				    <span>
 
 				    <% if (content.uri && content.uri == '/index.html') { %>
 				        <img
-                            src="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>img/logo.png"
-                            data-active-url="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>img/logo-active.png">
+                            src="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>img/apache_tomee-logo-white.svg"
+                            data-active-url="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>img/apache_tomee-logo.svg"
+							onerror="this.src='<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>img/apache_tomee-logo.jpg'"
+							height="50"
+							>
                     <% } else { %>
-                        <img src="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>img/logo-active.png">
+                        <img 
+							src="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>img/apache_tomee-logo.svg"
+							onerror="this.src='<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>img/apache_tomee-logo.jpg'"
+							height="50"
+							>
                     <% } %>
 
                     </span>
-				    Apache TomEE
                 </a>
 			</div>
 			<!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,7 +37,7 @@
 					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>docs.html">Documentation</a></li>
 					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>community/index.html">Community</a></li>
 					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>security/security.html">Security</a></li>
-					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>download-ng.html">Downloads</a></li>
+					<li><a class="btn btn-accent accent-orange no-shadow" href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>download.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
diff --git a/src/test/java/org/apache/tomee/website/contributors/ContributorDataTest.java b/src/test/java/org/apache/tomee/website/contributors/ContributorDataTest.java
new file mode 100644
index 0000000..5669e44
--- /dev/null
+++ b/src/test/java/org/apache/tomee/website/contributors/ContributorDataTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomee.website.contributors;
+
+import org.apache.openejb.loader.IO;
+import org.junit.Test;
+
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+
+public class ContributorDataTest {
+
+    @Test
+    public void read() throws Exception {
+
+        final URL resource = this.getClass().getClassLoader().getResource("contributor-data.json");
+        final String json = IO.slurp(resource);
+        final Jsonb jsonb = JsonbBuilder.create();
+        final ContributorData[] data = jsonb.fromJson(json, ContributorData[].class);
+
+        assertEquals(12, data.length);
+        assertEquals("djencks", data[3].getAuthor().getLogin());
+        assertEquals(36, data[3].getTotal());
+        assertEquals(19581, data[3].getWeeks().get(135).getA());
+        assertEquals(9998, data[3].getWeeks().get(135).getD());
+        assertEquals(6, data[3].getWeeks().get(135).getC());
+    }
+
+    @Test
+    public void getStats() throws Exception {
+
+        final URL resource = this.getClass().getClassLoader().getResource("contributor-data.json");
+        final String json = IO.slurp(resource);
+        final Jsonb jsonb = JsonbBuilder.create();
+        final ContributorData[] data = jsonb.fromJson(json, ContributorData[].class);
+
+        assertEquals(12, data.length);
+        assertEquals("djencks", data[3].getAuthor().getLogin());
+
+        final Stats stats = data[3].getStats();
+        assertEquals(36, stats.getCommits());
+        assertEquals(35243, stats.getLinesAdded());
+        assertEquals(25020, stats.getLinesRemoved());
+    }
+
+}
diff --git a/src/test/java/org/apache/tomee/website/contributors/ContributorTest.java b/src/test/java/org/apache/tomee/website/contributors/ContributorTest.java
new file mode 100644
index 0000000..51da5d1
--- /dev/null
+++ b/src/test/java/org/apache/tomee/website/contributors/ContributorTest.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomee.website.contributors;
+
+import org.apache.openejb.loader.IO;
+import org.junit.Test;
+
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertEquals;
+
+public class ContributorTest {
+
+    @Test
+    public void unique() throws IOException {
+        final URL resource = this.getClass().getClassLoader().getResource("contributor-data.json");
+        final String json = IO.slurp(resource);
+        final Jsonb jsonb = JsonbBuilder.create();
+        final ContributorData[] data = jsonb.fromJson(json, ContributorData[].class);
+
+        final List<ContributorData> list = new ArrayList<>(Arrays.asList(data));
+        list.add(data[3]); // djencks
+        list.add(data[5]); // rzo1
+        list.add(data[5]); // rzo1
+        list.add(data[5]); // rzo1
+        list.add(data[10]); // dblevins
+
+        final List<Contributor> duplicates = list.stream()
+                .map(ContributorData::asContributor)
+                .collect(Collectors.toList());
+
+        final List<Contributor> unique = Contributor.unique(duplicates);
+        final Map<String, Contributor> map = unique.stream().collect(Collectors.toMap(Contributor::getName, Function.identity()));
+        
+        assertEquals(17, duplicates.size());
+        assertEquals(12, unique.size());
+        assertEquals(12, map.size());
+
+        final Contributor djencks = map.get("djencks");
+        assertEquals("djencks", djencks.getName());
+        assertEquals(72, djencks.getStats().getCommits());
+        assertEquals(70486, djencks.getStats().getLinesAdded());
+        assertEquals(50040, djencks.getStats().getLinesRemoved());
+
+        final Contributor rzo1 = map.get("rzo1");
+        assertEquals("rzo1", rzo1.getName());
+        assertEquals(48, rzo1.getStats().getCommits());
+        assertEquals(5952, rzo1.getStats().getLinesAdded());
+        assertEquals(4164, rzo1.getStats().getLinesRemoved());
+
+        final Contributor dblevins = map.get("dblevins");
+        assertEquals("dblevins", dblevins.getName());
+        assertEquals(158, dblevins.getStats().getCommits());
+        assertEquals(88898, dblevins.getStats().getLinesAdded());
+        assertEquals(139256, dblevins.getStats().getLinesRemoved());
+
+        final Contributor cesarhernandezgt = map.get("cesarhernandezgt");
+        assertEquals("cesarhernandezgt", cesarhernandezgt.getName());
+        assertEquals(14, cesarhernandezgt.getStats().getCommits());
+        assertEquals(1073, cesarhernandezgt.getStats().getLinesAdded());
+        assertEquals(356, cesarhernandezgt.getStats().getLinesRemoved());
+    }
+}
diff --git a/src/test/java/org/apache/tomee/website/contributors/StatsTest.java b/src/test/java/org/apache/tomee/website/contributors/StatsTest.java
new file mode 100644
index 0000000..f66efb7
--- /dev/null
+++ b/src/test/java/org/apache/tomee/website/contributors/StatsTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomee.website.contributors;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class StatsTest {
+
+    @Test
+    public void add() {
+        final Stats a = new Stats(3, 5, 7);
+        final Stats b = new Stats(11, 13, 17);
+
+        final Stats c = a.add(b);
+        assertEquals(14, c.getCommits());
+        assertEquals(18, c.getLinesAdded());
+        assertEquals(24, c.getLinesRemoved());
+    }
+
+    @Test
+    public void max() {
+        final Stats a = new Stats(157, 241, 37);
+        final Stats b = new Stats(211, 113, 23);
+
+        final Stats c = a.max(b);
+        assertEquals(211, c.getCommits());
+        assertEquals(241, c.getLinesAdded());
+        assertEquals(37, c.getLinesRemoved());
+    }
+
+    @Test
+    public void score() {
+        final Stats max = new Stats(157, 241, 37);
+
+        assertEquals(0, max.score(new Stats(0, 0, 0)));
+        assertEquals(333333, max.score(new Stats(157, 0, 0)));
+        assertEquals(666667, max.score(new Stats(157, 241, 0)));
+        assertEquals(1000000, max.score(new Stats(157, 241, 37)));
+        assertEquals(431752, max.score(new Stats(50, 40, 30)));
+    }
+}
diff --git a/src/test/resources/contributor-data.json b/src/test/resources/contributor-data.json
new file mode 100644
index 0000000..2510473
--- /dev/null
+++ b/src/test/resources/contributor-data.json
@@ -0,0 +1,14762 @@
+[
+  {
+    "total": 1,
+    "author": {
+      "id": 7949105,
+      "login": "kaminfeuer",
+      "avatar": "https://avatars.githubusercontent.com/u/7949105?s=60&v=4",
+      "path": "/kaminfeuer",
+      "hovercard_url": "/users/kaminfeuer/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544313600,
+        "a": 147,
+        "d": 49,
+        "c": 1
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  },
+  {
+    "total": 1,
+    "author": {
+      "id": 6817157,
+      "login": "j4fm",
+      "avatar": "https://avatars.githubusercontent.com/u/6817157?s=60&v=4",
+      "path": "/j4fm",
+      "hovercard_url": "/users/j4fm/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 33,
+        "d": 17,
+        "c": 1
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  },
+  {
+    "total": 29,
+    "author": {
+      "id": 548624,
+      "login": "jgallimore",
+      "avatar": "https://avatars.githubusercontent.com/u/548624?s=60&v=4",
+      "path": "/jgallimore",
+      "hovercard_url": "/users/jgallimore/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 75,
+        "d": 49,
+        "c": 3
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 17,
+        "d": 3,
+        "c": 1
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 41,
+        "d": 17,
+        "c": 4
+      },
+      {
+        "w": 1540080000,
+        "a": 14,
+        "d": 14,
+        "c": 1
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 33,
+        "d": 21,
+        "c": 1
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 30,
+        "d": 30,
+        "c": 2
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 56,
+        "d": 27,
+        "c": 1
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 67,
+        "d": 67,
+        "c": 2
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 70,
+        "d": 62,
+        "c": 3
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 83,
+        "d": 36,
+        "c": 1
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 7,
+        "d": 9,
+        "c": 2
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 88,
+        "d": 43,
+        "c": 1
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 103,
+        "d": 74,
+        "c": 3
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 48,
+        "d": 21,
+        "c": 1
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 206,
+        "d": 156,
+        "c": 2
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 36,
+        "d": 22,
+        "c": 1
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  },
+  {
+    "total": 36,
+    "author": {
+      "id": 569822,
+      "login": "djencks",
+      "avatar": "https://avatars.githubusercontent.com/u/569822?s=60&v=4",
+      "path": "/djencks",
+      "hovercard_url": "/users/djencks/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 19581,
+        "d": 9998,
+        "c": 6
+      },
+      {
+        "w": 1581206400,
+        "a": 12626,
+        "d": 12610,
+        "c": 5
+      },
+      {
+        "w": 1581811200,
+        "a": 655,
+        "d": 443,
+        "c": 16
+      },
+      {
+        "w": 1582416000,
+        "a": 172,
+        "d": 0,
+        "c": 1
+      },
+      {
+        "w": 1583020800,
+        "a": 2209,
+        "d": 1969,
+        "c": 8
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  },
+  {
+    "total": 4,
+    "author": {
+      "id": 1249546,
+      "login": "rmannibucau",
+      "avatar": "https://avatars.githubusercontent.com/u/1249546?s=60&v=4",
+      "path": "/rmannibucau",
+      "hovercard_url": "/users/rmannibucau/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 59465,
+        "d": 26,
+        "c": 4
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  },
+  {
+    "total": 12,
+    "author": {
+      "id": 13417392,
+      "login": "rzo1",
+      "avatar": "https://avatars.githubusercontent.com/u/13417392?s=60&v=4",
+      "path": "/rzo1",
+      "hovercard_url": "/users/rzo1/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 64,
+        "d": 58,
+        "c": 3
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 1186,
+        "d": 761,
+        "c": 3
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 11,
+        "d": 6,
+        "c": 1
+      },
+      {
+        "w": 1621123200,
+        "a": 227,
+        "d": 216,
+        "c": 5
+      }
+    ]
+  },
+  {
+    "total": 5,
+    "author": {
+      "id": 8139890,
+      "login": "Daniel-Dos",
+      "avatar": "https://avatars.githubusercontent.com/u/8139890?s=60&v=4",
+      "path": "/Daniel-Dos",
+      "hovercard_url": "/users/Daniel-Dos/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 15,
+        "d": 15,
+        "c": 2
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 8,
+        "d": 0,
+        "c": 1
+      },
+      {
+        "w": 1545523200,
+        "a": 76,
+        "d": 76,
+        "c": 1
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 1,
+        "d": 1,
+        "c": 1
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  },
+  {
+    "total": 2,
+    "author": {
+      "id": 12471122,
+      "login": "sendilkumarn",
+      "avatar": "https://avatars.githubusercontent.com/u/12471122?s=60&v=4",
+      "path": "/sendilkumarn",
+      "hovercard_url": "/users/sendilkumarn/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 18,
+        "d": 17,
+        "c": 2
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  },
+  {
+    "total": 1,
+    "author": {
+      "id": 292938,
+      "login": "cchacin",
+      "avatar": "https://avatars.githubusercontent.com/u/292938?s=60&v=4",
+      "path": "/cchacin",
+      "hovercard_url": "/users/cchacin/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 84,
+        "d": 0,
+        "c": 1
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  },
+  {
+    "total": 14,
+    "author": {
+      "id": 1454523,
+      "login": "cesarhernandezgt",
+      "avatar": "https://avatars.githubusercontent.com/u/1454523?s=60&v=4",
+      "path": "/cesarhernandezgt",
+      "hovercard_url": "/users/cesarhernandezgt/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 37,
+        "d": 12,
+        "c": 1
+      },
+      {
+        "w": 1543708800,
+        "a": 134,
+        "d": 15,
+        "c": 1
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 277,
+        "d": 75,
+        "c": 2
+      },
+      {
+        "w": 1546732800,
+        "a": 205,
+        "d": 179,
+        "c": 3
+      },
+      {
+        "w": 1547337600,
+        "a": 54,
+        "d": 17,
+        "c": 1
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 52,
+        "d": 1,
+        "c": 1
+      },
+      {
+        "w": 1619913600,
+        "a": 314,
+        "d": 57,
+        "c": 5
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  },
+  {
+    "total": 79,
+    "author": {
+      "id": 94926,
+      "login": "dblevins",
+      "avatar": "https://avatars.githubusercontent.com/u/94926?s=60&v=4",
+      "path": "/dblevins",
+      "hovercard_url": "/users/dblevins/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1499558400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500163200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 12791,
+        "d": 33275,
+        "c": 16
+      },
+      {
+        "w": 1543708800,
+        "a": 2033,
+        "d": 847,
+        "c": 11
+      },
+      {
+        "w": 1544313600,
+        "a": 214,
+        "d": 625,
+        "c": 4
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 176,
+        "d": 45,
+        "c": 4
+      },
+      {
+        "w": 1546732800,
+        "a": 11161,
+        "d": 11050,
+        "c": 3
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 54,
+        "d": 6,
+        "c": 2
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 224,
+        "d": 0,
+        "c": 1
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 1122,
+        "d": 89,
+        "c": 6
+      },
+      {
+        "w": 1593907200,
+        "a": 38,
+        "d": 30,
+        "c": 1
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 212,
+        "d": 4,
+        "c": 2
+      },
+      {
+        "w": 1596931200,
+        "a": 4300,
+        "d": 723,
+        "c": 8
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 20,
+        "d": 170,
+        "c": 1
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 12104,
+        "d": 22764,
+        "c": 20
+      }
+    ]
+  },
+  {
+    "total": 9,
+    "author": {
+      "id": 2260551,
+      "login": "ivanjunckes",
+      "avatar": "https://avatars.githubusercontent.com/u/2260551?s=60&v=4",
+      "path": "/ivanjunckes",
+      "hovercard_url": "/users/ivanjunckes/hovercard"
+    },
+    "weeks": [
+      {
+        "w": 1498953600,
+        "a": 356,
+        "d": 314,
+        "c": 6
+      },
+      {
+        "w": 1499558400,
+        "a": 8,
+        "d": 12,
+        "c": 2
+      },
+      {
+        "w": 1500163200,
+        "a": 9,
+        "d": 1,
+        "c": 1
+      },
+      {
+        "w": 1500768000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501372800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1501977600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1502582400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503187200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1503792000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1504396800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505001600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1505606400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506211200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1506816000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1507420800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508025600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1508630400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509235200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1509840000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1510444800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511049600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1511654400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512259200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1512864000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1513468800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514073600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1514678400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515283200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1515888000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1516492800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517097600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1517702400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518307200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1518912000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1519516800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520121600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1520726400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521331200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1521936000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1522540800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523145600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1523750400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524355200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1524960000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1525564800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526169600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1526774400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527379200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1527984000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1528588800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529193600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1529798400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1530403200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531008000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1531612800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532217600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1532822400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1533427200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534032000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1534636800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535241600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1535846400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1536451200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537056000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1537660800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538265600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1538870400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1539475200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540080000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1540684800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541289600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1541894400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1542499200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543104000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1543708800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544313600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1544918400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1545523200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546128000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1546732800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547337600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1547942400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1548547200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549152000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1549756800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550361600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1550966400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1551571200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552176000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1552780800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553385600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1553990400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1554595200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555200000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1555804800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1556409600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557014400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1557619200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558224000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1558828800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1559433600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560038400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1560643200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561248000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1561852800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1562457600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563062400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1563667200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564272000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1564876800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1565481600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566086400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1566691200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567296000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1567900800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1568505600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569110400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1569715200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570320000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1570924800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1571529600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572134400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1572739200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573344000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1573948800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1574553600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575158400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1575763200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576368000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1576972800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1577577600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578182400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1578787200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579392000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1579996800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1580601600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581206400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1581811200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1582416000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583020800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1583625600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584230400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1584835200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1585440000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586044800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1586649600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587254400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1587859200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1588464000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589068800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1589673600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590278400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1590883200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1591488000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592092800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1592697600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593302400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1593907200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1594512000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595116800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1595721600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596326400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1596931200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1597536000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598140800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1598745600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599350400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1599955200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1600560000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601164800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1601769600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602374400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1602979200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1603584000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604188800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1604793600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1605398400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606003200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1606608000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607212800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1607817600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1608422400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609027200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1609632000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610236800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1610841600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1611446400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612051200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1612656000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613260800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1613865600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1614470400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615075200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1615680000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616284800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1616889600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1617494400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618099200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1618704000,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619308800,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1619913600,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1620518400,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      },
+      {
+        "w": 1621123200,
+        "a": 0,
+        "d": 0,
+        "c": 0
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/tomee/antora.yml b/tomee/antora.yml
new file mode 100644
index 0000000..e712d77
--- /dev/null
+++ b/tomee/antora.yml
@@ -0,0 +1,7 @@
+name: common
+title: TomEE Common Information
+version: master
+start_page: ROOT:contribute.adoc
+nav:
+- modules/ROOT/nav.adoc
+- modules/ROOT/nav0.adoc
diff --git a/tomee/modules/ROOT/nav.adoc b/tomee/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..74f6667
--- /dev/null
+++ b/tomee/modules/ROOT/nav.adoc
@@ -0,0 +1,146 @@
+* xref:articles.adoc[]
+* xref:azure.adoc[]
+* xref:blog/2016/03/new-website.adoc[]
+* xref:blog/2017/tomee-7.0.3-released.adoc[]
+* xref:blog/index.adoc[]
+* xref:commercial-support.adoc[]
+* xref:community/commercial.adoc[]
+* xref:community/contributing/contribution-tips.adoc[]
+* xref:community/contributing/jira-ticket.adoc[]
+* xref:community/contributing/process-task.adoc[]
+* xref:community/contributing/submit-changes.adoc[]
+* xref:community/contributing/website.adoc[]
+* xref:community/contributing/workflow.adoc[]
+* xref:community/contributors.adoc[]
+* xref:community/culture.adoc[]
+* xref:community/index.adoc[]
+* xref:community/social.adoc[]
+* xref:community/sources.adoc[]
+* xref:comparison.adoc[]
+* xref:concepts.adoc[]
+* xref:contribute.adoc[]
+* xref:dev/april2008.adoc[]
+* xref:dev/april2009.adoc[]
+* xref:dev/arquillian-test-porting-initiative.adoc[]
+* xref:dev/asf.adoc[]
+* xref:dev/august2007.adoc[]
+* xref:dev/building-from-source.adoc[]
+* xref:dev/cdi-tck-webappsdeployer.adoc[]
+* xref:dev/configuration-and-assembly.adoc[]
+* xref:dev/contribution-tips.adoc[]
+* xref:dev/creating-itests.adoc[]
+* xref:dev/design-application-server.adoc[]
+* xref:dev/design-application-serverlinks.adoc[]
+* xref:dev/design-assembler.adoc[]
+* xref:dev/design-bmp-entitybean-container.adoc[]
+* xref:dev/design-classic-assembler.adoc[]
+* xref:dev/design-cmp-entitybean-container.adoc[]
+* xref:dev/design-configuration-factory.adoc[]
+* xref:dev/design-container.adoc[]
+* xref:dev/design-local-server.adoc[]
+* xref:dev/design-local-serverlinks.adoc[]
+* xref:dev/design-nova-configuration-factory.adoc[]
+* xref:dev/design-passivation-strategy.adoc[]
+* xref:dev/design-random-access-file-passivater.adoc[]
+* xref:dev/design-remote-server.adoc[]
+* xref:dev/design-remote-serverlinks.adoc[]
+* xref:dev/design-resource-manager.adoc[]
+* xref:dev/design-security-service.adoc[]
+* xref:dev/design-simple-passivater.adoc[]
+* xref:dev/design-stateful-sessionbean-container.adoc[]
+* xref:dev/design-stateless-sessionbean-container.adoc[]
+* xref:dev/design-transaction-service.adoc[]
+* xref:dev/design.adoc[]
+* xref:dev/git.adoc[]
+* xref:dev/itests-overview.adoc[]
+* xref:dev/january2008.adoc[]
+* xref:dev/january2010.adoc[]
+* xref:dev/july2007.adoc[]
+* xref:dev/july2008.adoc[]
+* xref:dev/july2009.adoc[]
+* xref:dev/july2010.adoc[]
+* xref:dev/june2007.adoc[]
+* xref:dev/logging.adoc[]
+* xref:dev/mastering-the-command-line.adoc[]
+* xref:dev/october2007.adoc[]
+* xref:dev/october2008.adoc[]
+* xref:dev/october2009.adoc[]
+* xref:dev/openejb-release-process.adoc[]
+* xref:dev/proxies.adoc[]
+* xref:dev/release-tomee.adoc[]
+* xref:dev/roadmap.adoc[]
+* xref:dev/rsync.adoc[]
+* xref:dev/rules-of-thumb.adoc[]
+* xref:dev/source-code.adoc[]
+* xref:dev/take-my-code.adoc[]
+* xref:dev/thread-dumps.adoc[]
+* xref:dev/tips-and-suggestions.adoc[]
+* xref:dev/validation-keys-audit-report.adoc[]
+* xref:dev/website-dev.adoc[]
+* xref:dev/writing-examples.adoc[]
+* xref:dev/writing-validation-tests.adoc[]
+* xref:dev/xbean-finder.adoc[]
+* xref:dev/xbean-usage-in-openejb.adoc[]
+* xref:docs.adoc[]
+* xref:download-archive.adoc[]
+* xref:download-ng.adoc[]
+* xref:enterprise-tomcat.adoc[]
+* xref:evolution-of-ejb.adoc[]
+* xref:faq.adoc[]
+* xref:features.adoc[]
+* xref:geronimo.adoc[]
+* xref:lightening-demos.adoc[]
+* xref:mailing-lists.adoc[]
+* xref:management-and-voting.adoc[]
+* xref:powered-by.adoc[]
+* xref:privacy-policy.adoc[]
+* xref:security/security.adoc[]
+* xref:security/support.adoc[]
+* xref:support.adoc[]
+* xref:team.adoc[]
+* xref:time-saved.adoc[]
+* xref:tomcat-activemq.adoc[]
+* xref:tomcat-cdi.adoc[]
+* xref:tomcat-detailed-instructions.adoc[]
+* xref:tomcat-ejb-refs.adoc[]
+* xref:tomcat-ejb.adoc[]
+* xref:tomcat-installation.adoc[]
+* xref:tomcat-java-ee.adoc[]
+* xref:tomcat-javaee.adoc[]
+* xref:tomcat-jaxrs.adoc[]
+* xref:tomcat-jaxws.adoc[]
+* xref:tomcat-jms.adoc[]
+* xref:tomcat-jpa.adoc[]
+* xref:tomcat-jsf.adoc[]
+* xref:tomcat-object-factory.adoc[]
+* xref:tomcat.adoc[]
+* xref:tomee-1.0.0-beta-1.adoc[]
+* xref:tomee-1.5.0-release-notes.adoc[]
+* xref:tomee-1.5.0.adoc[]
+* xref:tomee-1.5.1-release-notes.adoc[]
+* xref:tomee-1.5.1.adoc[]
+* xref:tomee-1.6.0.1-release-notes.adoc[]
+* xref:tomee-1.6.0.1.adoc[]
+* xref:tomee-1.6.0.2-release-notes.adoc[]
+* xref:tomee-1.6.0.2.adoc[]
+* xref:tomee-1.7.0-release-notes.adoc[]
+* xref:tomee-1.7.0.adoc[]
+* xref:tomee-1.7.1-release-notes.adoc[]
+* xref:tomee-1.7.1.adoc[]
+* xref:tomee-1.7.2-release-notes.adoc[]
+* xref:tomee-1.7.2.adoc[]
+* xref:tomee-1.7.3-release-notes.adoc[]
+* xref:tomee-1.7.3.adoc[]
+* xref:tomee-1.7.4.adoc[]
+* xref:tomee-7.0.0-M1-release-notes.adoc[]
+* xref:tomee-7.0.0-M1.adoc[]
+* xref:tomee-7.0.0-M2-release-notes.adoc[]
+* xref:tomee-7.0.0-M2.adoc[]
+* xref:tomee-7.0.0-M3-release-notes.adoc[]
+* xref:tomee-7.0.0-M3.adoc[]
+* xref:tomee-7.0.0-release-notes.adoc[]
+* xref:tomee-7.0.1-release-notes.adoc[]
+* xref:tomee-7.0.1.adoc[]
+* xref:tomee-7.0.2-release-notes.adoc[]
+* xref:webadmin.adoc[]
+* xref:webobjects.adoc[]