You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/01/29 14:12:22 UTC
svn commit: r904484 - in
/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp:
./ WEB-INF/ WEB-INF/java/org/apache/myfaces/javaloader/blog/ resources/img/
resources/styles/
Author: werpu
Date: Fri Jan 29 13:12:21 2010
New Revision: 904484
URL: http://svn.apache.org/viewvc?rev=904484&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-55
Added:
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/gradient2.png
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/license.txt (with props)
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/sig07-009_mac.jpg
Modified:
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/DependencyTestAnnotation.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/javablog.xhtml
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/template.xhtml
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java?rev=904484&r1=904483&r2=904484&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java Fri Jan 29 13:12:21 2010
@@ -23,13 +23,15 @@
import java.lang.Deprecated;
+import org.apache.myfaces.javaloader.blog.DependencyTestAnnotation;
import static org.apache.myfaces.javaloader.blog.JSFUtil.*;
/**
* @author werpu2
* @date: 01.09.2009
*/
-@DependencyTestAnnoation
+@DependencyTestAnnotation
+
public class Blog {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java?rev=904484&r1=904483&r2=904484&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java Fri Jan 29 13:12:21 2010
@@ -45,7 +45,7 @@
*/
List<Object> blogEntries = Collections.synchronizedList(new LinkedList<Object>());
- @DependencyTestAnnoation
+ @DependencyTestAnnotation
public void addEntry2(BlogEntry entry) {
if (entry != null) {
blogEntries.add(entry);
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/DependencyTestAnnotation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/DependencyTestAnnotation.java?rev=904484&r1=904483&r2=904484&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/DependencyTestAnnotation.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/DependencyTestAnnotation.java Fri Jan 29 13:12:21 2010
@@ -20,6 +20,7 @@
import java.lang.annotation.*;
+
@Retention(RetentionPolicy.RUNTIME)
public @interface DependencyTestAnnotation {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml?rev=904484&r1=904483&r2=904484&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml Fri Jan 29 13:12:21 2010
@@ -45,7 +45,7 @@
<param-value>org.apache.myfaces.scripting.servlet.StartupServletContextPluginChainLoader</param-value>
</context-param>
- <!--
+
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
of the deployment dir
@@ -83,7 +83,7 @@
<param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
</context-param>
- -->
+
<!--
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/javablog.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/javablog.xhtml?rev=904484&r1=904483&r2=904484&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/javablog.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/javablog.xhtml Fri Jan 29 13:12:21 2010
@@ -1,46 +1,60 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns = "http://www.w3.org/1999/xhtml" xmlns:ui = "http://java.sun.com/jsf/facelets"
- xmlns:f = "http://java.sun.com/jsf/core" xmlns:h = "http://java.sun.com/jsf/html"
- xmlns:t = "http://myfaces.apache.org/tomahawk" xmlns:grv = "http://myfaces.apache.org/groovy">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:t="http://myfaces.apache.org/tomahawk" xmlns:grv="http://myfaces.apache.org/groovy">
<head>
<title>Hello World</title>
</head>
<body>
-<ui:composition template = "/template.xhtml">
+<ui:composition template="/template.xhtml">
- <ui:define name = "body">
- xxxx
- <h:form id = "form">
- <h:panelGrid id = "grid" columns = "1">
- <h:outputText id = "title1" styleClass = "title" value = "#{javaBlogView.title}" />
- <h:outputText id = "title11" styleClass = "title1" value = "#{javaBlogView.title1}" />
- <!--
- entry.firstName = firstName
- entry.lastName = lastName
- entry.topic = topic
- entry.content = content
- -->
- <h:outputText value = "First Name" /><h:inputText value = "#{javaBlogView.firstName}" />
- <h:outputText value = "Last Name" /><h:inputText value = "#{javaBlogView.lastName}" />
- <h:outputText value = "Topic of entry" /><h:inputText value = "#{javaBlogView.topic}" />
- <h:outputText value = "Content" /><h:inputText value = "#{javaBlogView.content}" />
+ <ui:define name="body">
-
- <h:outputText value="#{javaBlogView.title3}" />
-
- <h:outputText value="#{javaBlogView.title4}" />
-
-
- <h:commandLink action = "#{javaBlogView.addEntry2}" value = "Add Blog" />
- </h:panelGrid>
- <h:panelGrid columns = "1">
- <h:outputText value = "Blog Entries" />
- <t:dataList value = "#{javaBlogService.blogEntries}" var = "item">
-
- <h:outputText value = "#{item.topic}" />
- <h:outputText value = "#{item.content}" /><br />
- </t:dataList>
+ <h1>
+ <ui:insert name="title">Ext-Scripting Javablog Example</ui:insert>
+ </h1>
+
+ <h:form id="form">
+
+ <div class="left" style="margin-top: 3px;">
+ <h:panelGrid id="grid" columns="1" styleClass="stdBox">
+ <h:outputText id="title1" styleClass="title" value="#{javaBlogView.title}"/>
+ <h:outputText id="title11" styleClass="title1" value="#{javaBlogView.title1}"/>
+
+ <hr/>
+
+ <h:panelGrid columns="2" columnClasses="label, input">
+ <h:outputText value="First Name"/>
+ <h:inputText value="#{javaBlogView.firstName}"/>
+ <h:outputText value="Last Name"/>
+ <h:inputText value="#{javaBlogView.lastName}"/>
+ <h:outputText value="Topic of entry"/>
+ <h:inputText value="#{javaBlogView.topic}"/>
+ </h:panelGrid>
+ <h:panelGrid columns="2" columnClasses="label, input">
+ <h:outputText styleClass="label" value="Content"/>
+ <h:inputTextarea value="#{javaBlogView.content}"/>
+ </h:panelGrid>
+ <hr/>
+ <h:commandButton styleClass="btn" action="#{javaBlogView.addEntry2}" value="Add Blog Entry"/>
+ </h:panelGrid>
+ </div>
+
+ <h:panelGrid columns="1" styleClass="right">
+ <ui:repeat value="#{javaBlogService.blogEntries}" var="item">
+ <h:panelGrid columns="1" styleClass="messageBox">
+ <h:panelGroup styleClass="topic">
+ <h:outputLabel styleClass="label" value="Topic"/>
+ <h:outputText value="#{item.topic}"/>
+ </h:panelGroup>
+ <h:panelGroup styleClass="content">
+ <h:outputLabel styleClass="label" value="Content"/>
+ <h:outputFormat escape="false" value="#{item.content}"/>
+ </h:panelGroup>
+ </h:panelGrid>
+ <br/>
+ </ui:repeat>
</h:panelGrid>
</h:form>
Added: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/gradient2.png
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/gradient2.png?rev=904484&view=auto
==============================================================================
Files myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/gradient2.png (added) and myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/gradient2.png Fri Jan 29 13:12:21 2010 differ
Added: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/license.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/license.txt?rev=904484&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/license.txt (added)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/license.txt Fri Jan 29 13:12:21 2010
@@ -0,0 +1,6 @@
+sig07-009_mac.jpg is from the nasa public domain image archive.
+
+http://www.nasaimages.org/luna/servlet/detail/nasaNAS~12~12~64153~168545:Multiwavelength-M81?qvq=q:galaxy+or+constellation+or+hubble+or+spitzer;lc:NVA2~35~35,NVA2~32~32,NVA2~31~31,NVA2~19~19,nasaNAS~16~16,nasaNAS~2~2,NSVS~3~3,nasaNAS~9~9,NVA2~4~4,NVA2~15~15,NVA2~24~24,NVA2~29~29,nasaNAS~12~12,nasaNAS~8~8,nasaNAS~7~7,NVA2~22~22,nasaNAS~10~10,NVA2~13~13,NVA2~18~18,NVA2~27~27,NVA2~9~9,NVA2~1~1,nasaNAS~6~6,NVA2~25~25,NVA2~20~20,nasaNAS~13~13,nasaNAS~22~22,NVA2~16~16,NVA2~8~8,nasaNAS~5~5,nasaNAS~4~4,NVA2~28~28,NVA2~14~14,nasaNAS~20~20,NVA2~17~17,NVA2~30~30,NVA2~21~21,NVA2~26~26,NVA2~23~23,NVA2~44~44,NVA2~42~42,NVA2~38~38,NVA2~45~45,NVA2~39~39,NVA2~43~43,NVA2~41~41,NVA2~37~37,NVA2~49~49,NVA2~53~53,NVA2~51~51,NVA2~56~56,NVA2~47~47,NVA2~54~54,NVA2~33~33,NVA2~36~36,NVA2~34~34,NVA2~57~57,NVA2~52~52,NVA2~48~48,NVA2~50~50,NVA2~46~46,NVA2~55~55&mi=0&trs=8854
+
+license
+http://www.nasa.gov/audience/formedia/features/MP_Photo_Guidelines.html
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/license.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/license.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/sig07-009_mac.jpg
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/sig07-009_mac.jpg?rev=904484&view=auto
==============================================================================
Files myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/sig07-009_mac.jpg (added) and myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/img/sig07-009_mac.jpg Fri Jan 29 13:12:21 2010 differ
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css?rev=904484&r1=904483&r2=904484&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css Fri Jan 29 13:12:21 2010
@@ -1,21 +1,61 @@
body {
- background-image:url("../img/gradient1.jpg");
- background-repeat:repeat-x;
+ background-color: black;
+}
+
+div.centerDiv {
+ margin-left: auto;
+ margin-right: auto;
+ width: 900px;
+}
+
+div.centerDiv form {
+ position: relative;
+}
+
+h1 {
+ color: #9999ff;
+ text-align: center;
+}
+
+div#backGroundFloat {
+ position: fixed;
+ z-index: -1;
+ background-color: black;
+ left: 0px;
+ top: 0px;
+ width: 100%;
+ height: 100%;
+ background-image: url("../img/sig07-009_mac.jpg");
+ background-repeat: no-repeat;
+ overflow: hidden;
}
#hello {
background-color: yellow;
}
+.stdBox, .messageBox {
+ display: block;
+ width: 400px;
+ border: 1px solid white;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ padding: 5px;
+ border-radius: 8px;
+ background-repeat: repeat-x;
+ margin-bottom: 5px;
+ min-height: 120px;
+
+}
+
.stdBox {
- display: table;
background-color: white;
- border: 1px solid black;
- -moz-border-radius: 5px;
- padding: 5px;
- border-radius: 5px;
+ background-image: url("../img/gradient1.jpg");
}
+.messageBox {
+ background-image: url("../img/gradient2.png");
+}
/*==================================================
Basic CSS information for our compiler
@@ -40,18 +80,24 @@
}
div.errorBox {
- width: 800px;
+ width: 820px;
heigh: 200px;
-
display: block;
overflow: auto;
- border: 1px solid black;
- background-color: #ffffcc;
+ border: 1px solid white;
+ color:#dedddd;
+ opacity: 0.92;
+
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ border-radius: 5px;
- -moz-border-radius:5px;
- border-radius:5px;
padding: 5px;
+ margin-left: 10px;
+
+ background-image: url("../resources/img/gradient2.png");
+ background-repeat:repeat-x;
}
div.errorBox .line {
@@ -59,12 +105,15 @@
width: 780px;
border: 1px dashed black;
- background-color:#ccccff;
+ background-color: #ccccff;
+ color:black;
padding: 5px;
margin-top: 10px;
- margin-left:auto;
+ margin-left: auto;
margin-right: auto;
-moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+
border-radius: 5px;
}
@@ -87,3 +136,39 @@
display: block;
float: left;
}
+
+.left {
+ position: absolute;
+ left: 10px;
+ top: 20px;
+}
+
+.right {
+ position: absolute;
+ left: 430px;
+ top: 20px;
+}
+
+.label {
+ font-weight: bold;
+ color: black;
+ width: 150px;
+ padding-right: 5px;
+}
+
+.input input, .input textArea {
+ width: 200px;
+}
+
+input, textArea {
+ border: 1px solid black;
+}
+
+input:focus, textArea:focus {
+ background-color: yellow;
+}
+
+input.btn {
+ width: 100px;
+ margin-left: 263px;
+}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/template.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/template.xhtml?rev=904484&r1=904483&r2=904484&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/template.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/template.xhtml Fri Jan 29 13:12:21 2010
@@ -1,26 +1,36 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns = "http://www.w3.org/1999/xhtml"
- xmlns:ui = "http://java.sun.com/jsf/facelets"
- xmlns:f = "http://java.sun.com/jsf/core"
- xmlns:h = "http://java.sun.com/jsf/html"
- xmlns:exs = "http://myfaces.apache.org/ext-scripting" >
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:exs="http://myfaces.apache.org/ext-scripting"
+ xmlns:h="http://java.sun.com/jsf/html">
<head>
-<meta http-equiv = "Content-Type" content = "text/html; charset=iso-8859-1" />
-<title>Myfaces Example Facelets</title>
-<link type="text/css" rel="stylesheet" href="./resources/styles/main.css"/>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+ <title>Myfaces Example Facelets</title>
+
+ <link type="text/css" rel="stylesheet" href="./resources/styles/main.css"/>
+
+
</head>
<body>
-<h:panelGroup>
- <h3>
- <h:outputFormat value="Compiler Output" escape="false"/>
- </h3>
- <exs:compilerOutput errorsLabel="Errors:" warningsLabel="Warnings:" scriptingLanguage=""/>
-</h:panelGroup>
+<div id="backGroundFloat">
+
+</div>
+<div class="centerDiv">
+ <h:panelGroup>
+ <h3>
+ <h:outputFormat value="Compiler Output" escape="false"/>
+ </h3>
+ <exs:compilerOutput errorsLabel="Errors:" warningsLabel="Warnings:" scriptingLanguage=""/>
+ </h:panelGroup>
+
+ <p>
+ <ui:insert name="body">Hello World Example!</ui:insert>
+ </p>
+</div>
-<h1><ui:insert name = "title">Myfaces Example Facelets</ui:insert></h1>
-<p><ui:insert name = "body">Hello World Example!</ui:insert></p>
</body>
</html>