Author: doebele
Date: Sat Apr 22 14:29:50 2023
New Revision: 1909350

URL: http://svn.apache.org/viewvc?rev=1909350&view=rev
Log:
apache-empire-db-3.1.0

Modified:
    empire-db/site/pages/download.html
    empire-db/site/pages/home.html
    empire-db/site/pages/project.html

Modified: empire-db/site/pages/download.html
URL: 
http://svn.apache.org/viewvc/empire-db/site/pages/download.html?rev=1909350&r1=1909349&r2=1909350&view=diff
==============================================================================
--- empire-db/site/pages/download.html (original)
+++ empire-db/site/pages/download.html Sat Apr 22 14:29:50 2023
@@ -148,16 +148,16 @@
                                                </thead>
                                                <tbody>
                                                        <tr>
-                                                               <td 
class="file"><a 
href="https://www.apache.org/dyn/closer.lua/empire-db/3.0.0/apache-empire-db-3.0.0-dist.tar.gz";>apache-empire-db-3.0.0-dist.tar.gz</a></td>
-                                                               <td 
class="size">4.3 MB</td>
-                                                               <td 
class="pgp"><a 
href="https://downloads.apache.org/empire-db/3.0.0/apache-empire-db-3.0.0-dist.tar.gz.asc";
 target="_blank"><img src="../res/key.gif"/></a></td>
-                                                               <td 
class="md5"><a 
href="https://downloads.apache.org/empire-db/3.0.0/apache-empire-db-3.0.0-dist.tar.gz.sha256";
 target="_blank"><img src="../res/key.gif"/></a></td>
+                                                               <td 
class="file"><a 
href="https://www.apache.org/dyn/closer.lua/empire-db/3.1.0/apache-empire-db-3.1.0-dist.tar.gz";>apache-empire-db-3.1.0-dist.tar.gz</a></td>
+                                                               <td 
class="size">3.6 MB</td>
+                                                               <td 
class="pgp"><a 
href="https://downloads.apache.org/empire-db/3.1.0/apache-empire-db-3.1.0-dist.tar.gz.asc";
 target="_blank"><img src="../res/key.gif"/></a></td>
+                                                               <td 
class="md5"><a 
href="https://downloads.apache.org/empire-db/3.1.0/apache-empire-db-3.1.0-dist.tar.gz.sha256";
 target="_blank"><img src="../res/key.gif"/></a></td>
                                                        </tr>
                                                        <tr>
-                                                               <td 
class="file"><a 
href="https://www.apache.org/dyn/closer.lua/empire-db/3.0.0/apache-empire-db-3.0.0-dist.zip";>apache-empire-db-3.0.0-dist.zip</a></td>
-                                                               <td 
class="size">5.0 MB</td>
-                                                               <td 
class="pgp"><a 
href="https://downloads.apache.org/empire-db/3.0.0/apache-empire-db-3.0.0-dist.zip.asc";
 target="_blank"><img src="../res/key.gif"/></a></td>
-                                                               <td 
class="md5"><a 
href="https://downloads.apache.org/empire-db/3.0.0/apache-empire-db-3.0.0-dist.zip.sha256";
 target="_blank"><img src="../res/key.gif"/></a></td>
+                                                               <td 
class="file"><a 
href="https://www.apache.org/dyn/closer.lua/empire-db/3.1.0/apache-empire-db-3.1.0-dist.zip";>apache-empire-db-3.1.0-dist.zip</a></td>
+                                                               <td 
class="size">4.1 MB</td>
+                                                               <td 
class="pgp"><a 
href="https://downloads.apache.org/empire-db/3.1.0/apache-empire-db-3.1.0-dist.zip.asc";
 target="_blank"><img src="../res/key.gif"/></a></td>
+                                                               <td 
class="md5"><a 
href="https://downloads.apache.org/empire-db/3.1.0/apache-empire-db-3.1.0-dist.zip.sha256";
 target="_blank"><img src="../res/key.gif"/></a></td>
                                                        </tr>
                                                </tbody>        
                                        </table>
@@ -187,7 +187,7 @@
 <span class="tag">&lt;dependency&gt;</span>
     <span class="tag">&lt;groupId&gt;</span>org.apache.empire-db<span 
