myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1738901 - in /myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src: main/java/org/apache/myfaces/tobago/example/demo/ main/java/org/apache/myfaces/tobago/example/demo/bestpractice/ main/webapp/WEB-INF/ main/webapp/co...
Date Wed, 13 Apr 2016 07:32:24 GMT
Author: lofwyr
Date: Wed Apr 13 07:32:23 2016
New Revision: 1738901

URL: http://svn.apache.org/viewvc?rev=1738901&view=rev
Log:
TOBAGO-1544: Revise Demo Application for Tobago 3.0
[developed by hnoeth]

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/resources/realm.properties
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/tomee/conf/tomcat-users.xml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java?rev=1738901&r1=1738900&r2=1738901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
Wed Apr 13 07:32:23 2016
@@ -28,29 +28,28 @@ import java.io.Serializable;
 @Named
 public class RoleController implements Serializable {
 
-  private String guestString;
-  private String adminString;
+  private String text;
   private static final String OUTCOME_ADMIN = "admin";
 
-  public String getGuestString() {
-    return guestString;
+  public String getText() {
+    return text;
   }
 
-  public void setGuestString(String guestString) {
-    this.guestString = guestString;
+  public void setText(String text) {
+    this.text = text;
   }
 
-  @RolesAllowed({"admin"})
-  public String getAdminString() {
-    return adminString;
+  @RolesAllowed({"demo-admin", "demo-guest"})
+  public boolean guestBox() {
+    return true;
   }
 
-  @RolesAllowed({"admin"})
-  public void setAdminString(String adminString) {
-    this.adminString = adminString;
+  @RolesAllowed({"demo-admin"})
+  public boolean adminBox() {
+    return true;
   }
 
-  @RolesAllowed({"admin"})
+  @RolesAllowed({"demo-admin"})
   public String admin() {
     return OUTCOME_ADMIN;
   }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java?rev=1738901&r1=1738900&r2=1738901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
Wed Apr 13 07:32:23 2016
@@ -36,6 +36,6 @@ public class TransitionController {
     LOG.info("Waiting " + sleep + " millis.");
     Thread.sleep(sleep);
 
-    return "best-practice/transition-after-sleep";
+    return "/content/30-concept/23-transition/x-transition-after-sleep.xhtml";
   }
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml?rev=1738901&r1=1738900&r2=1738901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
Wed Apr 13 07:32:23 2016
@@ -178,7 +178,8 @@
       <url-pattern>/content/*</url-pattern>
     </web-resource-collection>
     <auth-constraint>
-      <role-name>demo-user</role-name>
+      <role-name>demo-admin</role-name>
+      <role-name>demo-guest</role-name>
     </auth-constraint>
   </security-constraint>
 
@@ -192,7 +193,10 @@
   </login-config>
 
   <security-role>
-    <role-name>demo-user</role-name>
+    <role-name>demo-admin</role-name>
+  </security-role>
+  <security-role>
+    <role-name>demo-guest</role-name>
   </security-role>
 
 </web-app>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml?rev=1738901&r1=1738900&r2=1738901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
Wed Apr 13 07:32:23 2016
@@ -17,136 +17,22 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/main.xhtml"
+<ui:composition template="/plain.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
 
   <ui:param name="title" value="#{overviewBundle.intro}"/>
 
-  <tc:out escape="false" value="#{overviewBundle.intro_text}" id="text"/>
-
-  <tc:out value="#{overviewBundle.notTranslated}" id="nt" />
-
   <tc:section label="Some short examples (Todo: revise)">
 
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto;2*;3*;auto;2*;2*;auto;2*;2*"/>
-      <!--<tc:gridLayout border="0" rows="*;*;*;*;*;*;*;*;*;*"/>-->
-    </f:facet>
-
-    <!-- row -->
-    <tc:separator label="#{overviewBundle.basic_sampleInputTitle}"/>
-
-    <!-- row -->
-    <tc:out escape="false" value="#{overviewBundle.basic_text_input}" id="basic_text_input"/>
-
-    <!-- row -->
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="*;*"/>
-      </f:facet>
-
-      <tc:panel>
-        <f:facet name="layout">
-          <tc:gridLayout rows="auto;auto;auto;auto"/>
-        </f:facet>
-        <tc:in value="#{overviewController.basicInput}" required="true" tabIndex="1" id="basic_input"
-               label="#{overviewBundle.basic_textboxLabel}" tip="#{overviewBundle.basic_textboxTip}"/>
-        <tc:in value="#{overviewController.suggestInput}" tabIndex="3" id="suggest_input"
-               label="#{overviewBundle.basic_suggestLabel}" tip="#{overviewBundle.basic_suggestTip}"
-               placeholder="Country (Language)">
-          <tc:suggest suggestMethod="#{overviewController.getInputSuggestItems}"
-                      id="suggest" delay="300" minimumCharacters="1" maximumItems="10"/>
-        </tc:in>
-        <tc:date value="#{overviewController.basicDate}" tabIndex="4" id="basic_date"
-                 label="#{overviewBundle.basic_dateLabel}" required="true">
-          <f:convertDateTime pattern="dd/MM/yyyy"/>
-          <tc:validateSubmittedValueLength maximum="10"/>
-        </tc:date>
-        <tc:date label="#{overviewBundle.basic_timeLabel}" tabIndex="5" id="basic_time"
-                 value="#{overviewController.basicTime}">
-          <f:convertDateTime pattern="HH:mm" timeZone="CET"/>
-        </tc:date>
-        <tc:in value="#{overviewController.placeholder}" tabIndex="6" id="basic_placeholder"
-               label="Placeholder" placeholder="Search..."/>
-      </tc:panel>
-
-      <tc:textarea value="#{overviewController.basicArea}" tabIndex="2" tip="max length
= 1000"
-                   label="#{overviewBundle.basic_textareaLabel}">
-        <f:validateLength maximum="1000"/>
-      </tc:textarea>
-    </tc:panel>
-
-    <!-- row -->
-    <tc:separator label="#{overviewBundle.basic_sampleSelectTitle}"/>
-
-    <!-- row -->
-    <tc:out escape="false" value="#{overviewBundle.basic_text_select}"/>
-
-    <!-- row -->
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="*;*" border="0"/>
-      </f:facet>
-      <tc:selectOneRadio label="Select One" value="#{overviewController.radioValue}" id="rg0">
-        <tc:selectItems value="#{overviewController.currencyItems}" id="items0"
-                        var="currency" itemValue="#{currency.currencyCode}" itemLabel="#{currency.displayName}"
-                        itemImage="data/#{currency.currencyCode}-14.png"/>
-        <!-- images come from tobago-example-data -->
-        <!--
-                <f:facet name="click">
-                  <tc:command/>
-                </f:facet>
-        -->
-      </tc:selectOneRadio>
-
-      <tc:panel>
-        <f:facet name="layout">
-          <tc:gridLayout rows="auto;auto"/>
-        </f:facet>
-        <tc:selectManyCheckbox label="Select Many" value="#{overviewController.multiValue}"
-                               id="cbg0" renderRange="1-2" converter="salutationId">
-          <f:selectItems value="#{overviewController.items}" id="itemsg0"/>
-        </tc:selectManyCheckbox>
-        <tc:selectOneChoice label="Select One Choice" value="#{overviewController.singleValue}"
-                            converter="salutationId">
-          <f:selectItems value="#{overviewController.items}"/>
-        </tc:selectOneChoice>
-      </tc:panel>
-    </tc:panel>
-
-    <!-- row -->
-    <tc:separator label="#{overviewBundle.basic_sampleLinkTitle}"/>
-
-    <!-- row -->
-    <tc:out escape="false" value="#{overviewBundle.basic_text_action}"/>
-
-    <!-- row -->
-    <tc:flowLayout>
-      <tc:link id="link"
-               actionListener="#{overviewController.click}"
-               label="#{overviewBundle.basic_linkAction}"/>
-      <tc:link id="image"
-               actionListener="#{overviewController.click}"
-               image="image/image_button.png"/>
-      <tc:button id="button"
-                 actionListener="#{overviewController.click}"
-                 label="#{overviewBundle.basic_buttonAction}"/>
-    </tc:flowLayout>
-
-    <!-- row -->
-    <tc:in value="#{overviewController.lastAction}" readonly="true"
-           label="#{overviewBundle.basic_lastActionLabel}">
-      <tc:gridLayoutConstraint columnSpan="5"/>
+    <tc:in value="#{overviewController.suggestInput}" tabIndex="3" id="suggest_input"
+           label="#{overviewBundle.basic_suggestLabel}" tip="#{overviewBundle.basic_suggestTip}"
+           placeholder="Country (Language)">
+      <tc:suggest suggestMethod="#{overviewController.getInputSuggestItems}"
+                  id="suggest" delay="300" minimumCharacters="1" maximumItems="10"/>
     </tc:in>
 
-    <!-- todo: deprecated -->
-    <tc:script>
-      new Tobago.AcceleratorKey(function() {Tobago.clickOnElement('page:image');}, 'O', "ctrl");
-      new Tobago.AcceleratorKey(function() {Tobago.clickOnElement('page:button');}, 'B',
"ctrl");
-    </tc:script>
-
   </tc:section>
 
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml?rev=1738901&r1=1738900&r2=1738901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml
Wed Apr 13 07:32:23 2016
@@ -18,43 +18,82 @@
 -->
 
 <ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.validation}"/>
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout rows="80px;auto;*;auto"/>
-    </f:facet>
-
-    <tc:out escape="false" value="#{overviewBundle.validation_text}" id="text"/>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1*;1*"/>
-      </f:facet>
-      <tc:in label="#{overviewBundle.validation_number}" markup="number" required="true"
id="number"
-             value="#{validationBean.number}">
-        <f:validateLength minimum="7" maximum="7"/>
-        <f:validateLongRange maximum="9000000"/>
+  <p>There are several ways to validate the content of a component. In general input
components have the option
+    for validation. In the following sections, the different kinds von validation are explained.</p>
+
+  <p>Tag Library Documentation:
+    <tc:link label="&lt;tc:sheet/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/sheet.html"/>
+    |
+    <tc:link label="&lt;tc:column/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/column.html"/></p>
+
+  <tc:section label="Required">
+    <p>A simple way of validation is the <code>required</code> attribute
in some input components.
+      The text area must not empty if the submit button is pressed. Otherwise a error message
is displayed.</p>
+    <pre><code class="language-markup">&lt;tc:textarea label="Text Area"
required="true"/></code></pre>
+    <tc:form>
+      <tc:textarea id="t1" label="Text Area" required="true"/>
+      <tc:button label="Submit"/>
+    </tc:form>
+  </tc:section>
+
+  <tc:section label="Validate Length">
+    <p>The length of a value can be validated by the <code class="language-markup">&lt;f:validateLength/></code>
tag.
+      Length means the number of characters.
+      In this example, the given string must have at least two characters and maximal four
characters.</p>
+    <pre><code class="language-markup">&lt;tc:in label="Input">
+  &lt;f:validateLength minimum="2" maximum="4"/>
+&lt;/tc:in></code></pre>
+    <tc:form>
+      <tc:in id="i1" label="Text">
+        <f:validateLength minimum="2" maximum="4"/>
       </tc:in>
-      <tc:in label="#{overviewBundle.validation_price}" markup="number" value="#{validationBean.price}"
id="price">
-        <f:validateDoubleRange minimum="0.01" maximum="1000"/>
-        <f:convertNumber pattern="#,##0.00 ¤" currencySymbol="€" type="currency"
/>
+      <tc:button label="Submit"/>
+    </tc:form>
+  </tc:section>
+
+  <tc:section label="Validate Range">
+    <p>The range of a number can be validated via <code class="language-markup">&lt;f:validateLongRange/></code>
+      or - for floating point numbers - <code class="language-markup">&lt;f:validateDoubleRange/></code>.
+      In the following inputfield numbers from 3 to 77 can be added.</p>
+    <pre><code class="language-markup">&lt;tc:in label="Number" markup="number">
+  &lt;f:validateLongRange minimum="3" maximum="77"/>
+&lt;/tc:in></code></pre>
+    <tc:form>
+      <tc:in id="i2" label="Number" markup="number">
+        <f:validateLongRange minimum="3" maximum="77"/>
       </tc:in>
-      <tc:in label="#{overviewBundle.validation_custom}" validator="#{overviewController.customValidator}"
-             value="#{validationBean.custom}" id="custom">
+      <tc:button label="Submit"/>
+    </tc:form>
+  </tc:section>
+
+  <tc:section label="Regex Validation">
+    <p>A value can be validated against a regex patter via the
+      <code class="language-markup">&lt;f:validateRegex/></code> tag.</p>
+    <pre><code class="language-markup">&lt;tc:in label="Letter &amp;
Number" >
+  &lt;f:validateRegex pattern="[A-Za-z][0-9]"/>
+&lt;/tc:in></code></pre>
+    <tc:form>
+      <p>The value in the field must be a word character combined with a number. For
example 'T3'.</p>
+      <tc:in id="i3" label="Letter &amp; Number">
+        <f:validateRegex pattern="[A-Za-z][0-9]"/>
       </tc:in>
-    </tc:panel>
-
-    <tc:textarea label="#{overviewBundle.validation_description}" required="true" value="#{validationBean.text}"
-                 id="area"/>
-
-    <tc:flowLayout>
-      <tc:style textAlign="right"/>
-      <tc:button action="#{overviewController.noop}" label="#{overviewBundle.validation_submit}"
id="noop"
-          defaultCommand="true"/>
-    </tc:flowLayout>
-
-  </tc:panel>
+      <tc:button label="Submit"/>
+    </tc:form>
+  </tc:section>
+
+  <tc:section label="Custom Validator">
+    <p>It's also possible to add custom validators using the <code>validator</code>
attribute of an input component.
+      In this case, only the string 'Tobago' is accepted.</p>
+    <tc:form>
+      <tc:in id="i4" label="Text" validator="#{validationController.customValidator}"/>
+      <tc:button label="Submit"/>
+    </tc:form>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml?rev=1738901&r1=1738900&r2=1738901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml
Wed Apr 13 07:32:23 2016
@@ -18,25 +18,57 @@
 -->
 
 <ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core">
-  <ui:param name="title" value="Roles"/>
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{overviewBundle.roles}"/>
+  <p>It is possible to define roles for users. Based on this roles, components with
an <code>action</code> attribute
+    like a button are enabled or disabled for the current user.</p>
 
-  TODO
-
-  <tc:section label="Guest">
-    <p>This section should be visible for all.</p>
-
-    <tc:in label="Guest Input" value="#{roleController.guestString}"/>
-    <tc:out label="Guest Output" value="#{roleController.guestString}"/>
-    <tc:button label="Submit"/>
+  <tc:section label="Basics">
+    <p>To allow an action only for a specific role, you have to annotate a method with
+      <code class="language-java">@RolesAllowed({"role1", "role2"})</code>.
+      This method must not have a parameter.</p>
+    <p>There are different ways to define roles for Tomcat and Jetty.</p>
+    <tc:section label="Tomcat">
+      <p>Roles are defined in a tomcat-users.xml within the <code class="language-markup">&lt;tomcat-users></code>
+        tag.</p>
+      <pre><code class="language-markup">&lt;tomcat-users>
+  &lt;user username="guest" password="guest" roles="demo-guest"/>
+  &lt;user username="admin" password="admin" roles="demo-admin"/>
+&lt;/tomcat-users></code></pre>
+    </tc:section>
+    <tc:section label="Jetty">
+      <p>For Jetty, roles are defined in a config file. This config file could be set
in the configuration of the
+        jetty-plugin in the pom file.</p>
+      <pre><code class="language-markup"># username: password [,rolename ...]
+guest: guest,demo-guest
+admin: admin,demo-admin</code></pre>
+    </tc:section>
   </tc:section>
 
-  <tc:section label="Admin">
-    <p>This section can only be used by an admin.</p>
-    <tc:in label="Admin Input" value="#{roleController.adminString}"/>
-    <tc:out label="Admin Output" value="#{roleController.adminString}"/>
-    <tc:button label="The admin button"/>
+  <tc:section label="Example">
+    <p>In this example there are two content boxes. The left one is for admin users.
+      The right one is for guests and admins.</p>
+    <tc:segmentLayout medium="6;6">
+      <tc:box label="Admin Box">
+        <p>This is a box only for admins. A text can be added in the inputfield.
+          The submit button is only enabled for admin users.
+          Notice, that the method set in the <code>action</code> attribute of
the
+          <code class="language-markup">&lt;tc:button/></code> have the
annotation
+          <code class="language-java">@RolesAllowed({"admin"})</code>.</p>
+        <tc:in id="i1" label="Input" value="#{roleController.text}"/>
+        <tc:button label="Submit" action="#{roleController.admin}"/>
+      </tc:box>
+      <tc:box label="Guest Box">
+        <p>This is a box for guests and admins. It displays the text which is set by
an admin on the left.
+          You also can hit the logout button to relogin.</p>
+        <tc:out id="o1" label="Output" value="#{roleController.text}"/>
+        <tc:separator/>
+        <tc:form>
+          <tc:button label="Logout" action="#{login.logout}"/>
+        </tc:form>
+      </tc:box>
+    </tc:segmentLayout>
   </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=1738901&r1=1738900&r2=1738901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
Wed Apr 13 07:32:23 2016
@@ -34,7 +34,6 @@
   <entry key="menu_about">About</entry>
 
 <!-- navigate -->
-  <entry key="overview">Overview</entry>
   <entry key="intro">Intro</entry>
   <entry key="component">Components</entry>
   <entry key="input">Input Fields</entry>
@@ -91,9 +90,10 @@
   <entry key="wysiwyg_editor">WYSIWYG Editor</entry>
   <entry key="tinymce">TinyMCE</entry>
   <entry key="ckeditor">CKEditor</entry>
+  <entry key="validation">Validation</entry>
+  <entry key="roles">Roles</entry>
 
 
-  <entry key="validation">Validation</entry>
   <entry key="validation-severity">Severity</entry>
   <entry key="form">Forms</entry>
   <entry key="theme">Themes</entry>
@@ -138,25 +138,6 @@
   <!-- Tag Library Documentation URL -->
   <entry key="tagDocUrl">https://myfaces.apache.org/tobago/doc/2.0.9/tld/tc</entry>
 
-
-<!--  intro -->
-<entry key="intro_text">&lt;p&gt;Tobago is a user interface framework for developing
webapplications.
-  The technical basis of the framework is JavaServer Faces. The main core represents a theme
oriented
-  JSF Render Kit.&lt;/p&gt;
-  &lt;p&gt;&lt;b&gt;Basic Controls&lt;/b&gt;&lt;br/&gt;
-  Tobago provides all standard controls of HTML like inputs, textareas, radiobuttons, checkboxes
and buttons.
-  Additionally Tobago provides you with complex controls, which are not natively supportet
by simple HTML,
-  including sheets, trees and tabs.&lt;/p&gt;
-  &lt;p&gt;&lt;b&gt;Validation&lt;/b&gt;&lt;br/&gt;
-  The main goal of Tobago is the development of applications which are interactive from the
users point of view.
-  Tobago makes it easy to validate input and helps the user to enter correct data.&lt;/p&gt;
-  &lt;p&gt;&lt;b&gt;Layout&lt;/b&gt;&lt;br/&gt;
-  Tobago provides a sophisticated layout managing mechanism which can be seen as a mixture
of classic HTML table
-  layout and Swing Gridbag layout.&lt;/p&gt;
-  &lt;p&gt;&lt;b&gt;Additional Features&lt;/b&gt;&lt;br/&gt;
-  Themes, Browser, Internationalisation.&lt;/p&gt;
-</entry>
-
 <!--  basicControls -->
   <entry key="basic_sampleInputTitle">Basic Input Examples</entry>
   <entry key="basic_sampleSelectTitle">Basic Select Examples</entry>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/resources/realm.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/resources/realm.properties?rev=1738901&r1=1738900&r2=1738901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/resources/realm.properties
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/resources/realm.properties
Wed Apr 13 07:32:23 2016
@@ -16,5 +16,5 @@
 #
 
 # username: password [,rolename ...]
-guest: guest,demo-user
-admin: admin,demo-user
+guest: guest,demo-guest
+admin: admin,demo-admin

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/tomee/conf/tomcat-users.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/tomee/conf/tomcat-users.xml?rev=1738901&r1=1738900&r2=1738901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/tomee/conf/tomcat-users.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/test/tomee/conf/tomcat-users.xml
Wed Apr 13 07:32:23 2016
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 
 <tomcat-users>
-  <role rolename="demo-user"/>
-  <user username="guest" password="guest" roles="demo-user"/>
-  <user username="admin" password="admin" roles="demo-user"/>
+  <role rolename="demo-guest"/>
+  <role rolename="demo-admin"/>
+  <user username="guest" password="guest" roles="demo-guest"/>
+  <user username="admin" password="admin" roles="demo-admin"/>
 </tomcat-users>
-



Mime
View raw message