You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2017/07/11 18:40:53 UTC

svn commit: r1801644 [1/9] - /tomee/site/trunk/content/examples/

Author: jgallimore
Date: Tue Jul 11 18:40:51 2017
New Revision: 1801644

URL: http://svn.apache.org/viewvc?rev=1801644&view=rev
Log:
Update examples

Modified:
    tomee/site/trunk/content/examples/access-timeout-meta.html
    tomee/site/trunk/content/examples/access-timeout.html
    tomee/site/trunk/content/examples/alternate-descriptors.html
    tomee/site/trunk/content/examples/applet.html
    tomee/site/trunk/content/examples/application-composer.html
    tomee/site/trunk/content/examples/applicationcomposer-jaxws-cdi.html
    tomee/site/trunk/content/examples/applicationexception.html
    tomee/site/trunk/content/examples/arquillian-jpa.html
    tomee/site/trunk/content/examples/async-methods.html
    tomee/site/trunk/content/examples/async-postconstruct.html
    tomee/site/trunk/content/examples/bean-validation-design-by-contract.html
    tomee/site/trunk/content/examples/bval-evaluation-redeployment.html
    tomee/site/trunk/content/examples/cdi-alternative-and-stereotypes.html
    tomee/site/trunk/content/examples/cdi-application-scope.html
    tomee/site/trunk/content/examples/cdi-basic.html
    tomee/site/trunk/content/examples/cdi-ejbcontext-jaas.html
    tomee/site/trunk/content/examples/cdi-events.html
    tomee/site/trunk/content/examples/cdi-interceptors.html
    tomee/site/trunk/content/examples/cdi-produces-disposes.html
    tomee/site/trunk/content/examples/cdi-produces-field.html
    tomee/site/trunk/content/examples/cdi-realm.html
    tomee/site/trunk/content/examples/cdi-request-scope.html
    tomee/site/trunk/content/examples/cdi-session-scope.html
    tomee/site/trunk/content/examples/change-jaxws-url.html
    tomee/site/trunk/content/examples/client-resource-lookup-preview.html
    tomee/site/trunk/content/examples/component-interfaces.html
    tomee/site/trunk/content/examples/cucumber-jvm.html
    tomee/site/trunk/content/examples/custom-injection.html
    tomee/site/trunk/content/examples/datasource-ciphered-password.html
    tomee/site/trunk/content/examples/datasource-definition.html
    tomee/site/trunk/content/examples/datasource-versioning.html
    tomee/site/trunk/content/examples/decorators.html
    tomee/site/trunk/content/examples/deltaspike-configproperty.html
    tomee/site/trunk/content/examples/deltaspike-exception-handling.html
    tomee/site/trunk/content/examples/deltaspike-fullstack.html
    tomee/site/trunk/content/examples/deltaspike-i18n.html
    tomee/site/trunk/content/examples/dynamic-dao-implementation.html
    tomee/site/trunk/content/examples/dynamic-datasource-routing.html
    tomee/site/trunk/content/examples/dynamic-implementation.html
    tomee/site/trunk/content/examples/dynamic-proxy-to-access-mbean.html
    tomee/site/trunk/content/examples/ear-testing.html
    tomee/site/trunk/content/examples/ejb-examples.html
    tomee/site/trunk/content/examples/ejb-webservice.html
    tomee/site/trunk/content/examples/groovy-cdi.html
    tomee/site/trunk/content/examples/groovy-jpa.html
    tomee/site/trunk/content/examples/groovy-spock.html
    tomee/site/trunk/content/examples/helloworld-weblogic.html
    tomee/site/trunk/content/examples/index-ng.html
    tomee/site/trunk/content/examples/injection-of-connectionfactory.html
    tomee/site/trunk/content/examples/injection-of-datasource.html
    tomee/site/trunk/content/examples/injection-of-ejbs.html
    tomee/site/trunk/content/examples/injection-of-entitymanager.html
    tomee/site/trunk/content/examples/injection-of-env-entry.html
    tomee/site/trunk/content/examples/interceptors.html
    tomee/site/trunk/content/examples/javamail.html
    tomee/site/trunk/content/examples/jpa-eclipselink.html
    tomee/site/trunk/content/examples/jpa-enumerated.html
    tomee/site/trunk/content/examples/jpa-hibernate.html
    tomee/site/trunk/content/examples/jsf-cdi-and-ejb.html
    tomee/site/trunk/content/examples/jsf-managedBean-and-ejb.html
    tomee/site/trunk/content/examples/lookup-of-ejbs-with-descriptor.html
    tomee/site/trunk/content/examples/lookup-of-ejbs.html
    tomee/site/trunk/content/examples/mbean-auto-registration.html
    tomee/site/trunk/content/examples/moviefun-rest.html
    tomee/site/trunk/content/examples/moviefun.html
    tomee/site/trunk/content/examples/movies-complete-meta.html
    tomee/site/trunk/content/examples/movies-complete.html
    tomee/site/trunk/content/examples/mtom.html
    tomee/site/trunk/content/examples/multi-jpa-provider-testing.html
    tomee/site/trunk/content/examples/multiple-arquillian-adapters.html
    tomee/site/trunk/content/examples/multiple-tomee-arquillian.html
    tomee/site/trunk/content/examples/myfaces-codi-demo.html
    tomee/site/trunk/content/examples/persistence-fragment.html
    tomee/site/trunk/content/examples/pojo-webservice.html
    tomee/site/trunk/content/examples/polling-parent.html
    tomee/site/trunk/content/examples/projectstage-demo.html
    tomee/site/trunk/content/examples/quartz-app.html
    tomee/site/trunk/content/examples/realm-in-tomee.html
    tomee/site/trunk/content/examples/reload-persistence-unit-properties.html
    tomee/site/trunk/content/examples/resources-declared-in-webapp.html
    tomee/site/trunk/content/examples/resources-jmx-example.html
    tomee/site/trunk/content/examples/rest-applicationcomposer-mockito.html
    tomee/site/trunk/content/examples/rest-applicationcomposer.html
    tomee/site/trunk/content/examples/rest-cdi.html
    tomee/site/trunk/content/examples/rest-example-with-application.html
    tomee/site/trunk/content/examples/rest-example.html
    tomee/site/trunk/content/examples/rest-jaas.html
    tomee/site/trunk/content/examples/rest-on-ejb.html
    tomee/site/trunk/content/examples/rest-xml-json.html
    tomee/site/trunk/content/examples/scala-basic.html
    tomee/site/trunk/content/examples/schedule-events.html
    tomee/site/trunk/content/examples/schedule-expression.html
    tomee/site/trunk/content/examples/schedule-methods-meta.html
    tomee/site/trunk/content/examples/schedule-methods.html
    tomee/site/trunk/content/examples/server-events.html
    tomee/site/trunk/content/examples/simple-cdi-interceptor.html
    tomee/site/trunk/content/examples/simple-cmp2.html
    tomee/site/trunk/content/examples/simple-mdb-and-cdi.html
    tomee/site/trunk/content/examples/simple-mdb-with-descriptor.html
    tomee/site/trunk/content/examples/simple-mdb.html
    tomee/site/trunk/content/examples/simple-rest.html
    tomee/site/trunk/content/examples/simple-singleton.html
    tomee/site/trunk/content/examples/simple-stateful-callbacks.html
    tomee/site/trunk/content/examples/simple-stateful.html
    tomee/site/trunk/content/examples/simple-stateless-callbacks.html
    tomee/site/trunk/content/examples/simple-stateless-with-descriptor.html
    tomee/site/trunk/content/examples/simple-stateless.html
    tomee/site/trunk/content/examples/simple-webservice-without-interface.html
    tomee/site/trunk/content/examples/simple-webservice.html
    tomee/site/trunk/content/examples/spring-data-proxy-meta.html
    tomee/site/trunk/content/examples/spring-data-proxy.html
    tomee/site/trunk/content/examples/struts.html
    tomee/site/trunk/content/examples/telephone-stateful.html
    tomee/site/trunk/content/examples/testcase-injection.html
    tomee/site/trunk/content/examples/testing-security-2.html
    tomee/site/trunk/content/examples/testing-security-3.html
    tomee/site/trunk/content/examples/testing-security-4.html
    tomee/site/trunk/content/examples/testing-security-meta.html
    tomee/site/trunk/content/examples/testing-security.html
    tomee/site/trunk/content/examples/testing-transactions-bmt.html
    tomee/site/trunk/content/examples/testing-transactions.html
    tomee/site/trunk/content/examples/tomee-jersey-eclipselink.html
    tomee/site/trunk/content/examples/transaction-rollback.html
    tomee/site/trunk/content/examples/troubleshooting.html
    tomee/site/trunk/content/examples/webservice-attachments.html
    tomee/site/trunk/content/examples/webservice-handlerchain.html
    tomee/site/trunk/content/examples/webservice-holder.html
    tomee/site/trunk/content/examples/webservice-inheritance.html
    tomee/site/trunk/content/examples/webservice-security.html
    tomee/site/trunk/content/examples/webservice-ws-security.html
    tomee/site/trunk/content/examples/webservice-ws-with-resources-config.html