class="tag">&lt;/groupId&gt;</span>
     <span class="tag">&lt;artifactId&gt;</span>empire-db<span 
class="tag">&lt;/artifactId&gt;</span>
-    <span class="tag">&lt;version&gt;</span>3.0.0<span 
class="tag">&lt;/version&gt;</span>
+    <span class="tag">&lt;version&gt;</span>3.1.0<span 
class="tag">&lt;/version&gt;</span>
 <span class="tag">&lt;/dependency&gt;</span>
 </pre>
                                        </div>
@@ -201,7 +201,7 @@
 <span class="tag">&lt;dependency&gt;</span>
     <span class="tag">&lt;groupId&gt;</span>org.apache.empire-db<span 
class="tag">&lt;/groupId&gt;</span>
     <span class="tag">&lt;artifactId&gt;</span>empire-db-jsf2<span 
class="tag">&lt;/artifactId&gt;</span>
-    <span class="tag">&lt;version&gt;</span>3.0.0<span 
class="tag">&lt;/version&gt;</span>
+    <span class="tag">&lt;version&gt;</span>3.1.0<span 
class="tag">&lt;/version&gt;</span>
 <span class="tag">&lt;/dependency&gt;</span>
 </pre>
                                        </div>
@@ -231,6 +231,23 @@
                                                <th>SHA256</th></tr>
                                </thead>
                                <tbody>
+                                       <!-- 3.0.0 -->
+                                       <tr class="even">
+                                               <td class="version">3.0.0</td>
+                                               <td 
class="date">11/Mar/2022</td>
+                                               <td class="file">
+                                                       <a 
href="https://archive.apache.org/dist/empire-db/3.0.0/apache-empire-db-3.0.0-dist.tar.gz";>apache-empire-db-3.0.0dist.tar.gz</a>
+                                                       <a 
href="https://archive.apache.org/dist/empire-db/3.0.0/apache-empire-db-3.0.0-dist.zip";>apache-empire-db-3.0.0-dist.zip</a>
+                                               </td>
+                                               <td class="pgp">
+                                                       <a 
href="https://archive.apache.org/dist/empire-db/3.0.0/apache-empire-db-3.0.0-dist.tar.gz.asc";
 target="_blank"><img src="../res/key.gif"/></a>
+                                                       <a 
href="https://archive.apache.org/dist/empire-db/3.0.0/apache-empire-db-3.0.0-dist.zip.asc";
 target="_blank"><img src="../res/key.gif"/></a>
+                                               </td>
+                                               <td class="md5">
+                                                       <a 
href="https://archive.apache.org/dist/empire-db/3.0.0/apache-empire-db-3.0.0-dist.tar.gz.sha256";
 target="_blank"><img src="../res/key.gif"/></a>
+                                                       <a 
href="https://archive.apache.org/dist/empire-db/3.0.0/apache-empire-db-3.0.0-dist.zip.sha256";
 target="_blank"><img src="../res/key.gif"/></a>
+                                               </td>
+                                       </tr>
                                        <!-- 2.5.1 -->
                                        <tr class="even">
                                                <td class="version">2.5.1</td>
