[jboss-cvs] JBossBlog SVN: r214 - in trunk: resources and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 12 11:52:29 EST 2008
Author: adamw
Date: 2008-02-12 11:52:28 -0500 (Tue, 12 Feb 2008)
New Revision: 214
Added:
trunk/build-design.properties
trunk/resources/META-INF/persistence-design.xml
trunk/resources/WEB-INF/web-design.xml
trunk/resources/blog-design-ds.xml
Removed:
trunk/resources/import-dev.sql
trunk/resources/import-prod.sql
trunk/resources/import-test.sql
trunk/view/stylesheet/theme.css
Modified:
trunk/build.properties
trunk/build.xml
trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java
trunk/view/home.xhtml
trunk/view/layout/template.xhtml
trunk/view/stylesheet/blog.css
Log:
Copied: trunk/build-design.properties (from rev 189, trunk/build-dev.properties)
===================================================================
--- trunk/build-design.properties (rev 0)
+++ trunk/build-design.properties 2008-02-12 16:52:28 UTC (rev 214)
@@ -0,0 +1 @@
+debug=true
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2008-02-12 16:49:52 UTC (rev 213)
+++ trunk/build.properties 2008-02-12 16:52:28 UTC (rev 214)
@@ -1 +1,3 @@
-jboss.home = /Users/adamwarski/jboss/jboss-4.2
\ No newline at end of file
+jboss.home = /Users/adamwarski/jboss/jboss-4.2
+#profile = design
+#jboss.home = /Users/adamwarski/jboss/jboss-design
\ No newline at end of file
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-02-12 16:49:52 UTC (rev 213)
+++ trunk/build.xml 2008-02-12 16:52:28 UTC (rev 214)
@@ -6,7 +6,7 @@
<property file="${basedir}/build.properties" />
<property name="profile" value="dev" />
- <property file="build-${profile}.properties" />
+ <property file="${basedir}/build-${profile}.properties" />
<!-- set global properties for this build -->
<property name="project.name" value="blog"/>
@@ -103,9 +103,6 @@
<copy tofile="${jar.impl.dir}/META-INF/persistence.xml"
file="${basedir}/resources/META-INF/persistence-${profile}.xml"
overwrite="true"/>
- <copy tofile="${jar.impl.dir}/import.sql"
- file="${basedir}/resources/import-${profile}.sql"
- overwrite="true"/>
</target>
<target name="war" depends="compile"
@@ -232,7 +229,7 @@
</target>
<target name="prepare-as-lib">
- <copy todir="${deploy.lib.dir}">
+ <copy todir="${deploy.lib.dir}" overwrite="true">
<fileset dir="${basedir}/lib">
<include name="ehcache*.jar" />
<include name="jdom*.jar" />
Copied: trunk/resources/META-INF/persistence-design.xml (from rev 202, trunk/resources/META-INF/persistence-dev.xml)
===================================================================
--- trunk/resources/META-INF/persistence-design.xml (rev 0)
+++ trunk/resources/META-INF/persistence-design.xml 2008-02-12 16:52:28 UTC (rev 214)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Persistence deployment descriptor for dev profile -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+
+ <persistence-unit name="blog">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source>java:/blogDatasource</jta-data-source>
+ <class>org.jboss.blog.model.Group</class>
+ <class>org.jboss.blog.model.feed.Feed</class>
+ <class>org.jboss.blog.model.feed.RemoteFeed</class>
+ <class>org.jboss.blog.model.feed.AggregatedFeed</class>
+ <class>org.jboss.blog.model.Category</class>
+ <class>org.jboss.blog.model.Post</class>
+ <class>org.jboss.blog.model.Enclosure</class>
+ <class>org.jboss.blog.model.Image</class>
+ <class>org.jboss.blog.model.Template</class>
+ <properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
+ <property name="hibernate.show_sql" value="false"/>
+ <property name="hibernate.format_sql" value="false"/>
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/blogEntityManagerFactory"/>
+ <property name="hibernate.connection.useUnicode" value="true" />
+ <property name="hibernate.connection.characterEncoding" value="UTF-8" />
+
+ <property name="hibernate.jdbc.batch_size" value="0" />
+
+ <property name="hibernate.cache.use_query_cache" value="true"/>
+ <property name="hibernate.cache.use_second_level_cache" value="true"/>
+ <property name="hibernate.cache.provider_class" value="org.hibernate.cache.EhCacheProvider" />
+ <property name="hibernate.cache.provider_configuration_file_resource_path" value="blog-ehcache.xml" />
+
+ <!-- TODO Search -->
+ <!-- use a file system based index -->
+ <property name="hibernate.search.default.directory_provider"
+ value="org.hibernate.search.store.FSDirectoryProvider"/>
+ <!-- directory where the indexes will be stored -->
+ <property name="hibernate.search.default.indexBase"
+ value="/Users/adamwarski/jboss/blog-index"/>
+
+ <property name="hibernate.ejb.event.post-insert"
+ value="org.hibernate.search.event.FullTextIndexEventListener"/>
+ <property name="hibernate.ejb.event.post-update"
+ value="org.hibernate.search.event.FullTextIndexEventListener"/>
+ <property name="hibernate.ejb.event.post-delete"
+ value="org.hibernate.search.event.FullTextIndexEventListener"/>
+ </properties>
+ </persistence-unit>
+
+</persistence>
Copied: trunk/resources/WEB-INF/web-design.xml (from rev 189, trunk/resources/WEB-INF/web-dev.xml)
===================================================================
--- trunk/resources/WEB-INF/web-design.xml (rev 0)
+++ trunk/resources/WEB-INF/web-design.xml 2008-02-12 16:52:28 UTC (rev 214)
@@ -0,0 +1,142 @@
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <!-- Ajax4jsf -->
+
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>blueSky</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>sourceBasePath</param-name>
+ <param-value>/Users/adamwarski/jboss/jboss-design/server/default/deploy/blog.ear/blog.war</param-value>
+ </context-param>
+
+ <!-- URL rewrite -->
+
+ <filter>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+ <init-param>
+ <param-name>logLevel</param-name>
+ <param-value>WARN</param-value>
+ </init-param>
+ <init-param>
+ <param-name>statusEnabled</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <!-- Seam -->
+
+ <listener>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+
+ <filter>
+ <filter-name>Seam Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Seam Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <!-- Resources filter -->
+
+ <!--
+ <filter>
+ <filter-name>Resources Filter</filter-name>
+ <filter-class>org.jboss.shotoku.web.ResourcesFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Resources Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+ -->
+
+ <servlet>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <url-pattern>/seam/resource/*</url-pattern>
+ </servlet-mapping>
+ <!-- Facelets development mode (disable in production) -->
+
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.REFRESH_PERIOD</param-name>
+ <param-value>0</param-value>
+ </context-param>
+
+ <!--
+ <context-param>
+ <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ <param-value>org.jboss.shotoku.web.FilesystemResourceResolver</param-value>
+ </context-param>
+ -->
+
+ <!-- JSF -->
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.seam</url-pattern>
+ </servlet-mapping>
+
+ <security-constraint>
+ <display-name>Restrict raw XHTML Documents</display-name>
+ <web-resource-collection>
+ <web-resource-name>XHTML</web-resource-name>
+ <url-pattern>*.xhtml</url-pattern>
+ </web-resource-collection>
+ <auth-constraint/>
+ </security-constraint>
+
+ <!-- Feeds servlet -->
+
+ <servlet>
+ <servlet-name>Feeds Servlet</servlet-name>
+ <servlet-class>org.jboss.blog.servlet.FeedsServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Feeds Servlet</servlet-name>
+ <url-pattern>/feeds.seam</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: trunk/resources/blog-design-ds.xml (from rev 189, trunk/resources/blog-dev-ds.xml)
===================================================================
--- trunk/resources/blog-design-ds.xml (rev 0)
+++ trunk/resources/blog-design-ds.xml 2008-02-12 16:52:28 UTC (rev 214)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE datasources
+ PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>blogDatasource</jndi-name>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ </local-tx-datasource>
+
+</datasources>
+
Deleted: trunk/resources/import-dev.sql
===================================================================
Deleted: trunk/resources/import-prod.sql
===================================================================
Deleted: trunk/resources/import-test.sql
===================================================================
Modified: trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java 2008-02-12 16:49:52 UTC (rev 213)
+++ trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java 2008-02-12 16:52:28 UTC (rev 214)
@@ -8,10 +8,12 @@
import org.jboss.blog.service.GroupsService;
import org.jboss.blog.tools.StringTools;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import javax.faces.application.FacesMessage;
import java.util.List;
import java.io.Serializable;
@@ -86,4 +88,22 @@
}
}
}
+
+ @In
+ private FacesMessages facesMessages;
+
+ // TODO: remove
+ public void showInfos() {
+ facesMessages.add(FacesMessage.SEVERITY_INFO, "This is message 1.");
+ facesMessages.add(FacesMessage.SEVERITY_INFO, "That's a info message that is longer, saying something quite " +
+ "important to the user.");
+ facesMessages.add(FacesMessage.SEVERITY_INFO, "And finally the last message, number 3.");
+ }
+
+ // TODO: remove
+ public void showWarns() {
+ facesMessages.add(FacesMessage.SEVERITY_WARN, "This is message 1.");
+ facesMessages.add(FacesMessage.SEVERITY_WARN, "That's a warning message that is longer, saying that the user " +
+ "has followed a wrong path in his life (2).");
+ }
}
Modified: trunk/view/home.xhtml
===================================================================
--- trunk/view/home.xhtml 2008-02-12 16:49:52 UTC (rev 213)
+++ trunk/view/home.xhtml 2008-02-12 16:52:28 UTC (rev 214)
@@ -23,6 +23,12 @@
<h3 class="head3">Select a feed to view:</h3>
+ <p>
+ For James and Cheyenne only: <br />
+ <s:link action="#{feedView.showInfos}" value="Show 3 information messages!" /> <br />
+ <s:link action="#{feedView.showWarns}" value="Show 2 warning messages!" />
+ </p>
+
<table cellspacing="5" class="deftable" width="75%">
<ui:repeat var="group" value="#{feedsService.allGroups}">
<s:fragment rendered="#{groupsService.acceptedFeeds(group).size() > 0}">
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-02-12 16:49:52 UTC (rev 213)
+++ trunk/view/layout/template.xhtml 2008-02-12 16:52:28 UTC (rev 214)
@@ -25,8 +25,11 @@
</div>
<div id="orghomemaximized">
<div>
- <h:messages globalOnly="true"
- style="margin-bottom:12px; padding:15px; background-color:#fef9e6; border: 1px solid #f9ba82;"/>
+ <h:messages globalOnly="true"
+ infoClass="messages_info"
+ warnClass="messages_warn"
+ styleClass="messages"
+ />
</div>
<ui:insert name="body"/>
Modified: trunk/view/stylesheet/blog.css
===================================================================
--- trunk/view/stylesheet/blog.css 2008-02-12 16:49:52 UTC (rev 213)
+++ trunk/view/stylesheet/blog.css 2008-02-12 16:52:28 UTC (rev 214)
@@ -176,3 +176,21 @@
width: 400px;
margin-bottom: 8px;
}
+
+.messages_info {
+ margin-bottom:12px;
+ padding:15px;
+ background-color:#fef9e6;
+ border: 1px solid #f9ba82;
+}
+
+.messages_warn {
+ margin-bottom:12px;
+ padding:15px;
+ background-color: red;
+ border: 1px solid #f9ba82;
+}
+
+.messages {
+
+}
Deleted: trunk/view/stylesheet/theme.css
===================================================================
--- trunk/view/stylesheet/theme.css 2008-02-12 16:49:52 UTC (rev 213)
+++ trunk/view/stylesheet/theme.css 2008-02-12 16:52:28 UTC (rev 214)
@@ -1,293 +0,0 @@
-a:active, a:link, a:visited {
- color: #0D5798;
-}
-a:hover {
- color: #8CAFCD;
-}
-
-input, textarea {
- border: 1px solid #BBBBBB;
- font-size: 10px;
- background: #F0F8FF;
- color: black;
-}
-
-input[type='submit'], input[type='button'] {
- background: #4477AA;
- color: white;
- margin: 5px;
- border-color: gray;
-}
-
-input[type='button'][disabled='disabled'] {
- color: gray;
-}
-
-.tableControl, .actionButtons {
- width: 100%;
-}
-
-.tableControl {
- text-align: right;
-}
-
-.footer {
- text-align: center;
- font-size: 10px;
-}
-
-.rich-table {
- width:100%;
-}
-
-h1 {
- font-family: Arial,sans-serif;
- color: #578BB8;
- font-size: 1.6em;
- margin-top: 0;
-}
-
-body {
- margin: 0px;
- font-family: Arial,sans-serif;
- color: #616161;
-}
-
-.body {
- padding: 30px;
-}
-
-.columnHeader:hover
-{
- color: #FF6600;
-}
-
-.message {
- border: 1px solid #FFCC00;
- padding: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- background-color: #F0F8FF;
- font-size: 12px;
-}
-
-.name {
- vertical-align: top;
- font-weight: bold;
- width: 115px;
- float: left;
- padding: 5px;
- margin-top: 3px;
- clear: left;
-}
-.value {
- float: left;
- padding: 5px;
-}
-.error {
- margin-left: 20px;
- margin-top: 5px;
- float: left;
- padding: 5px;
- border: 1px solid red;
-}
-
-.errors {
- color: red;
-}
-.errors input {
- border: 1px solid red;
-}
-.errors textarea {
- border: 1px solid red;
-}
-.required {
- color: red;
- padding-left: 2px;
-}
-
-/* date picker style */
-div.seam-date
-{
- margin-top: 5px;
- border: 1px solid #AAAAAA;
- background-color: #FFFFFF;
- color: #505050;
- font-family: Tahoma, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-table.seam-date td {
- font-family: Tahoma, Arial, Helvetica, sans-serif;
- font-weight: 12px;
-}
-
-.seam-date-monthNames
-{
- width: 70px;
- border: 1px solid #dddddd;
- border-right: 3px solid #444444;
- border-bottom: 3px solid #444444;
- background-color: #ffffff;
- font-size: 12px;
- cursor: pointer;
- font-family: Tahoma, Arial, Helvetica, sans-serif;
- font-weight: normal;
-}
-
-a.seam-date-monthNameLink, a.seam-date-monthNameLink:visited
-{
- text-align: center;
- display: block;
- color: #555555;
-}
-
-a.seam-date-monthNameLink:hover
-{
- background-color: #CCCCCC;
- color: red;
-}
-
-.seam-date-years
-{
- height: 10em;
- overflow: auto;
- width: 60px;
- border: 1px solid #dddddd;
- border-right: 3px solid #444444;
- border-bottom: 3px solid #444444;
- background-color: #ffffff;
- font-size: 12px;
- cursor: pointer;
- font-family: Tahoma, Arial, Helvetica, sans-serif;
- font-weight: normal;
-}
-
-a.seam-date-yearLink, a.seam-date-yearLink:visited
-{
- text-align: center;
- display: block;
- color: #555555;
-}
-
-a.seam-date-yearLink:hover
-{
- background-color: #CCCCCC;
- color: red;
-}
-
-tr.seam-date-header
-{
- padding: 2px 0px 2px 0px;
-}
-
-td.seam-date-header
-{
- padding: 0px 8px 0px 8px;
- text-align: center;
- color: gray;
- font-family: Tahoma, Arial, Helvetica, sans-serif;
- font-weight: bold;
- font-size: 12px;
-}
-
-td.seam-date-header-prevMonth
-{
- background-image: url("../img/cal-prev.png");
- background-repeat: no-repeat;
- background-position: center;
- padding: 0px 2px 0px 2px;
- width: 17px;
- height: 16px;
- margin-left: 2px;
-}
-
-td.seam-date-header-nextMonth
-{
- background-image: url("../img/cal-next.png");
- background-repeat: no-repeat;
- background-position: center;
- padding: 0px 2px 0px 2px;
- width: 17px;
- height: 16px;
- margin-right: 2px;
-}
-
-tr.seam-date-headerDays
-{
- color: white;
- font-weight: normal;
-}
-
-tr.seam-date-headerDays > td
-{
- background-color: #CCCCCC;
- border: 1px solid #AAAAAA;
- color: white;
- text-align: center;
- width: 26px;
-}
-
-tr.seam-date-footer
-{
- background-color: white;
- color: #505050;
- font-weight: bold;
-}
-
-tr.seam-date-footer > td
-{
- text-align: center;
-}
-
-td.seam-date-inMonth
-{
- background-color: white;
- color: black;
- font-weight: normal;
- cursor: pointer;
- border: 1px solid #ece9d8;
-}
-
-td.seam-date-outMonth
-{
- background-color: white;
- color: #999999;
- font-weight: normal;
- cursor: pointer;
- border: 1px solid #ece9d8;
-}
-
-td.seam-date-selected
-{
- background-color: #CCCCCC;
- border: 1px solid #AAAAAA;
- color: black;
- font-weight: normal;
-}
-
-td.seam-date-dayOff-inMonth
-{
- background-color: #efefef;
- color: black;
- font-weight: normal;
- cursor: pointer;
- border: 1px solid #ece9d8;
-}
-
-td.seam-date-dayOff-outMonth
-{
- background-color: #efefef;
- color: #999999;
- font-weight: normal;
- cursor: pointer;
- border: 1px solid #ece9d8;
-}
-
-td.seam-date-hover
-{
- background-color: #CCCCCC;
- border: 1px solid #AAAAAA;
- cursor: pointer;
- color: red;
-}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list