Restructure and rework feature-overview presentation

README.md

@@ -11,7 +11,7 @@ Then go into the presentation you want to build and execute `mvn` or `mvn proces
 
 Download and install https://github.com/melix/deck2pdf
 
-Run `deck2pdf --width=1500 --height=1000 target/generated-slides/jug-slides.html`
+Run `deck2pdf --width=1900 --height=1000 target/generated-slides/jug-slides.html`
 
 Careful, do not mouse-over the webview otherwise you will get the arrows in the resulting PDF.
 

web-demo/pom.xml → feature-overview/demo/pom.xml

@@ -2,14 +2,16 @@
 <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>
-        <artifactId>blaze-persistence-presentation</artifactId>
+        <artifactId>blaze-persistence-presentations-feature-overview</artifactId>
         <groupId>com.blazebit</groupId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blaze-persistence-web-demo</artifactId>
+    <artifactId>blaze-persistence-presentations-feature-overview-demo</artifactId>
     <packaging>war</packaging>
 
     <properties>

web-demo/src/main/java/com/blazebit/presentation/demo/persistence/BlazePersistenceProducer.java → feature-overview/demo/src/main/java/com/blazebit/presentation/demo/persistence/BlazePersistenceProducer.java

@@ -42,9 +42,8 @@ public CriteriaBuilderFactory createCriteriaBuilderFactory(final EntityManagerFa
     @Produces
     @ApplicationScoped
     public EntityViewManager createEntityViewManager(
-            final EntityManagerFactory emf,
             final CriteriaBuilderFactory cbf,
             final EntityViewConfiguration entityViewConfiguration) {
-        return entityViewConfiguration.createEntityViewManager(cbf, emf);
+        return entityViewConfiguration.createEntityViewManager(cbf);
     }
 }

web-demo/src/main/java/com/blazebit/presentation/demo/rest/CatsResource.java → feature-overview/demo/src/main/java/com/blazebit/presentation/demo/rest/CatsResource.java

@@ -82,10 +82,10 @@ public PaginatedResult<CatView> getCats(@QueryParam("page") @DefaultValue("1") i
         CriteriaBuilder<Cat> cb = cbf.create(em, Cat.class).orderByAsc("id");
 
         final EntityViewSetting<CatView, PaginatedCriteriaBuilder<CatView>> catSetting;
-        if (firstKey == null || lastKey == null || lastPageOffset == null || lastPageSize ==null) {
+        if (firstKey == null || lastKey == null || lastPageOffset == null || lastPageSize == null) {
             catSetting = EntityViewSetting.create(CatView.class, (page - 1) * pageSize, pageSize);
         } else {
-            KeysetPage keysetPage = new KeysetPageImpl(page, pageSize, new KeysetImpl(new Serializable[]{firstKey}), new KeysetImpl(new Serializable[]{lastKey}));
+            KeysetPage keysetPage = new KeysetPageImpl(page, pageSize, new KeysetImpl(new Serializable[]{ firstKey }), new KeysetImpl(new Serializable[]{ lastKey }));
             catSetting = EntityViewSetting.create(CatView.class, (page - 1) * pageSize, pageSize).withKeysetPage(keysetPage);
         }
 

web-demo/src/main/java/com/blazebit/presentation/demo/view/CatFamilyTreeView.java → feature-overview/demo/src/main/java/com/blazebit/presentation/demo/view/CatFamilyTreeView.java

@@ -19,7 +19,6 @@
 import com.blazebit.persistence.SubqueryInitiator;
 import com.blazebit.persistence.examples.base.model.Cat;
 import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
 import com.blazebit.persistence.view.MappingSubquery;
 import com.blazebit.persistence.view.SubqueryProvider;
 

feature-overview/pom.xml

@@ -0,0 +1,21 @@
+<?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>com.blazebit</groupId>
+        <artifactId>blaze-persistence-presentations</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>blaze-persistence-presentations-feature-overview</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>presentation</module>
+        <module>web-demo</module>
+    </modules>
+
+</project>

presentations/jug-2016-11-14/pom.xml → feature-overview/presentation/pom.xml

@@ -19,9 +19,13 @@
          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>
 
-    <groupId>io.github.binout</groupId>
-    <artifactId>asciidoctor-slide-generator</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <parent>
+        <groupId>com.blazebit</groupId>
+        <artifactId>blaze-persistence-presentations-feature-overview</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>blaze-persistence-presentations-feature-overview-presentation</artifactId>
     <packaging>pom</packaging>
 
     <properties>

presentations/jug-2016-11-14/src/main/slides/deck.js/boilerplate.html → feature-overview/presentation/src/main/slides/deck.js/boilerplate.html

@@ -64,7 +64,7 @@ <h1>Here</h1>
     </p>
 
     <!-- deck.goto snippet -->
-    <form action="." method="get" class="goto-form">
+    <form action="" method="get" class="goto-form">
       <label for="goto-slide">Go to slide:</label>
       <input type="text" name="slidenum" id="goto-slide" list="goto-datalist">
       <datalist id="goto-datalist"></datalist>

presentations/jug-2016-11-14/src/main/slides/deck.js/introduction/index.html → feature-overview/presentation/src/main/slides/deck.js/introduction/index.html

@@ -186,7 +186,7 @@ <h2>Digging Deeper</h2>
     </p>
 
     <!-- deck.goto snippet -->
-    <form action="." method="get" class="goto-form">
+    <form action="" method="get" class="goto-form">
       <label for="goto-slide">Go to slide:</label>
       <input type="text" name="slidenum" id="goto-slide" list="goto-datalist">
       <datalist id="goto-datalist"></datalist>

presentations/jug-2016-11-14/src/main/slides/deck.js/test/fixtures/empty.html → feature-overview/presentation/src/main/slides/deck.js/test/fixtures/empty.html

@@ -10,7 +10,7 @@
     <span class="deck-status-total"></span>
   </p>
 
-  <form action="." method="get" class="goto-form">
+  <form action="" method="get" class="goto-form">
     <label for="goto-slide">Go to slide:</label>
     <input type="number" name="slidenum" id="goto-slide" value="">
     <input type="submit" value="Go">

presentations/jug-2016-11-14/src/main/slides/deck.js/test/fixtures/standard.html → feature-overview/presentation/src/main/slides/deck.js/test/fixtures/standard.html

@@ -20,7 +20,7 @@
     <span class="deck-status-total"></span>
   </p>
 
-  <form action="." method="get" class="goto-form">
+  <form action="" method="get" class="goto-form">
     <label for="goto-slide">Go to slide:</label>
     <input type="number" name="slidenum" id="goto-slide" value="" list="goto-datalist">
     <datalist id="goto-datalist"></datalist>