@@ -545,7 +562,7 @@ app.<span class="func">generate</span>(d
         <span class="tag">&lt;plugin&gt;</span>
             <span class="tag">&lt;groupId&gt;</span>org.apache.empire-db<span 
class="tag">&lt;/groupId&gt;</span>
             <span 
class="tag">&lt;artifactId&gt;</span>empire-db-maven-plugin<span 
class="tag">&lt;/artifactId&gt;</span>
-            <span class="tag">&lt;version&gt;</span>3.0.0<span 
class="tag">&lt;/version&gt;</span>
+            <span class="tag">&lt;version&gt;</span>3.1.0<span 
class="tag">&lt;/version&gt;</span>
             <span class="tag">&lt;configuration&gt;</span>
                 <span class="comment">&lt;!-- add config-file (see 
example-codegen for details) --&gt;</span>
                 <span 
class="tag">&lt;configFile&gt;</span>codegen-config.xml<span 
class="tag">&lt;/configFile&gt;</span>

Modified: empire-db/site/pages/home.html
URL: 
http://svn.apache.org/viewvc/empire-db/site/pages/home.html?rev=1909350&r1=1909349&r2=1909350&view=diff
==============================================================================
--- empire-db/site/pages/home.html (original)
+++ empire-db/site/pages/home.html Sat Apr 22 14:29:50 2023
@@ -116,7 +116,7 @@
                                        <td><div class="slogan">Full SQL 
Freedom for Java</div></td>
                                </tr>
                                <tr>
-                                       <td><a class="pageLink version" 
href="download.html">Version 3.0.0 Released 2022/03/11</a></td>
+                                       <td><a class="pageLink version" 
href="download.html">Version 3.1.0 Released 2023/04/22</a></td>
                                </tr>
                        </table>
                </div>
@@ -151,8 +151,8 @@
    .<span class="func">select</span>  (<span class="obj">BRAND</span>.<span 
class="field">NAME</span>, <span class="obj">MODEL</span>.<span 
class="field">SPECIFICATION</span>, <span class="obj">MODEL</span>.<span 
class="field">BASE_PRICE</span>)
    .<span class="func">select</span>  (<span class="obj">SALES</span>.<span 
class="field">MODEL_ID</span>.<span class="func">count</span>(), <span 
class="obj">SALES</span>.<span class="field">PRICE</span>.<span 
class="func">avg</span>())
    .<span class="func">select</span>  (<span class="obj">SALES</span>.<span 
class="field">PRICE</span>.<span class="func">avg</span>().<span 
class="func">minus</span>(<span class="obj">MODEL</span>.<span 
class="field">BASE_PRICE</span>.<span class="func">avg</span>()).<span 
class="func">round</span>(<span class="literal">2</span>).<span 
class="func">as</span>(<span class="literal">"DIFFERENCE"</span>))
-   .<span class="func">join</span>    (<span class="obj">MODEL</span>.<span 
class="field">WMI</span>, <span class="obj">BRAND</span>.<span 
class="field">WMI</span>)
-   .<span class="func">joinLeft</span>(<span class="obj">MODEL</span>.<span 
class="field">ID</span>, <span class="obj">SALES</span>.<span 
class="field">MODEL_ID</span>, <span class="obj">SALES</span>.<span 
class="field">YEAR</span>.<span class="func">is</span>(<span 
class="literal">2021</span>))  <span class="comment">// only year 2021</span>
+   .<span class="func">join</span>    (<span class="obj">MODEL</span>.<span 
class="field">WMI</span>.<span class="func">on</span>(<span 
class="obj">BRAND</span>.<span class="field">WMI</span>))
+   .<span class="func">joinLeft</span>(<span class="obj">MODEL</span>.<span 
class="field">ID</span>.<span class="func">on</span>(<span 
class="obj">SALES</span>.<span class="field">MODEL_ID</span>).<span 
class="func">and</span>(<span class="obj">SALES</span>.<span 
class="field">YEAR</span>.<span class="func">is</span>(<span 
class="literal">2021</span>)))  <span class="comment">// only year 2021</span>
    .<span class="func">where</span>   (<span class="obj">MODEL</span>.<span 
class="field">ENGINE_TYPE</span>.<span class="func">in</span>(<span 
class="type">EngineType</span>.P, <span class="type">EngineType</span>.H, <span 
class="type">EngineType</span>.E)) <span class="comment">// Petrol, Hybrid, 
Electric</span>
    .<span class="func">where</span>   (<span class="obj">MODEL</span>.<span 
class="field">BASE_PRICE</span>.<span class="func">isGreaterThan</span>(<span 
class="literal">30000</span>))
    .<span class="func">groupBy</span> (<span class="obj">BRAND</span>.<span 
class="field">NAME</span>, <span class="obj">MODEL</span>.<span 
class="field">SPECIFICATION</span>, <span class="obj">MODEL</span>.<span 
class="field">BASE_PRICE</span>)

Modified: empire-db/site/pages/project.html
URL: 
http://svn.apache.org/viewvc/empire-db/site/pages/project.html?rev=1909350&r1=1909349&r2=1909350&view=diff
==============================================================================
--- empire-db/site/pages/project.html (original)
+++ empire-db/site/pages/project.html Sat Apr 22 14:29:50 2023
@@ -224,7 +224,7 @@
 <span class="comment">// Department payments query (QDP)</span>
 <span class="type">DBCommand</span> <span class="var">qdpCmd</span> = <span 
class="var">context</span>.<span class="func">createCommand</span>()
    .<span class="func">select</span>(<span class="obj">EMP</span>.<span 
class="field">DEPARTMENT_ID</span>, <span class="obj">PAY</span>.<span 
class="field">AMOUNT</span>.<span class="func">sum</span>().<span 
class="func">qualified</span>())
-   .<span class="func">join</span>  (<span class="obj">PAY</span>.<span 
class="field">EMPLOYEE_ID</span>, <span class="obj">EMP</span>.<span 
class="field">ID</span>)
+   .<span class="func">join</span>  (<span class="obj">PAY</span>.<span 
class="field">EMPLOYEE_ID</span>.<span class="func">on</span>(<span 
class="obj">EMP</span>.<span class="field">ID</span>))
    .<span class="func">where</span> (<span class="obj">PAY</span>.<span 
class="field">YEAR</span>.<span class="func">is</span>(<span 
class="var">lastYear</span>))
    .<span class="func">groupBy</span>(<span class="obj">EMP</span>.<span 
class="field">DEPARTMENT_ID</span>);
 <span class="type">DBQuery</span> <span class="var">QDP</span> = <span 
class="keyword">new</span> <span class="type">DBQuery</span>(<span 
class="var">qdpCmd</span>, <span class="literal">"qdp"</span>);
@@ -237,10 +237,10 @@
    .<span class="func">select</span>(<span class="obj">EMP</span>.<span 
class="field">ID</span>, <span class="obj">EMP</span>.<span 
class="field">FIRST_NAME</span>, <span class="obj">EMP</span>.<span 
class="field">LAST_NAME</span>, <span class="obj">DEP</span>.<span 
class="field">NAME</span>.<span class="func">as</span>(<span 
class="literal">"DEPARTMENT"</span>))
    .<span class="func">select</span>(<span class="var">QEP</span>.<span 
class="func">column</span>(<span class="obj">PAY</span>.<span 
class="field">AMOUNT</span>.<span class="func">sum</span>()), <span 
class="var">PCT_OF_DEP_COST</span>.<span class="func">as</span>(<span 
class="literal">"PCT_OF_DEPARTMENT_COST"</span>))
    <span class="comment">// join Employee with Department</span>
-   .<span class="func">join</span>(<span class="obj">EMP</span>.<span 
class="field">DEPARTMENT_ID</span>, <span class="obj">DEP</span>.<span 
class="field">ID</span>)
+   .<span class="func">join</span>(<span class="obj">EMP</span>.<span 
class="field">DEPARTMENT_ID</span>.<span class="func">on</span>(<span 
class="obj">DEP</span>.<span class="field">ID</span>))
    <span class="comment">// Join with Subqueries</span>
-   .<span class="func">joinLeft</span>(<span class="obj">EMP</span>.<span 
class="field">ID</span>, <span class="var">QEP</span>.<span 
class="func">column</span>(<span class="obj">PAY</span>.<span 
class="field">EMPLOYEE_ID</span>))
-   .<span class="func">joinLeft</span>(<span class="obj">DEP</span>.<span 
class="field">ID</span>, <span class="var">QDP</span>.<span 
class="func">column</span>(<span class="obj">EMP</span>.<span 
class="field">DEPARTMENT_ID</span>))
+   .<span class="func">joinLeft</span>(<span class="obj">EMP</span>.<span 
class="field">ID</span>.<span class="func">on</span>(<span 
class="var">QEP</span>.<span class="func">column</span>(<span 
class="obj">PAY</span>.<span class="field">EMPLOYEE_ID</span>)))
+   .<span class="func">joinLeft</span>(<span class="obj">DEP</span>.<span 
class="field">ID</span>.<span class="func">on</span>(<span 
class="var">QDP</span>.<span class="func">column</span>(<span 
class="obj">EMP</span>.<span class="field">DEPARTMENT_ID</span>)))
    <span class="comment">// Order by</span>
    .<span class="func">orderBy</span>(<span class="obj">DEP</span>.<span 
class="field">NAME</span>.<span class="func">desc</span>())
    .<span class="func">orderBy</span>(<span class="obj">EMP</span>.<span 
class="field">LAST_NAME</span>);
@@ -298,7 +298,7 @@
     .<span class="func">set</span>  (<span class="obj">MODEL</span>.<span 
class="field">BASE_PRICE</span>.<span class="func">to</span>(<span 
class="obj">MODEL</span>.<span class="field">BASE_PRICE</span>.<span 
class="func">multiplyWith</span>(<span class="literal">105</span>).<span 
class="func">divideBy</span>(<span class="literal">100</span>).<span 
class="func">round</span>(<span class="literal">2</span>)))
     .<span class="func">set</span>  (<span class="obj">MODEL</span>.<span 
class="field"><span class="obj">SALES</span>_INFO</span>.<span 
class="func">to</span>(<span class="literal">"Price update "</span>+<span 
class="type">LocalDate</span>.<span class="func">now</span>().<span 
class="func">toString</span>()))
     <span class="comment">// join with BRANDS</span>
-    .<span class="func">join</span> (<span class="obj">MODEL</span>.<span 
class="field">WMI</span>, <span class="obj">BRAND</span>.<span 
class="field">WMI</span>)
+    .<span class="func">join</span> (<span class="obj">MODEL</span>.<span 
class="field">WMI</span>.<span class="func">on</span>(<span 
class="obj">BRAND</span>.<span class="field">WMI</span>))
     <span class="comment">// on all Volkswagen with Diesel engine</span>
     .<span class="func">where</span>(<span class="obj">BRAND</span>.<span 
class="field">NAME</span>.<span class="func">upper</span>().<span 
class="func">like</span>(<span class="literal">"VOLKSWAGEN"</span>))
     .<span class="func">where</span>(<span class="obj">MODEL</span>.<span 
class="field">ENGINE_TYPE</span>.<span class="func">is</span>(<span 
class="type">EngineType</span>.D));
@@ -631,23 +631,23 @@ log.<span class="func">info</span>(<span
                                        <div class="codebox" 
style="margin-top:10px">
                                        <div class="title">xhtml</div>
 <pre>
-<span class="comment">&lt;!-- input form with empire-db controls --</span>&gt;
+<span class="comment">&lt;!-- input form using empire-db controls --</span>&gt;
 &lt;<span class="tag">e:record</span> <span class="attr">value</span>="<span 
class="el">#{page.employeeRecord}</span>"&gt;
-&lt;<span class="tag">h:panelGroup</span> <span 
class="attr">class</span>="<span class="literal">formPanel</span>" <span 
class="attr">layout</span>="<span class="literal">block</span>"&gt;
-    &lt;<span class="tag">table</span> <span class="attr">class</span>="<span 
class="literal">inputForm</span>"&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.SALUTATION}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.FIRST_NAME}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.LAST_NAME}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.DATE_OF_BIRTH}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.DEPARTMENT_ID}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.GENDER}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.PHONE_NUMBER}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.EMAIL}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.SALARY}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.RETIRED}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt;
-        &lt;<span class="tag">tr</span>&gt;&lt;<span 
class="tag">e:control</span> <span class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.UPDATE_TIMESTAMP}</span>"/&gt;&lt;<span 
class="tag">/tr</span>&gt; 
-    &lt;<span class="tag">/table</span>&gt;
-&lt;<span class="tag">/h:panelGroup</span>&gt;
+&lt;<span class="tag">div</span> <span class="attr">class</span>="<span 
class="literal">formPanel</span>"&gt;
+    &lt;<span class="tag">e:formGrid</span> <span 
class="attr">mode</span>="<span class="literal">grid</span>"&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.SALUTATION}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.FIRST_NAME}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.LAST_NAME}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.DATE_OF_BIRTH}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.DEPARTMENT_ID}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span class="el">#{db.EMPLOYEES.GENDER}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.PHONE_NUMBER}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span class="el">#{db.EMPLOYEES.EMAIL}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span class="el">#{db.EMPLOYEES.SALARY}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.RETIRED}</span>"/&gt;
+        &lt;<span class="tag">e:control</span> <span 
class="attr">column</span>="<span 
class="el">#{db.EMPLOYEES.UPDATE_TIMESTAMP}</span>"/&gt; 
+    &lt;<span class="tag">/e:formGrid</span>&gt;
+&lt;<span class="tag">/div</span>&gt;
 &lt;<span class="tag">/e:record</span>&gt;
 </pre>
                                        </div>


Reply via email to