You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/11/02 17:23:35 UTC
svn commit: r1030107 - in /myfaces/trinidad/branches/trinidad-2.0.4.1: ./
trinidad-api/ trinidad-assembly/ trinidad-build/ trinidad-examples/
trinidad-examples/trinidad-blank/
trinidad-examples/trinidad-components-showcase/
trinidad-examples/trinidad-d...
Author: matzew
Date: Tue Nov 2 16:23:35 2010
New Revision: 1030107
URL: http://svn.apache.org/viewvc?rev=1030107&view=rev
Log:
[maven-release-plugin] copy for branch trinidad-2.0.4.1
Added:
myfaces/trinidad/branches/trinidad-2.0.4.1/ (props changed)
- copied from r1030088, myfaces/trinidad/trunk/
myfaces/trinidad/branches/trinidad-2.0.4.1/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/pom.xml
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-api/
- copied from r1030101, myfaces/trinidad/trunk/trinidad-api/
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-api/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/trinidad-api/pom.xml
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-assembly/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/trinidad-assembly/pom.xml
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-build/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/trinidad-build/pom.xml
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/trinidad-examples/pom.xml
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-blank/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-components-showcase/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-example-assembly/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/trinidad-examples/trinidad-example-assembly/pom.xml
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-impl/pom.xml
- copied unchanged from r1030105, myfaces/trinidad/trunk/trinidad-impl/pom.xml
Modified:
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java
myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/webapp/components/outputFormatted.jspx
Propchange: myfaces/trinidad/branches/trinidad-2.0.4.1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 2 16:23:35 2010
@@ -0,0 +1,13 @@
+target
+*.ipr
+*.iws
+*.iml
+trinidad.jws
+cwallet.sso
+jps-config.xml
+trinidad-data-sources.xml
+trinidad-oc4j-app.log
+trinidad-oc4j-app.log.0
+trinidad-oc4j-app.log.0.lck
+trinidad-oc4j-app.xml
+.adf
Propchange: myfaces/trinidad/branches/trinidad-2.0.4.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Nov 2 16:23:35 2010
@@ -0,0 +1,11 @@
+/myfaces/trinidad/branches/1.2.11.3-branch:770843-770856,771372,785365
+/myfaces/trinidad/branches/1.2.11.4-branch:794062,794792,798299
+/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
+/myfaces/trinidad/branches/TRINIDAD-1402:745675
+/myfaces/trinidad/branches/ar-1715:908782
+/myfaces/trinidad/branches/ar_clientBehaviors:881469-891464
+/myfaces/trinidad/branches/jsf2_ajax.3:926625-936022
+/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
+/myfaces/trinidad/branches/trinidad-1.2.x:923447,923460,929241
+/myfaces/trinidad/branches/trinidad-2.0.x:823098-895949
+/myfaces/trinidad/trunk:819601,819622,834147,886881,888973,893043,896231-908455,908699-921461
Modified: myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java?rev=1030107&r1=1030088&r2=1030107&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java Tue Nov 2 16:23:35 2010
@@ -35,6 +35,20 @@ import org.apache.myfaces.trinidad.model
public class UIBean
{
+
+public String formatText = "<span style=\"font-weight: bold;\">boldyyyyyyyyy</span><br/><span style=\"font-style:\n" +
+ "italic;\">italic</span><br/><span style=\"text-decoration:\n" +
+ "underline;\">underline</span><br/>";
+ public String getFormatText()
+ {
+ return formatText;
+ }
+
+ public void setFormatText(String formatText)
+ {
+ this.formatText = formatText;
+ }
+
public UIBean()
{
}
Modified: myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/webapp/components/outputFormatted.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/webapp/components/outputFormatted.jspx?rev=1030107&r1=1030088&r2=1030107&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/webapp/components/outputFormatted.jspx (original)
+++ myfaces/trinidad/branches/trinidad-2.0.4.1/trinidad-examples/trinidad-demo/src/main/webapp/components/outputFormatted.jspx Tue Nov 2 16:23:35 2010
@@ -26,21 +26,7 @@
<f:view>
<tr:document title="OutputFormatted Demo">
<tr:form>
- <tr:panelGroupLayout layout="vertical">
- <f:facet name="separator">
- <tr:separator/>
- </f:facet>
- <tr:panelGroupLayout layout="horizontal">
- <tr:commandLink immediate="true" text="Component Guide" action="guide"/>
- <tr:spacer width="10"/>
- <tr:goLink destination="http://myfaces.apache.org/trinidad/trinidad-api/tagdoc/tr_outputFormatted.html"
- text="Tag Documentation"/>
- </tr:panelGroupLayout>
- <tr:outputFormatted styleUsage="instruction" value="<b>outputFormatted</b>"/>
- <tr:outputFormatted styleUsage="instruction" binding="#{editor.component}"
- value="Text that is <b>bold</b> and <i>italicized</i>"/>
- <jsp:directive.include file="editor.jspf"/>
- </tr:panelGroupLayout>
+ <tr:outputFormatted value="#{ui.formatText}"/>
</tr:form>
</tr:document>
</f:view>