Modified: websites/staging/deltaspike/trunk/content/documentation/security.html ============================================================================== --- websites/staging/deltaspike/trunk/content/documentation/security.html (original) +++ websites/staging/deltaspike/trunk/content/documentation/security.html Fri Sep 12 12:20:07 2014 @@ -17,92 +17,95 @@ <link href="http://deltaspike.apache.org/resources/css/bootstrap-responsive.css"; rel="stylesheet"> <style type="text/css"> -/* Foundation stylesheet for CodeRay (to match GitHub theme) | MIT License | http://foundation.zurb.com */ -table.CodeRay { border-collapse: collapse; padding: 2px; margin-bottom: 0; border: 0; background: transparent; } -table.CodeRay td { padding: 0 .5em; vertical-align: top; } -table.CodeRay td.line-numbers { text-align: right; color: #999; border-right: 1px solid #e5e5e5; padding-left: 0; } -span.line-numbers { border-right: 1px solid #E5E5E5; color: #999; display: inline-block; margin-right: 0.5em; padding-right: 0.5em; } -.CodeRay td.line-numbers strong, .CodeRay span.line-numbers strong { font-weight: normal; } -.CodeRay .debug { color: white !important; background: blue !important; } -.CodeRay .annotation { color: #007; } -.CodeRay .attribute-name { color: #f08; } -.CodeRay .attribute-value { color: #700; } -.CodeRay .binary { color: #509; } -.CodeRay .comment { color: #999; font-style: italic; } -.CodeRay .char { color: #04D; } -.CodeRay .char .content { color: #04D; } -.CodeRay .char .delimiter { color: #039; } -.CodeRay .class { color: #458; } -.CodeRay .complex { color: #A08; } -.CodeRay .constant { color: teal; } -.CodeRay .color { color: #0A0; } -.CodeRay .class-variable { color: #369; } -.CodeRay .decorator { color: #B0B; } -.CodeRay .definition { color: #099; } -.CodeRay .directive { color: #088; } -.CodeRay .delimiter { color: black; } -.CodeRay .doc { color: #970; } -.CodeRay .doctype { color: #34b; } -.CodeRay .doc-string { color: #D42; } -.CodeRay .escape { color: #666; } -.CodeRay .entity { color: #800; } -.CodeRay .error { color: #808; } -.CodeRay .exception { color: #C00; } -.CodeRay .filename { color: #099; } -.CodeRay .function { color: #900; } -.CodeRay .global-variable { color: teal; } -.CodeRay .hex { color: #058; } -.CodeRay .integer { color: #099; } -.CodeRay .include { color: #B44; } -.CodeRay .inline { color: black; } -.CodeRay .inline .inline { background: #ccc; } -.CodeRay .inline .inline .inline { background: #bbb; } -.CodeRay .inline .inline-delimiter { color: #D14; } -.CodeRay .inline-delimiter { color: #D14; } -.CodeRay .important { color: #f00; } -.CodeRay .interpreted { color: #B2B; } -.CodeRay .instance-variable { color: teal; } -.CodeRay .label { color: #970; } -.CodeRay .local-variable { color: #963; } -.CodeRay .octal { color: #40E; } -.CodeRay .predefined { color: #369; } -.CodeRay .preprocessor { color: #579; } -.CodeRay .pseudo-class { color: #00C; } -.CodeRay .predefined-type { color: #074; } -.CodeRay .reserved, .keyword { color: #000; } -.CodeRay .key { color: #808; } -.CodeRay .key .delimiter { color: #606; } -.CodeRay .key .char { color: #80f; } -.CodeRay .value { color: #088; } -.CodeRay .regexp { background-color: #fff0ff; } -.CodeRay .regexp .content { color: #808; } -.CodeRay .regexp .delimiter { color: #404; } -.CodeRay .regexp .modifier { color: #C2C; } -.CodeRay .regexp .function { color: #404; font-weight: bold; } -.CodeRay .string { color: #D20; } -.CodeRay .string .string { } -.CodeRay .string .string .string { background-color: #ffd0d0; } -.CodeRay .string .content { color: #D14; } -.CodeRay .string .char { color: #D14; } -.CodeRay .string .delimiter { color: #D14; } -.CodeRay .shell { color: #D14; } -.CodeRay .shell .content { } -.CodeRay .shell .delimiter { color: #D14; } -.CodeRay .symbol { color: #990073; } -.CodeRay .symbol .content { color: #A60; } -.CodeRay .symbol .delimiter { color: #630; } -.CodeRay .tag, .CodeRay .attribute-name { color: #070; } -.CodeRay .tag-special { color: #D70; } -.CodeRay .type { color: #339; } -.CodeRay .variable { color: #036; } -.CodeRay .insert { background: #afa; } -.CodeRay .delete { background: #faa; } -.CodeRay .change { color: #aaf; background: #007; } -.CodeRay .head { color: #f8f; background: #505; } -.CodeRay .insert .insert { color: #080; } -.CodeRay .delete .delete { color: #800; } -.CodeRay .change .change { color: #66f; } -.CodeRay .head .head { color: #f4f; } +/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ +/*pre.CodeRay {background-color:#f7f7f8;}*/ +.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} +.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} +.CodeRay .line-numbers strong{font-weight: normal} +table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} +table.CodeRay td{vertical-align: top} +table.CodeRay td.line-numbers{text-align:right} +table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} +table.CodeRay td.code{padding:0 0 0 .5em} +table.CodeRay td.code>pre{padding:0} +.CodeRay .debug{color:#fff !important;background:#000080 !important} +.CodeRay .annotation{color:#007} +.CodeRay .attribute-name{color:#000080} +.CodeRay .attribute-value{color:#700} +.CodeRay .binary{color:#509} +.CodeRay .comment{color:#998;font-style:italic} +.CodeRay .char{color:#04d} +.CodeRay .char .content{color:#04d} +.CodeRay .char .delimiter{color:#039} +.CodeRay .class{color:#458;font-weight:bold} +.CodeRay .complex{color:#a08} +.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} +.CodeRay .color{color:#099} +.CodeRay .class-variable{color:#369} +.CodeRay .decorator{color:#b0b} +.CodeRay .definition{color:#099} +.CodeRay .delimiter{color:#000} +.CodeRay .doc{color:#970} +.CodeRay .doctype{color:#34b} +.CodeRay .doc-string{color:#d42} +.CodeRay .escape{color:#666} +.CodeRay .entity{color:#800} +.CodeRay .error{color:#808} +.CodeRay .exception{color:inherit} +.CodeRay .filename{color:#099} +.CodeRay .function{color:#900;font-weight:bold} +.CodeRay .global-variable{color:#008080} +.CodeRay .hex{color:#058} +.CodeRay .integer,.CodeRay .float{color:#099} +.CodeRay .include{color:#555} +.CodeRay .inline{color:#00} +.CodeRay .inline .inline{background:#ccc} +.CodeRay .inline .inline .inline{background:#bbb} +.CodeRay .inline .inline-delimiter{color:#d14} +.CodeRay .inline-delimiter{color:#d14} +.CodeRay .important{color:#555;font-weight:bold} +.CodeRay .interpreted{color:#b2b} +.CodeRay .instance-variable{color:#008080} +.CodeRay .label{color:#970} +.CodeRay .local-variable{color:#963} +.CodeRay .octal{color:#40e} +.CodeRay .predefined{color:#369} +.CodeRay .preprocessor{color:#579} +.CodeRay .pseudo-class{color:#555} +.CodeRay .directive{font-weight:bold} +.CodeRay .type{font-weight:bold} +.CodeRay .predefined-type{color:inherit} +.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} +.CodeRay .key{color:#808} +.CodeRay .key .delimiter{color:#606} +.CodeRay .key .char{color:#80f} +.CodeRay .value{color:#088} +.CodeRay .regexp .delimiter{color:#808} +.CodeRay .regexp .content{color:#808} +.CodeRay .regexp .modifier{color:#808} +.CodeRay .regexp .char{color:#d14} +.CodeRay .regexp .function{color:#404;font-weight:bold} +.CodeRay .string{color:#d20} +.CodeRay .string .string .string{background:#ffd0d0} +.CodeRay .string .content{color:#d14} +.CodeRay .string .char{color:#d14} +.CodeRay .string .delimiter{color:#d14} +.CodeRay .shell{color:#d14} +.CodeRay .shell .delimiter{color:#d14} +.CodeRay .symbol{color:#990073} +.CodeRay .symbol .content{color:#a60} +.CodeRay .symbol .delimiter{color:#630} +.CodeRay .tag{color:#008080} +.CodeRay .tag-special{color:#d70} +.CodeRay .variable{color:#036} +.CodeRay .insert{background:#afa} +.CodeRay .delete{background:#faa} +.CodeRay .change{color:#aaf;background:#007} +.CodeRay .head{color:#f8f;background:#505} +.CodeRay .insert .insert{color:#080} +.CodeRay .delete .delete{color:#800} +.CodeRay .change .change{color:#66f} +.CodeRay .head .head{color:#f4f} body { padding-top: 60px; padding-bottom: 40px; @@ -166,12 +169,11 @@ body { <h1>DeltaSpike Security Module</h1> </div> - <div id="toc" class="toc2"> + <div id="toc" class="toc"> <ul class="sectlevel1"> <li><a href="#_hint">Hint</a></li> <li><a href="#_securitybinding_for_class_and_method_invocations">SecurityBinding for class and method invocations</a></li> -<li><a href="#_integrating_3rd_party_security_frameworks">Integrating 3rd party security frameworks</a></li> -<li> +<li><a href="#_integrating_3rd_party_security_frameworks">Integrating 3rd party security frameworks</a> <ul class="sectlevel2"> <li><a href="#__secured">@Secured</a></li> <li><a href="#_accessdecisionvoter">AccessDecisionVoter</a></li> @@ -180,15 +182,13 @@ body { <li><a href="#__secured_and_stereotypes_with_custom_meta_data">@Secured and Stereotypes with custom Meta-data</a></li> </ul> </li> -<li><a href="#_making_intitially_requested_and_secured_page_available_for_redirect_after_login">Making intitially requested and secured page available for redirect after login</a></li> -<li> +<li><a href="#_making_intitially_requested_and_secured_page_available_for_redirect_after_login">Making intitially requested and secured page available for redirect after login</a> <ul class="sectlevel2"> <li><a href="#_cdi_implementation_to_redirect_the_login_to_the_first_denied_page">CDI Implementation to redirect the login to the first denied page</a></li> <li><a href="#_picketlink_implementation_to_redirect_the_login_to_the_first_denied_page">PicketLink Implementation to redirect the login to the first denied page</a></li> </ul> </li> -<li><a href="#_accessdecisionvotercontext">AccessDecisionVoterContext</a></li> -<li> +<li><a href="#_accessdecisionvotercontext">AccessDecisionVoterContext</a> <ul class="sectlevel2"> <li><a href="#_securitystrategy_spi">SecurityStrategy SPI</a></li> </ul> @@ -206,7 +206,7 @@ to enable the security interceptor in yo </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="xml language-xml"><span class="tag"><beans></span> +<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><beans></span> <span class="tag"><interceptors></span> <span class="tag"><class></span>org.apache.deltaspike.security.impl.extension.SecurityInterceptor<span class="tag"></class></span> <span class="tag"></interceptors></span> @@ -235,7 +235,7 @@ business classes and methods.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Retention</span>(value = RUNTIME) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Retention</span>(value = RUNTIME) <span class="annotation">@Target</span>({TYPE, METHOD}) <span class="annotation">@Documented</span> <span class="annotation">@SecurityBindingType</span> @@ -260,7 +260,7 @@ list of our @Secures method.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@ApplicationScoped</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@ApplicationScoped</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">CustomAuthorizer</span> { <span class="annotation">@Secures</span> @@ -282,7 +282,7 @@ methods,) or on individual methods that </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@ApplicationScoped</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@ApplicationScoped</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">SecuredBean1</span> { <span class="annotation">@CustomSecurityBinding</span> @@ -303,7 +303,7 @@ types; this is a simple step once we hav </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Retention</span>(value = RUNTIME) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Retention</span>(value = RUNTIME) <span class="annotation">@Target</span>({PARAMETER}) <span class="annotation">@Documented</span> <span class="annotation">@SecurityParameterBinding</span> @@ -321,7 +321,7 @@ security in our applications:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@ApplicationScoped</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@ApplicationScoped</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">CustomAuthorizer</span> { <span class="annotation">@Secures</span> @@ -341,7 +341,7 @@ security in our applications:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@ApplicationScoped</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@ApplicationScoped</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">SecuredBean1</span> { <span class="annotation">@CustomSecurityBinding</span> @@ -364,7 +364,7 @@ case:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@ApplicationScoped</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@ApplicationScoped</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">SecuredBean1</span> { <span class="annotation">@CustomSecurityBinding</span> @@ -382,7 +382,7 @@ to use a secured return value:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@ApplicationScoped</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@ApplicationScoped</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">CustomAuthorizer</span> { <span class="annotation">@Secures</span> @@ -402,7 +402,7 @@ the return value of the business method. </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@ApplicationScoped</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@ApplicationScoped</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">SecuredBean1</span> { <span class="annotation">@CustomSecurityBinding</span> @@ -427,11 +427,11 @@ as part of our security authorizer!</p> <div class="paragraph"> <p><code>@Secured</code> is build on <code>@SecurityBindingType</code> and a very simple alternative to the rest of the security module. It’s a basic hook to -integrate a custom security concept, 3rd party frameworks,… . It +integrate a custom security concept, 3rd party frameworks,…​ . It doesn’t provide a full blown security concept like the rest of the security module, but other DeltaSpike modules ensure that the security concepts are integrated properly (e.g. correct behaviour within custom -scope implementations,…). It just allows to integrate other security +scope implementations,…​). It just allows to integrate other security frameworks easily.</p> </div> <div class="paragraph"> @@ -446,7 +446,7 @@ think about it like an interceptor.)</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="comment">//...</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">//...</span> <span class="annotation">@Secured</span>(CustomAccessDecisionVoter.class) <span class="directive">public</span> <span class="type">class</span> <span class="class">SecuredBean</span> { @@ -462,7 +462,7 @@ think about it like an interceptor.)</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="comment">//...</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">//...</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">SecuredBean</span> { <span class="annotation">@Secured</span>(CustomAccessDecisionVoter.class) @@ -483,7 +483,7 @@ parts:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">class</span> <span class="class">CustomAccessDecisionVoter</span> <span class="directive">implements</span> AccessDecisionVoter +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">CustomAccessDecisionVoter</span> <span class="directive">implements</span> AccessDecisionVoter { <span class="annotation">@Override</span> <span class="directive">public</span> <span class="predefined-type">Set</span><SecurityViolation> checkPermission(AccessDecisionVoterContext accessDecisionVoterContext) @@ -518,7 +518,7 @@ AbstractAccessDecisionVoter \{</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"> <span class="annotation">@Override</span> +<pre class="CodeRay highlight"><code data-lang="java"> <span class="annotation">@Override</span> <span class="directive">protected</span> <span class="type">void</span> checkPermission(AccessDecisionVoterContext accessDecisionVoterContext, <span class="predefined-type">Set</span><SecurityViolation> violations) { @@ -542,7 +542,7 @@ place.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Named</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Named</span> <span class="annotation">@Admin</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">MyBean</span> <span class="directive">implements</span> <span class="predefined-type">Serializable</span> { @@ -565,7 +565,7 @@ place.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Named</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Named</span> <span class="annotation">@Admin</span>(securityLevel=<span class="integer">3</span>) <span class="directive">public</span> <span class="type">class</span> <span class="class">MyBean</span> <span class="directive">implements</span> <span class="predefined-type">Serializable</span> { @@ -612,7 +612,7 @@ available after user logs in.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">class</span> <span class="class">LoginService</span> <span class="directive">implements</span> <span class="predefined-type">Serializable</span> { +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">LoginService</span> <span class="directive">implements</span> <span class="predefined-type">Serializable</span> { <span class="annotation">@Inject</span> <span class="directive">private</span> <span class="predefined-type">Event</span><UserLoggedInEvent> userLoggedInEvent; @@ -631,7 +631,7 @@ store the denied page on your own.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@SessionScoped</span> <span class="comment">//or @WindowScoped</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@SessionScoped</span> <span class="comment">//or @WindowScoped</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">AdminAccessDecisionVoter</span> <span class="directive">extends</span> AbstractAccessDecisionVoter { <span class="annotation">@Inject</span> @@ -664,7 +664,7 @@ store the denied page on your own.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">class</span> <span class="class">AuthenticationListener</span> { +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">AuthenticationListener</span> { <span class="annotation">@Inject</span> <span class="directive">private</span> ViewNavigationHandler viewNavigationHandler; @@ -693,7 +693,7 @@ store the denied page on your own.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@SessionScoped</span> <span class="comment">//or @WindowScoped</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@SessionScoped</span> <span class="comment">//or @WindowScoped</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">AdminAccessDecisionVoter</span> <span class="directive">extends</span> AbstractAccessDecisionVoter { <span class="annotation">@Inject</span> @@ -730,7 +730,7 @@ store the denied page on your own.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">class</span> <span class="class">AuthenticationListener</span> { +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">AuthenticationListener</span> { <span class="annotation">@Inject</span> <span class="directive">private</span> ViewNavigationHandler viewNavigationHandler; @@ -805,10 +805,8 @@ globalAlternatives.<code><interface-n <hr> <footer> - <p>Copyright © 2011-2014 The Apache Software Foundation, - Licensed under the Apache License, Version 2.0.</p> - <p>Apache and the Apache feather logo are trademarks of The - Apache Software Foundation.</p> + <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p> + <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p> </footer> </div>
Modified: websites/staging/deltaspike/trunk/content/documentation/servlet.html ============================================================================== --- websites/staging/deltaspike/trunk/content/documentation/servlet.html (original) +++ websites/staging/deltaspike/trunk/content/documentation/servlet.html Fri Sep 12 12:20:07 2014 @@ -17,92 +17,95 @@ <link href="http://deltaspike.apache.org/resources/css/bootstrap-responsive.css"; rel="stylesheet"> <style type="text/css"> -/* Foundation stylesheet for CodeRay (to match GitHub theme) | MIT License | http://foundation.zurb.com */ -table.CodeRay { border-collapse: collapse; padding: 2px; margin-bottom: 0; border: 0; background: transparent; } -table.CodeRay td { padding: 0 .5em; vertical-align: top; } -table.CodeRay td.line-numbers { text-align: right; color: #999; border-right: 1px solid #e5e5e5; padding-left: 0; } -span.line-numbers { border-right: 1px solid #E5E5E5; color: #999; display: inline-block; margin-right: 0.5em; padding-right: 0.5em; } -.CodeRay td.line-numbers strong, .CodeRay span.line-numbers strong { font-weight: normal; } -.CodeRay .debug { color: white !important; background: blue !important; } -.CodeRay .annotation { color: #007; } -.CodeRay .attribute-name { color: #f08; } -.CodeRay .attribute-value { color: #700; } -.CodeRay .binary { color: #509; } -.CodeRay .comment { color: #999; font-style: italic; } -.CodeRay .char { color: #04D; } -.CodeRay .char .content { color: #04D; } -.CodeRay .char .delimiter { color: #039; } -.CodeRay .class { color: #458; } -.CodeRay .complex { color: #A08; } -.CodeRay .constant { color: teal; } -.CodeRay .color { color: #0A0; } -.CodeRay .class-variable { color: #369; } -.CodeRay .decorator { color: #B0B; } -.CodeRay .definition { color: #099; } -.CodeRay .directive { color: #088; } -.CodeRay .delimiter { color: black; } -.CodeRay .doc { color: #970; } -.CodeRay .doctype { color: #34b; } -.CodeRay .doc-string { color: #D42; } -.CodeRay .escape { color: #666; } -.CodeRay .entity { color: #800; } -.CodeRay .error { color: #808; } -.CodeRay .exception { color: #C00; } -.CodeRay .filename { color: #099; } -.CodeRay .function { color: #900; } -.CodeRay .global-variable { color: teal; } -.CodeRay .hex { color: #058; } -.CodeRay .integer { color: #099; } -.CodeRay .include { color: #B44; } -.CodeRay .inline { color: black; } -.CodeRay .inline .inline { background: #ccc; } -.CodeRay .inline .inline .inline { background: #bbb; } -.CodeRay .inline .inline-delimiter { color: #D14; } -.CodeRay .inline-delimiter { color: #D14; } -.CodeRay .important { color: #f00; } -.CodeRay .interpreted { color: #B2B; } -.CodeRay .instance-variable { color: teal; } -.CodeRay .label { color: #970; } -.CodeRay .local-variable { color: #963; } -.CodeRay .octal { color: #40E; } -.CodeRay .predefined { color: #369; } -.CodeRay .preprocessor { color: #579; } -.CodeRay .pseudo-class { color: #00C; } -.CodeRay .predefined-type { color: #074; } -.CodeRay .reserved, .keyword { color: #000; } -.CodeRay .key { color: #808; } -.CodeRay .key .delimiter { color: #606; } -.CodeRay .key .char { color: #80f; } -.CodeRay .value { color: #088; } -.CodeRay .regexp { background-color: #fff0ff; } -.CodeRay .regexp .content { color: #808; } -.CodeRay .regexp .delimiter { color: #404; } -.CodeRay .regexp .modifier { color: #C2C; } -.CodeRay .regexp .function { color: #404; font-weight: bold; } -.CodeRay .string { color: #D20; } -.CodeRay .string .string { } -.CodeRay .string .string .string { background-color: #ffd0d0; } -.CodeRay .string .content { color: #D14; } -.CodeRay .string .char { color: #D14; } -.CodeRay .string .delimiter { color: #D14; } -.CodeRay .shell { color: #D14; } -.CodeRay .shell .content { } -.CodeRay .shell .delimiter { color: #D14; } -.CodeRay .symbol { color: #990073; } -.CodeRay .symbol .content { color: #A60; } -.CodeRay .symbol .delimiter { color: #630; } -.CodeRay .tag, .CodeRay .attribute-name { color: #070; } -.CodeRay .tag-special { color: #D70; } -.CodeRay .type { color: #339; } -.CodeRay .variable { color: #036; } -.CodeRay .insert { background: #afa; } -.CodeRay .delete { background: #faa; } -.CodeRay .change { color: #aaf; background: #007; } -.CodeRay .head { color: #f8f; background: #505; } -.CodeRay .insert .insert { color: #080; } -.CodeRay .delete .delete { color: #800; } -.CodeRay .change .change { color: #66f; } -.CodeRay .head .head { color: #f4f; } +/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ +/*pre.CodeRay {background-color:#f7f7f8;}*/ +.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} +.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} +.CodeRay .line-numbers strong{font-weight: normal} +table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} +table.CodeRay td{vertical-align: top} +table.CodeRay td.line-numbers{text-align:right} +table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} +table.CodeRay td.code{padding:0 0 0 .5em} +table.CodeRay td.code>pre{padding:0} +.CodeRay .debug{color:#fff !important;background:#000080 !important} +.CodeRay .annotation{color:#007} +.CodeRay .attribute-name{color:#000080} +.CodeRay .attribute-value{color:#700} +.CodeRay .binary{color:#509} +.CodeRay .comment{color:#998;font-style:italic} +.CodeRay .char{color:#04d} +.CodeRay .char .content{color:#04d} +.CodeRay .char .delimiter{color:#039} +.CodeRay .class{color:#458;font-weight:bold} +.CodeRay .complex{color:#a08} +.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} +.CodeRay .color{color:#099} +.CodeRay .class-variable{color:#369} +.CodeRay .decorator{color:#b0b} +.CodeRay .definition{color:#099} +.CodeRay .delimiter{color:#000} +.CodeRay .doc{color:#970} +.CodeRay .doctype{color:#34b} +.CodeRay .doc-string{color:#d42} +.CodeRay .escape{color:#666} +.CodeRay .entity{color:#800} +.CodeRay .error{color:#808} +.CodeRay .exception{color:inherit} +.CodeRay .filename{color:#099} +.CodeRay .function{color:#900;font-weight:bold} +.CodeRay .global-variable{color:#008080} +.CodeRay .hex{color:#058} +.CodeRay .integer,.CodeRay .float{color:#099} +.CodeRay .include{color:#555} +.CodeRay .inline{color:#00} +.CodeRay .inline .inline{background:#ccc} +.CodeRay .inline .inline .inline{background:#bbb} +.CodeRay .inline .inline-delimiter{color:#d14} +.CodeRay .inline-delimiter{color:#d14} +.CodeRay .important{color:#555;font-weight:bold} +.CodeRay .interpreted{color:#b2b} +.CodeRay .instance-variable{color:#008080} +.CodeRay .label{color:#970} +.CodeRay .local-variable{color:#963} +.CodeRay .octal{color:#40e} +.CodeRay .predefined{color:#369} +.CodeRay .preprocessor{color:#579} +.CodeRay .pseudo-class{color:#555} +.CodeRay .directive{font-weight:bold} +.CodeRay .type{font-weight:bold} +.CodeRay .predefined-type{color:inherit} +.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} +.CodeRay .key{color:#808} +.CodeRay .key .delimiter{color:#606} +.CodeRay .key .char{color:#80f} +.CodeRay .value{color:#088} +.CodeRay .regexp .delimiter{color:#808} +.CodeRay .regexp .content{color:#808} +.CodeRay .regexp .modifier{color:#808} +.CodeRay .regexp .char{color:#d14} +.CodeRay .regexp .function{color:#404;font-weight:bold} +.CodeRay .string{color:#d20} +.CodeRay .string .string .string{background:#ffd0d0} +.CodeRay .string .content{color:#d14} +.CodeRay .string .char{color:#d14} +.CodeRay .string .delimiter{color:#d14} +.CodeRay .shell{color:#d14} +.CodeRay .shell .delimiter{color:#d14} +.CodeRay .symbol{color:#990073} +.CodeRay .symbol .content{color:#a60} +.CodeRay .symbol .delimiter{color:#630} +.CodeRay .tag{color:#008080} +.CodeRay .tag-special{color:#d70} +.CodeRay .variable{color:#036} +.CodeRay .insert{background:#afa} +.CodeRay .delete{background:#faa} +.CodeRay .change{color:#aaf;background:#007} +.CodeRay .head{color:#f8f;background:#505} +.CodeRay .insert .insert{color:#080} +.CodeRay .delete .delete{color:#800} +.CodeRay .change .change{color:#66f} +.CodeRay .head .head{color:#f4f} body { padding-top: 60px; padding-bottom: 40px; @@ -166,11 +169,10 @@ body { <h1>Servlet Module</h1> </div> - <div id="toc" class="toc2"> + <div id="toc" class="toc"> <ul class="sectlevel1"> <li><a href="#_configuration">Configuration</a></li> -<li><a href="#_injectable_servlet_objects">Injectable Servlet objects</a></li> -<li> +<li><a href="#_injectable_servlet_objects">Injectable Servlet objects</a> <ul class="sectlevel2"> <li><a href="#_servletcontext">ServletContext</a></li> <li><a href="#_servletrequest_httpservletrequest">ServletRequest / HttpServletRequest</a></li> @@ -179,8 +181,7 @@ body { <li><a href="#_principal">Principal</a></li> </ul> </li> -<li><a href="#_servlet_event_propagation">Servlet event propagation</a></li> -<li> +<li><a href="#_servlet_event_propagation">Servlet event propagation</a> <ul class="sectlevel2"> <li><a href="#_servlet_context_lifecycle_events">Servlet context lifecycle events</a></li> <li><a href="#_request_and_response_lifecycle_events">Request and response lifecycle events</a></li> @@ -221,7 +222,7 @@ your <code>web.xml</code>:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="xml language-xml"><span class="tag"><listener></span> +<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><listener></span> <span class="tag"><display-name></span>EventBridgeContextListener<span class="tag"></display-name></span> <span class="tag"><listener-class></span>org.apache.deltaspike.servlet.impl.event.EventBridgeContextListener<span class="tag"></listener-class></span> <span class="tag"></listener></span> @@ -278,7 +279,7 @@ injection of some Servlet objects out of </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> <span class="directive">private</span> ServletObject servletObject;</code></pre> </div> </div> @@ -290,7 +291,7 @@ be injected into any CDI bean like this: </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> <span class="directive">private</span> ServletContext servletContext;</code></pre> </div> </div> @@ -303,7 +304,7 @@ request can be injected into a CDI bean </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> <span class="directive">private</span> ServletRequest request;</code></pre> </div> </div> @@ -312,7 +313,7 @@ request can be injected into a CDI bean </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> <span class="directive">private</span> HttpServletRequest request;</code></pre> </div> </div> @@ -325,7 +326,7 @@ current response can be injected into a </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> <span class="directive">private</span> ServletResponse response;</code></pre> </div> </div> @@ -334,7 +335,7 @@ current response can be injected into a </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> <span class="directive">private</span> HttpServletResponse response;</code></pre> </div> </div> @@ -347,7 +348,7 @@ the current session of a user into a CDI </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> <span class="directive">private</span> HttpSession session;</code></pre> </div> </div> @@ -364,7 +365,7 @@ principal can be injected into a CDI bea </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Inject</span> <span class="annotation">@DeltaSpike</span> <span class="directive">private</span> <span class="predefined-type">Principal</span> principal;</code></pre> </div> </div> @@ -402,7 +403,7 @@ events can be observed:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">void</span> onCreate(<span class="annotation">@Observes</span> <span class="annotation">@Initialized</span> ServletContext context) { +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> onCreate(<span class="annotation">@Observes</span> <span class="annotation">@Initialized</span> ServletContext context) { <span class="predefined-type">System</span>.out.println(<span class="string"><span class="delimiter">"</span><span class="content">Initialized ServletContext: </span><span class="delimiter">"</span></span> + context.getServletContextName()); } @@ -441,7 +442,7 @@ request:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">void</span> onCreate(<span class="annotation">@Observes</span> <span class="annotation">@Initialized</span> HttpServletRequest request) { +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> onCreate(<span class="annotation">@Observes</span> <span class="annotation">@Initialized</span> HttpServletRequest request) { <span class="predefined-type">System</span>.out.println(<span class="string"><span class="delimiter">"</span><span class="content">Starting to process request for: </span><span class="delimiter">"</span></span> + request.getRequestURI()); } @@ -455,7 +456,7 @@ request:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">void</span> onCreate(<span class="annotation">@Observes</span> <span class="annotation">@Initialized</span> HttpServletResponse response) { +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> onCreate(<span class="annotation">@Observes</span> <span class="annotation">@Initialized</span> HttpServletResponse response) { <span class="predefined-type">System</span>.out.println(<span class="string"><span class="delimiter">"</span><span class="content">HttpServletResponse created</span><span class="delimiter">"</span></span>); } @@ -490,7 +491,7 @@ example shows how these events can be ob </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">void</span> onCreate(<span class="annotation">@Observes</span> <span class="annotation">@Initialized</span> HttpSession session) { +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> onCreate(<span class="annotation">@Observes</span> <span class="annotation">@Initialized</span> HttpSession session) { <span class="predefined-type">System</span>.out.println(<span class="string"><span class="delimiter">"</span><span class="content">Session created: </span><span class="delimiter">"</span></span> + session.getId()); } @@ -522,10 +523,8 @@ your <code>web.xml</code> to disable the <hr> <footer> - <p>Copyright © 2011-2014 The Apache Software Foundation, - Licensed under the Apache License, Version 2.0.</p> - <p>Apache and the Apache feather logo are trademarks of The - Apache Software Foundation.</p> + <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p> + <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p> </footer> </div> Modified: websites/staging/deltaspike/trunk/content/documentation/source.html ============================================================================== --- websites/staging/deltaspike/trunk/content/documentation/source.html (original) +++ websites/staging/deltaspike/trunk/content/documentation/source.html Fri Sep 12 12:20:07 2014 @@ -17,92 +17,95 @@ <link href="http://deltaspike.apache.org/resources/css/bootstrap-responsive.css"; rel="stylesheet"> <style type="text/css"> -/* Foundation stylesheet for CodeRay (to match GitHub theme) | MIT License | http://foundation.zurb.com */ -table.CodeRay { border-collapse: collapse; padding: 2px; margin-bottom: 0; border: 0; background: transparent; } -table.CodeRay td { padding: 0 .5em; vertical-align: top; } -table.CodeRay td.line-numbers { text-align: right; color: #999; border-right: 1px solid #e5e5e5; padding-left: 0; } -span.line-numbers { border-right: 1px solid #E5E5E5; color: #999; display: inline-block; margin-right: 0.5em; padding-right: 0.5em; } -.CodeRay td.line-numbers strong, .CodeRay span.line-numbers strong { font-weight: normal; } -.CodeRay .debug { color: white !important; background: blue !important; } -.CodeRay .annotation { color: #007; } -.CodeRay .attribute-name { color: #f08; } -.CodeRay .attribute-value { color: #700; } -.CodeRay .binary { color: #509; } -.CodeRay .comment { color: #999; font-style: italic; } -.CodeRay .char { color: #04D; } -.CodeRay .char .content { color: #04D; } -.CodeRay .char .delimiter { color: #039; } -.CodeRay .class { color: #458; } -.CodeRay .complex { color: #A08; } -.CodeRay .constant { color: teal; } -.CodeRay .color { color: #0A0; } -.CodeRay .class-variable { color: #369; } -.CodeRay .decorator { color: #B0B; } -.CodeRay .definition { color: #099; } -.CodeRay .directive { color: #088; } -.CodeRay .delimiter { color: black; } -.CodeRay .doc { color: #970; } -.CodeRay .doctype { color: #34b; } -.CodeRay .doc-string { color: #D42; } -.CodeRay .escape { color: #666; } -.CodeRay .entity { color: #800; } -.CodeRay .error { color: #808; } -.CodeRay .exception { color: #C00; } -.CodeRay .filename { color: #099; } -.CodeRay .function { color: #900; } -.CodeRay .global-variable { color: teal; } -.CodeRay .hex { color: #058; } -.CodeRay .integer { color: #099; } -.CodeRay .include { color: #B44; } -.CodeRay .inline { color: black; } -.CodeRay .inline .inline { background: #ccc; } -.CodeRay .inline .inline .inline { background: #bbb; } -.CodeRay .inline .inline-delimiter { color: #D14; } -.CodeRay .inline-delimiter { color: #D14; } -.CodeRay .important { color: #f00; } -.CodeRay .interpreted { color: #B2B; } -.CodeRay .instance-variable { color: teal; } -.CodeRay .label { color: #970; } -.CodeRay .local-variable { color: #963; } -.CodeRay .octal { color: #40E; } -.CodeRay .predefined { color: #369; } -.CodeRay .preprocessor { color: #579; } -.CodeRay .pseudo-class { color: #00C; } -.CodeRay .predefined-type { color: #074; } -.CodeRay .reserved, .keyword { color: #000; } -.CodeRay .key { color: #808; } -.CodeRay .key .delimiter { color: #606; } -.CodeRay .key .char { color: #80f; } -.CodeRay .value { color: #088; } -.CodeRay .regexp { background-color: #fff0ff; } -.CodeRay .regexp .content { color: #808; } -.CodeRay .regexp .delimiter { color: #404; } -.CodeRay .regexp .modifier { color: #C2C; } -.CodeRay .regexp .function { color: #404; font-weight: bold; } -.CodeRay .string { color: #D20; } -.CodeRay .string .string { } -.CodeRay .string .string .string { background-color: #ffd0d0; } -.CodeRay .string .content { color: #D14; } -.CodeRay .string .char { color: #D14; } -.CodeRay .string .delimiter { color: #D14; } -.CodeRay .shell { color: #D14; } -.CodeRay .shell .content { } -.CodeRay .shell .delimiter { color: #D14; } -.CodeRay .symbol { color: #990073; } -.CodeRay .symbol .content { color: #A60; } -.CodeRay .symbol .delimiter { color: #630; } -.CodeRay .tag, .CodeRay .attribute-name { color: #070; } -.CodeRay .tag-special { color: #D70; } -.CodeRay .type { color: #339; } -.CodeRay .variable { color: #036; } -.CodeRay .insert { background: #afa; } -.CodeRay .delete { background: #faa; } -.CodeRay .change { color: #aaf; background: #007; } -.CodeRay .head { color: #f8f; background: #505; } -.CodeRay .insert .insert { color: #080; } -.CodeRay .delete .delete { color: #800; } -.CodeRay .change .change { color: #66f; } -.CodeRay .head .head { color: #f4f; } +/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ +/*pre.CodeRay {background-color:#f7f7f8;}*/ +.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} +.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} +.CodeRay .line-numbers strong{font-weight: normal} +table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} +table.CodeRay td{vertical-align: top} +table.CodeRay td.line-numbers{text-align:right} +table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} +table.CodeRay td.code{padding:0 0 0 .5em} +table.CodeRay td.code>pre{padding:0} +.CodeRay .debug{color:#fff !important;background:#000080 !important} +.CodeRay .annotation{color:#007} +.CodeRay .attribute-name{color:#000080} +.CodeRay .attribute-value{color:#700} +.CodeRay .binary{color:#509} +.CodeRay .comment{color:#998;font-style:italic} +.CodeRay .char{color:#04d} +.CodeRay .char .content{color:#04d} +.CodeRay .char .delimiter{color:#039} +.CodeRay .class{color:#458;font-weight:bold} +.CodeRay .complex{color:#a08} +.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} +.CodeRay .color{color:#099} +.CodeRay .class-variable{color:#369} +.CodeRay .decorator{color:#b0b} +.CodeRay .definition{color:#099} +.CodeRay .delimiter{color:#000} +.CodeRay .doc{color:#970} +.CodeRay .doctype{color:#34b} +.CodeRay .doc-string{color:#d42} +.CodeRay .escape{color:#666} +.CodeRay .entity{color:#800} +.CodeRay .error{color:#808} +.CodeRay .exception{color:inherit} +.CodeRay .filename{color:#099} +.CodeRay .function{color:#900;font-weight:bold} +.CodeRay .global-variable{color:#008080} +.CodeRay .hex{color:#058} +.CodeRay .integer,.CodeRay .float{color:#099} +.CodeRay .include{color:#555} +.CodeRay .inline{color:#00} +.CodeRay .inline .inline{background:#ccc} +.CodeRay .inline .inline .inline{background:#bbb} +.CodeRay .inline .inline-delimiter{color:#d14} +.CodeRay .inline-delimiter{color:#d14} +.CodeRay .important{color:#555;font-weight:bold} +.CodeRay .interpreted{color:#b2b} +.CodeRay .instance-variable{color:#008080} +.CodeRay .label{color:#970} +.CodeRay .local-variable{color:#963} +.CodeRay .octal{color:#40e} +.CodeRay .predefined{color:#369} +.CodeRay .preprocessor{color:#579} +.CodeRay .pseudo-class{color:#555} +.CodeRay .directive{font-weight:bold} +.CodeRay .type{font-weight:bold} +.CodeRay .predefined-type{color:inherit} +.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} +.CodeRay .key{color:#808} +.CodeRay .key .delimiter{color:#606} +.CodeRay .key .char{color:#80f} +.CodeRay .value{color:#088} +.CodeRay .regexp .delimiter{color:#808} +.CodeRay .regexp .content{color:#808} +.CodeRay .regexp .modifier{color:#808} +.CodeRay .regexp .char{color:#d14} +.CodeRay .regexp .function{color:#404;font-weight:bold} +.CodeRay .string{color:#d20} +.CodeRay .string .string .string{background:#ffd0d0} +.CodeRay .string .content{color:#d14} +.CodeRay .string .char{color:#d14} +.CodeRay .string .delimiter{color:#d14} +.CodeRay .shell{color:#d14} +.CodeRay .shell .delimiter{color:#d14} +.CodeRay .symbol{color:#990073} +.CodeRay .symbol .content{color:#a60} +.CodeRay .symbol .delimiter{color:#630} +.CodeRay .tag{color:#008080} +.CodeRay .tag-special{color:#d70} +.CodeRay .variable{color:#036} +.CodeRay .insert{background:#afa} +.CodeRay .delete{background:#faa} +.CodeRay .change{color:#aaf;background:#007} +.CodeRay .head{color:#f8f;background:#505} +.CodeRay .insert .insert{color:#080} +.CodeRay .delete .delete{color:#800} +.CodeRay .change .change{color:#66f} +.CodeRay .head .head{color:#f4f} body { padding-top: 60px; padding-bottom: 40px; @@ -166,16 +169,14 @@ body { <h1>Get Source and compile it</h1> </div> - <div id="toc" class="toc2"> + <div id="toc" class="toc"> <ul class="sectlevel1"> <li><a href="#_introduction">Introduction</a></li> -<li><a href="#_scm_repository">SCM / Repository</a></li> -<li> +<li><a href="#_scm_repository">SCM / Repository</a> <ul class="sectlevel2"> <li><a href="#_initial_em_checkout_em">Initial <em>checkout</em></a></li> <li><a href="#_update_existing_clone">Update existing clone</a></li> -<li><a href="#_read_only_mirrors">Read-only Mirrors</a></li> -<li> +<li><a href="#_read_only_mirrors">Read-only Mirrors</a> <ul class="sectlevel3"> <li><a href="#_github_mirror">GitHub-Mirror</a></li> </ul> @@ -184,8 +185,7 @@ body { </ul> </li> <li><a href="#_build">Build</a></li> -<li><a href="#_tools_ide">Tools / IDE</a></li> -<li> +<li><a href="#_tools_ide">Tools / IDE</a> <ul class="sectlevel2"> <li><a href="#_intellij">IntelliJ</a></li> <li><a href="#eclipse">Eclipse</a></li> @@ -245,7 +245,7 @@ repository of the project is available keep the commit history straight and therefore simple and clean. General details about GIT at Apache are available <a href="http://wiki.apache.org/couchdb/Git_At_Apache_Guide";>here</a> and at -<a href="http://git-wip-us.apache.org";>http://git-wip-us.apache.org</a>.</p> +<a href="http://git-wip-us.apache.org"; class="bare">http://git-wip-us.apache.org</a>.</p> </div> <div class="paragraph"> <p><strong>Hint:</strong></p> @@ -280,7 +280,7 @@ used by us.</p> <div class="paragraph"> <p><a href="http://deltaspike.apache.org/resources/files/settings.jar";>Attached</a> you can find the settings for formatting the source code. Import them via File | Import -Settings…</p> +Settings…​</p> </div> </div> <div class="sect2"> @@ -297,10 +297,8 @@ Settings…</p> <hr> <footer> - <p>Copyright © 2011-2014 The Apache Software Foundation, - Licensed under the Apache License, Version 2.0.</p> - <p>Apache and the Apache feather logo are trademarks of The - Apache Software Foundation.</p> + <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p> + <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p> </footer> </div> Modified: websites/staging/deltaspike/trunk/content/documentation/spi.html ============================================================================== --- websites/staging/deltaspike/trunk/content/documentation/spi.html (original) +++ websites/staging/deltaspike/trunk/content/documentation/spi.html Fri Sep 12 12:20:07 2014 @@ -17,92 +17,95 @@ <link href="http://deltaspike.apache.org/resources/css/bootstrap-responsive.css"; rel="stylesheet"> <style type="text/css"> -/* Foundation stylesheet for CodeRay (to match GitHub theme) | MIT License | http://foundation.zurb.com */ -table.CodeRay { border-collapse: collapse; padding: 2px; margin-bottom: 0; border: 0; background: transparent; } -table.CodeRay td { padding: 0 .5em; vertical-align: top; } -table.CodeRay td.line-numbers { text-align: right; color: #999; border-right: 1px solid #e5e5e5; padding-left: 0; } -span.line-numbers { border-right: 1px solid #E5E5E5; color: #999; display: inline-block; margin-right: 0.5em; padding-right: 0.5em; } -.CodeRay td.line-numbers strong, .CodeRay span.line-numbers strong { font-weight: normal; } -.CodeRay .debug { color: white !important; background: blue !important; } -.CodeRay .annotation { color: #007; } -.CodeRay .attribute-name { color: #f08; } -.CodeRay .attribute-value { color: #700; } -.CodeRay .binary { color: #509; } -.CodeRay .comment { color: #999; font-style: italic; } -.CodeRay .char { color: #04D; } -.CodeRay .char .content { color: #04D; } -.CodeRay .char .delimiter { color: #039; } -.CodeRay .class { color: #458; } -.CodeRay .complex { color: #A08; } -.CodeRay .constant { color: teal; } -.CodeRay .color { color: #0A0; } -.CodeRay .class-variable { color: #369; } -.CodeRay .decorator { color: #B0B; } -.CodeRay .definition { color: #099; } -.CodeRay .directive { color: #088; } -.CodeRay .delimiter { color: black; } -.CodeRay .doc { color: #970; } -.CodeRay .doctype { color: #34b; } -.CodeRay .doc-string { color: #D42; } -.CodeRay .escape { color: #666; } -.CodeRay .entity { color: #800; } -.CodeRay .error { color: #808; } -.CodeRay .exception { color: #C00; } -.CodeRay .filename { color: #099; } -.CodeRay .function { color: #900; } -.CodeRay .global-variable { color: teal; } -.CodeRay .hex { color: #058; } -.CodeRay .integer { color: #099; } -.CodeRay .include { color: #B44; } -.CodeRay .inline { color: black; } -.CodeRay .inline .inline { background: #ccc; } -.CodeRay .inline .inline .inline { background: #bbb; } -.CodeRay .inline .inline-delimiter { color: #D14; } -.CodeRay .inline-delimiter { color: #D14; } -.CodeRay .important { color: #f00; } -.CodeRay .interpreted { color: #B2B; } -.CodeRay .instance-variable { color: teal; } -.CodeRay .label { color: #970; } -.CodeRay .local-variable { color: #963; } -.CodeRay .octal { color: #40E; } -.CodeRay .predefined { color: #369; } -.CodeRay .preprocessor { color: #579; } -.CodeRay .pseudo-class { color: #00C; } -.CodeRay .predefined-type { color: #074; } -.CodeRay .reserved, .keyword { color: #000; } -.CodeRay .key { color: #808; } -.CodeRay .key .delimiter { color: #606; } -.CodeRay .key .char { color: #80f; } -.CodeRay .value { color: #088; } -.CodeRay .regexp { background-color: #fff0ff; } -.CodeRay .regexp .content { color: #808; } -.CodeRay .regexp .delimiter { color: #404; } -.CodeRay .regexp .modifier { color: #C2C; } -.CodeRay .regexp .function { color: #404; font-weight: bold; } -.CodeRay .string { color: #D20; } -.CodeRay .string .string { } -.CodeRay .string .string .string { background-color: #ffd0d0; } -.CodeRay .string .content { color: #D14; } -.CodeRay .string .char { color: #D14; } -.CodeRay .string .delimiter { color: #D14; } -.CodeRay .shell { color: #D14; } -.CodeRay .shell .content { } -.CodeRay .shell .delimiter { color: #D14; } -.CodeRay .symbol { color: #990073; } -.CodeRay .symbol .content { color: #A60; } -.CodeRay .symbol .delimiter { color: #630; } -.CodeRay .tag, .CodeRay .attribute-name { color: #070; } -.CodeRay .tag-special { color: #D70; } -.CodeRay .type { color: #339; } -.CodeRay .variable { color: #036; } -.CodeRay .insert { background: #afa; } -.CodeRay .delete { background: #faa; } -.CodeRay .change { color: #aaf; background: #007; } -.CodeRay .head { color: #f8f; background: #505; } -.CodeRay .insert .insert { color: #080; } -.CodeRay .delete .delete { color: #800; } -.CodeRay .change .change { color: #66f; } -.CodeRay .head .head { color: #f4f; } +/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ +/*pre.CodeRay {background-color:#f7f7f8;}*/ +.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} +.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} +.CodeRay .line-numbers strong{font-weight: normal} +table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} +table.CodeRay td{vertical-align: top} +table.CodeRay td.line-numbers{text-align:right} +table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} +table.CodeRay td.code{padding:0 0 0 .5em} +table.CodeRay td.code>pre{padding:0} +.CodeRay .debug{color:#fff !important;background:#000080 !important} +.CodeRay .annotation{color:#007} +.CodeRay .attribute-name{color:#000080} +.CodeRay .attribute-value{color:#700} +.CodeRay .binary{color:#509} +.CodeRay .comment{color:#998;font-style:italic} +.CodeRay .char{color:#04d} +.CodeRay .char .content{color:#04d} +.CodeRay .char .delimiter{color:#039} +.CodeRay .class{color:#458;font-weight:bold} +.CodeRay .complex{color:#a08} +.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} +.CodeRay .color{color:#099} +.CodeRay .class-variable{color:#369} +.CodeRay .decorator{color:#b0b} +.CodeRay .definition{color:#099} +.CodeRay .delimiter{color:#000} +.CodeRay .doc{color:#970} +.CodeRay .doctype{color:#34b} +.CodeRay .doc-string{color:#d42} +.CodeRay .escape{color:#666} +.CodeRay .entity{color:#800} +.CodeRay .error{color:#808} +.CodeRay .exception{color:inherit} +.CodeRay .filename{color:#099} +.CodeRay .function{color:#900;font-weight:bold} +.CodeRay .global-variable{color:#008080} +.CodeRay .hex{color:#058} +.CodeRay .integer,.CodeRay .float{color:#099} +.CodeRay .include{color:#555} +.CodeRay .inline{color:#00} +.CodeRay .inline .inline{background:#ccc} +.CodeRay .inline .inline .inline{background:#bbb} +.CodeRay .inline .inline-delimiter{color:#d14} +.CodeRay .inline-delimiter{color:#d14} +.CodeRay .important{color:#555;font-weight:bold} +.CodeRay .interpreted{color:#b2b} +.CodeRay .instance-variable{color:#008080} +.CodeRay .label{color:#970} +.CodeRay .local-variable{color:#963} +.CodeRay .octal{color:#40e} +.CodeRay .predefined{color:#369} +.CodeRay .preprocessor{color:#579} +.CodeRay .pseudo-class{color:#555} +.CodeRay .directive{font-weight:bold} +.CodeRay .type{font-weight:bold} +.CodeRay .predefined-type{color:inherit} +.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} +.CodeRay .key{color:#808} +.CodeRay .key .delimiter{color:#606} +.CodeRay .key .char{color:#80f} +.CodeRay .value{color:#088} +.CodeRay .regexp .delimiter{color:#808} +.CodeRay .regexp .content{color:#808} +.CodeRay .regexp .modifier{color:#808} +.CodeRay .regexp .char{color:#d14} +.CodeRay .regexp .function{color:#404;font-weight:bold} +.CodeRay .string{color:#d20} +.CodeRay .string .string .string{background:#ffd0d0} +.CodeRay .string .content{color:#d14} +.CodeRay .string .char{color:#d14} +.CodeRay .string .delimiter{color:#d14} +.CodeRay .shell{color:#d14} +.CodeRay .shell .delimiter{color:#d14} +.CodeRay .symbol{color:#990073} +.CodeRay .symbol .content{color:#a60} +.CodeRay .symbol .delimiter{color:#630} +.CodeRay .tag{color:#008080} +.CodeRay .tag-special{color:#d70} +.CodeRay .variable{color:#036} +.CodeRay .insert{background:#afa} +.CodeRay .delete{background:#faa} +.CodeRay .change{color:#aaf;background:#007} +.CodeRay .head{color:#f8f;background:#505} +.CodeRay .insert .insert{color:#080} +.CodeRay .delete .delete{color:#800} +.CodeRay .change .change{color:#66f} +.CodeRay .head .head{color:#f4f} body { padding-top: 60px; padding-bottom: 40px; @@ -166,17 +169,15 @@ body { <h1>DeltaSpike Service Provider Interface (SPI)</h1> </div> - <div id="toc" class="toc2"> + <div id="toc" class="toc"> <ul class="sectlevel1"> <li><a href="#_introduction">Introduction</a></li> -<li><a href="#_deactivatable">Deactivatable</a></li> -<li> +<li><a href="#_deactivatable">Deactivatable</a> <ul class="sectlevel2"> <li><a href="#_classdeactivator">ClassDeactivator</a></li> </ul> </li> -<li><a href="#_configsource">ConfigSource</a></li> -<li> +<li><a href="#_configsource">ConfigSource</a> <ul class="sectlevel2"> <li><a href="#_configsourceprovider">ConfigSourceProvider</a></li> <li><a href="#_baseconfigpropertyproducer">BaseConfigPropertyProducer</a></li> @@ -240,7 +241,7 @@ used any longer.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="comment">//This class needs to be configured via one of the supported config sources!</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">//This class needs to be configured via one of the supported config sources!</span> <span class="directive">public</span> <span class="type">class</span> <span class="class">CustomClassDeactivator</span> <span class="directive">implements</span> ClassDeactivator { <span class="annotation">@Override</span> @@ -301,7 +302,7 @@ global alternative.</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">class</span> <span class="class">CustomBean</span> +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">CustomBean</span> { } @@ -331,10 +332,8 @@ again and move to the std. CDI config ap <hr> <footer> - <p>Copyright © 2011-2014 The Apache Software Foundation, - Licensed under the Apache License, Version 2.0.</p> - <p>Apache and the Apache feather logo are trademarks of The - Apache Software Foundation.</p> + <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p> + <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p> </footer> </div> Modified: websites/staging/deltaspike/trunk/content/documentation/test-control.html ============================================================================== --- websites/staging/deltaspike/trunk/content/documentation/test-control.html (original) +++ websites/staging/deltaspike/trunk/content/documentation/test-control.html Fri Sep 12 12:20:07 2014 @@ -17,92 +17,95 @@ <link href="http://deltaspike.apache.org/resources/css/bootstrap-responsive.css"; rel="stylesheet"> <style type="text/css"> -/* Foundation stylesheet for CodeRay (to match GitHub theme) | MIT License | http://foundation.zurb.com */ -table.CodeRay { border-collapse: collapse; padding: 2px; margin-bottom: 0; border: 0; background: transparent; } -table.CodeRay td { padding: 0 .5em; vertical-align: top; } -table.CodeRay td.line-numbers { text-align: right; color: #999; border-right: 1px solid #e5e5e5; padding-left: 0; } -span.line-numbers { border-right: 1px solid #E5E5E5; color: #999; display: inline-block; margin-right: 0.5em; padding-right: 0.5em; } -.CodeRay td.line-numbers strong, .CodeRay span.line-numbers strong { font-weight: normal; } -.CodeRay .debug { color: white !important; background: blue !important; } -.CodeRay .annotation { color: #007; } -.CodeRay .attribute-name { color: #f08; } -.CodeRay .attribute-value { color: #700; } -.CodeRay .binary { color: #509; } -.CodeRay .comment { color: #999; font-style: italic; } -.CodeRay .char { color: #04D; } -.CodeRay .char .content { color: #04D; } -.CodeRay .char .delimiter { color: #039; } -.CodeRay .class { color: #458; } -.CodeRay .complex { color: #A08; } -.CodeRay .constant { color: teal; } -.CodeRay .color { color: #0A0; } -.CodeRay .class-variable { color: #369; } -.CodeRay .decorator { color: #B0B; } -.CodeRay .definition { color: #099; } -.CodeRay .directive { color: #088; } -.CodeRay .delimiter { color: black; } -.CodeRay .doc { color: #970; } -.CodeRay .doctype { color: #34b; } -.CodeRay .doc-string { color: #D42; } -.CodeRay .escape { color: #666; } -.CodeRay .entity { color: #800; } -.CodeRay .error { color: #808; } -.CodeRay .exception { color: #C00; } -.CodeRay .filename { color: #099; } -.CodeRay .function { color: #900; } -.CodeRay .global-variable { color: teal; } -.CodeRay .hex { color: #058; } -.CodeRay .integer { color: #099; } -.CodeRay .include { color: #B44; } -.CodeRay .inline { color: black; } -.CodeRay .inline .inline { background: #ccc; } -.CodeRay .inline .inline .inline { background: #bbb; } -.CodeRay .inline .inline-delimiter { color: #D14; } -.CodeRay .inline-delimiter { color: #D14; } -.CodeRay .important { color: #f00; } -.CodeRay .interpreted { color: #B2B; } -.CodeRay .instance-variable { color: teal; } -.CodeRay .label { color: #970; } -.CodeRay .local-variable { color: #963; } -.CodeRay .octal { color: #40E; } -.CodeRay .predefined { color: #369; } -.CodeRay .preprocessor { color: #579; } -.CodeRay .pseudo-class { color: #00C; } -.CodeRay .predefined-type { color: #074; } -.CodeRay .reserved, .keyword { color: #000; } -.CodeRay .key { color: #808; } -.CodeRay .key .delimiter { color: #606; } -.CodeRay .key .char { color: #80f; } -.CodeRay .value { color: #088; } -.CodeRay .regexp { background-color: #fff0ff; } -.CodeRay .regexp .content { color: #808; } -.CodeRay .regexp .delimiter { color: #404; } -.CodeRay .regexp .modifier { color: #C2C; } -.CodeRay .regexp .function { color: #404; font-weight: bold; } -.CodeRay .string { color: #D20; } -.CodeRay .string .string { } -.CodeRay .string .string .string { background-color: #ffd0d0; } -.CodeRay .string .content { color: #D14; } -.CodeRay .string .char { color: #D14; } -.CodeRay .string .delimiter { color: #D14; } -.CodeRay .shell { color: #D14; } -.CodeRay .shell .content { } -.CodeRay .shell .delimiter { color: #D14; } -.CodeRay .symbol { color: #990073; } -.CodeRay .symbol .content { color: #A60; } -.CodeRay .symbol .delimiter { color: #630; } -.CodeRay .tag, .CodeRay .attribute-name { color: #070; } -.CodeRay .tag-special { color: #D70; } -.CodeRay .type { color: #339; } -.CodeRay .variable { color: #036; } -.CodeRay .insert { background: #afa; } -.CodeRay .delete { background: #faa; } -.CodeRay .change { color: #aaf; background: #007; } -.CodeRay .head { color: #f8f; background: #505; } -.CodeRay .insert .insert { color: #080; } -.CodeRay .delete .delete { color: #800; } -.CodeRay .change .change { color: #66f; } -.CodeRay .head .head { color: #f4f; } +/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ +/*pre.CodeRay {background-color:#f7f7f8;}*/ +.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} +.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} +.CodeRay .line-numbers strong{font-weight: normal} +table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} +table.CodeRay td{vertical-align: top} +table.CodeRay td.line-numbers{text-align:right} +table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} +table.CodeRay td.code{padding:0 0 0 .5em} +table.CodeRay td.code>pre{padding:0} +.CodeRay .debug{color:#fff !important;background:#000080 !important} +.CodeRay .annotation{color:#007} +.CodeRay .attribute-name{color:#000080} +.CodeRay .attribute-value{color:#700} +.CodeRay .binary{color:#509} +.CodeRay .comment{color:#998;font-style:italic} +.CodeRay .char{color:#04d} +.CodeRay .char .content{color:#04d} +.CodeRay .char .delimiter{color:#039} +.CodeRay .class{color:#458;font-weight:bold} +.CodeRay .complex{color:#a08} +.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} +.CodeRay .color{color:#099} +.CodeRay .class-variable{color:#369} +.CodeRay .decorator{color:#b0b} +.CodeRay .definition{color:#099} +.CodeRay .delimiter{color:#000} +.CodeRay .doc{color:#970} +.CodeRay .doctype{color:#34b} +.CodeRay .doc-string{color:#d42} +.CodeRay .escape{color:#666} +.CodeRay .entity{color:#800} +.CodeRay .error{color:#808} +.CodeRay .exception{color:inherit} +.CodeRay .filename{color:#099} +.CodeRay .function{color:#900;font-weight:bold} +.CodeRay .global-variable{color:#008080} +.CodeRay .hex{color:#058} +.CodeRay .integer,.CodeRay .float{color:#099} +.CodeRay .include{color:#555} +.CodeRay .inline{color:#00} +.CodeRay .inline .inline{background:#ccc} +.CodeRay .inline .inline .inline{background:#bbb} +.CodeRay .inline .inline-delimiter{color:#d14} +.CodeRay .inline-delimiter{color:#d14} +.CodeRay .important{color:#555;font-weight:bold} +.CodeRay .interpreted{color:#b2b} +.CodeRay .instance-variable{color:#008080} +.CodeRay .label{color:#970} +.CodeRay .local-variable{color:#963} +.CodeRay .octal{color:#40e} +.CodeRay .predefined{color:#369} +.CodeRay .preprocessor{color:#579} +.CodeRay .pseudo-class{color:#555} +.CodeRay .directive{font-weight:bold} +.CodeRay .type{font-weight:bold} +.CodeRay .predefined-type{color:inherit} +.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} +.CodeRay .key{color:#808} +.CodeRay .key .delimiter{color:#606} +.CodeRay .key .char{color:#80f} +.CodeRay .value{color:#088} +.CodeRay .regexp .delimiter{color:#808} +.CodeRay .regexp .content{color:#808} +.CodeRay .regexp .modifier{color:#808} +.CodeRay .regexp .char{color:#d14} +.CodeRay .regexp .function{color:#404;font-weight:bold} +.CodeRay .string{color:#d20} +.CodeRay .string .string .string{background:#ffd0d0} +.CodeRay .string .content{color:#d14} +.CodeRay .string .char{color:#d14} +.CodeRay .string .delimiter{color:#d14} +.CodeRay .shell{color:#d14} +.CodeRay .shell .delimiter{color:#d14} +.CodeRay .symbol{color:#990073} +.CodeRay .symbol .content{color:#a60} +.CodeRay .symbol .delimiter{color:#630} +.CodeRay .tag{color:#008080} +.CodeRay .tag-special{color:#d70} +.CodeRay .variable{color:#036} +.CodeRay .insert{background:#afa} +.CodeRay .delete{background:#faa} +.CodeRay .change{color:#aaf;background:#007} +.CodeRay .head{color:#f8f;background:#505} +.CodeRay .insert .insert{color:#080} +.CodeRay .delete .delete{color:#800} +.CodeRay .change .change{color:#66f} +.CodeRay .head .head{color:#f4f} body { padding-top: 60px; padding-bottom: 40px; @@ -166,11 +169,10 @@ body { <h1>Test-Control Module</h1> </div> - <div id="toc" class="toc2"> + <div id="toc" class="toc"> <ul class="sectlevel1"> <li><a href="#_intro">Intro</a></li> -<li><a href="#_setup">Setup</a></li> -<li> +<li><a href="#_setup">Setup</a> <ul class="sectlevel2"> <li><a href="#_openwebbeans">OpenWebBeans</a></li> <li><a href="#_weld">Weld</a></li> @@ -182,22 +184,19 @@ body { <li><a href="#_project_stage_control">Project-Stage Control</a></li> <li><a href="#_optional_config">Optional Config</a></li> <li><a href="#_hints">Hints</a></li> -<li><a href="#_optional_integrations">Optional Integrations</a></li> -<li> +<li><a href="#_optional_integrations">Optional Integrations</a> <ul class="sectlevel2"> <li><a href="#_mock_frameworks">Mock Frameworks</a></li> <li><a href="#_jsf_via_myfaces_test">JSF (via MyFaces-Test)</a></li> </ul> </li> <li><a href="#_mixed_tests">Mixed Tests</a></li> -<li><a href="#_known_restrictions">Known Restrictions</a></li> -<li> +<li><a href="#_known_restrictions">Known Restrictions</a> <ul class="sectlevel2"> <li><a href="#_liquibase">Liquibase</a></li> </ul> </li> -<li><a href="#_spi">SPI</a></li> -<li> +<li><a href="#_spi">SPI</a> <ul class="sectlevel2"> <li><a href="#_externalcontainer">ExternalContainer</a></li> </ul> @@ -223,7 +222,7 @@ test-dependencies:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="xml language-xml"><span class="tag"><dependency></span> +<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><dependency></span> <span class="tag"><groupId></span>org.apache.deltaspike.modules<span class="tag"></groupId></span> <span class="tag"><artifactId></span>deltaspike-test-control-module-api<span class="tag"></artifactId></span> <span class="tag"><version></span>${ds.version}<span class="tag"></version></span> @@ -244,7 +243,7 @@ test-dependencies:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="xml language-xml"> <span class="tag"><dependency></span> +<pre class="CodeRay highlight"><code data-lang="xml"> <span class="tag"><dependency></span> <span class="tag"><groupId></span>org.apache.deltaspike.cdictrl<span class="tag"></groupId></span> <span class="tag"><artifactId></span>deltaspike-cdictrl-owb<span class="tag"></artifactId></span> <span class="tag"><version></span>${ds.version}<span class="tag"></version></span> @@ -260,7 +259,7 @@ test-dependencies:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="xml language-xml"><span class="tag"><dependency></span> +<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><dependency></span> <span class="tag"><groupId></span>org.apache.deltaspike.cdictrl<span class="tag"></groupId></span> <span class="tag"><artifactId></span>deltaspike-cdictrl-weld<span class="tag"></artifactId></span> <span class="tag"><version></span>${ds.version}<span class="tag"></version></span> @@ -280,7 +279,7 @@ test-class) and one request and session </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) <span class="directive">public</span> <span class="type">class</span> <span class="class">ContainerAndInjectionControl</span> { <span class="annotation">@Inject</span> @@ -308,7 +307,7 @@ created:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) <span class="annotation">@TestControl</span>(startScopes = SessionScoped.class) <span class="directive">public</span> <span class="type">class</span> <span class="class">CustomizedScopeHandling</span> { @@ -327,7 +326,7 @@ test-suite):</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@RunWith</span>(CdiTestSuiteRunner.class) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RunWith</span>(CdiTestSuiteRunner.class) <span class="annotation">@Suite</span>.SuiteClasses({ TestX.class, TestY.class @@ -348,7 +347,7 @@ test-suite):</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) <span class="annotation">@TestControl</span>(projectStage = CustomTestStage.class) <span class="directive">public</span> <span class="type">class</span> <span class="class">TestStageControl</span> { @@ -407,7 +406,7 @@ via a mocking framework and add them e.g </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) <span class="directive">public</span> <span class="type">class</span> <span class="class">MockedRequestScopedBeanTest</span> { <span class="annotation">@Inject</span> @@ -456,7 +455,7 @@ via Mockito:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) <span class="directive">public</span> <span class="type">class</span> <span class="class">MockitoMockedRequestScopedBeanTest</span> { <span class="annotation">@Inject</span> @@ -486,7 +485,7 @@ e.g.:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) <span class="directive">public</span> <span class="type">class</span> <span class="class">MockedApplicationScopedBeanTest</span> { <span class="annotation">@Inject</span> @@ -545,7 +544,7 @@ literal-instance(s) as additional parame </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) <span class="directive">public</span> <span class="type">class</span> <span class="class">MockedQualifiedBeanTest</span> { <span class="annotation">@Inject</span> @@ -625,7 +624,7 @@ with:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) +<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RunWith</span>(CdiTestRunner.class) <span class="annotation">@TestControl</span>(startExternalContainers = <span class="predefined-constant">false</span>) <span class="directive">public</span> <span class="type">class</span> <span class="class">JsfContainerTest</span> { @@ -647,7 +646,7 @@ mocking-support via:</p> </div> <div class="listingblock"> <div class="content"> -<pre class="CodeRay"><code class="java language-java"><span class="directive">public</span> <span class="type">class</span> <span class="class">LiquibaseAwareClassDeactivator</span> <span class="directive">implements</span> ClassDeactivator { +<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">LiquibaseAwareClassDeactivator</span> <span class="directive">implements</span> ClassDeactivator { <span class="annotation">@Override</span> <span class="directive">public</span> <span class="predefined-type">Boolean</span> isActivated(<span class="predefined-type">Class</span><? <span class="directive">extends</span> Deactivatable> targetClass) { <span class="keyword">return</span> !<span class="string"><span class="delimiter">"</span><span class="content">org.apache.deltaspike.testcontrol.impl.mock.MockExtension</span><span class="delimiter">"</span></span>.equals(targetClass.getName()); @@ -694,10 +693,8 @@ Currently DeltaSpike provides:</p> <hr> <footer> - <p>Copyright © 2011-2014 The Apache Software Foundation, - Licensed under the Apache License, Version 2.0.</p> - <p>Apache and the Apache feather logo are trademarks of The - Apache Software Foundation.</p> + <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p> + <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p> </footer> </div>