Modified: tomee/site/trunk/content/examples/access-timeout-meta.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/access-timeout-meta.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/access-timeout-meta.html (original)
+++ tomee/site/trunk/content/examples/access-timeout-meta.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -439,28 +437,21 @@ public class BusyBee {
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -471,6 +462,14 @@ public class BusyBee {
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/access-timeout.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/access-timeout.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/access-timeout.html (original)
+++ tomee/site/trunk/content/examples/access-timeout.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -382,28 +380,21 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -414,6 +405,14 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/alternate-descriptors.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/alternate-descriptors.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/alternate-descriptors.html (original)
+++ tomee/site/trunk/content/examples/alternate-descriptors.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -372,28 +370,21 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -404,6 +395,14 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/applet.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/applet.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/applet.html (original)
+++ tomee/site/trunk/content/examples/applet.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -318,28 +316,21 @@ public class JNDILookupTest {
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -350,6 +341,14 @@ public class JNDILookupTest {
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/application-composer.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/application-composer.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/application-composer.html (original)
+++ tomee/site/trunk/content/examples/application-composer.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -292,28 +290,21 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -324,6 +315,14 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/applicationcomposer-jaxws-cdi.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/applicationcomposer-jaxws-cdi.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/applicationcomposer-jaxws-cdi.html (original)
+++ tomee/site/trunk/content/examples/applicationcomposer-jaxws-cdi.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -124,28 +122,21 @@
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -156,6 +147,14 @@
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/applicationexception.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/applicationexception.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/applicationexception.html (original)
+++ tomee/site/trunk/content/examples/applicationexception.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -234,28 +232,21 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -266,6 +257,14 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/arquillian-jpa.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/arquillian-jpa.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/arquillian-jpa.html (original)
+++ tomee/site/trunk/content/examples/arquillian-jpa.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -294,28 +292,21 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -326,6 +317,14 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/async-methods.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/async-methods.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/async-methods.html (original)
+++ tomee/site/trunk/content/examples/async-methods.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -324,28 +322,21 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -356,6 +347,14 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/async-postconstruct.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/async-postconstruct.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/async-postconstruct.html (original)
+++ tomee/site/trunk/content/examples/async-postconstruct.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -257,28 +255,21 @@ public class SlowStarterTest {
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -289,6 +280,14 @@ public class SlowStarterTest {
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/bean-validation-design-by-contract.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/bean-validation-design-by-contract.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/bean-validation-design-by-contract.html (original)
+++ tomee/site/trunk/content/examples/bean-validation-design-by-contract.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -362,28 +360,21 @@ Tests run: 5, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -394,6 +385,14 @@ Tests run: 5, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/bval-evaluation-redeployment.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/bval-evaluation-redeployment.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/bval-evaluation-redeployment.html (original)
+++ tomee/site/trunk/content/examples/bval-evaluation-redeployment.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -121,28 +119,21 @@
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -153,6 +144,14 @@
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/cdi-alternative-and-stereotypes.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/cdi-alternative-and-stereotypes.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/cdi-alternative-and-stereotypes.html (original)
+++ tomee/site/trunk/content/examples/cdi-alternative-and-stereotypes.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -276,28 +274,21 @@ INFO - Undeploying app: /opt/dev/openejb
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -308,6 +299,14 @@ INFO - Undeploying app: /opt/dev/openejb
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/cdi-application-scope.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/cdi-application-scope.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/cdi-application-scope.html (original)
+++ tomee/site/trunk/content/examples/cdi-application-scope.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -277,28 +275,21 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -309,6 +300,14 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>