[jboss-cvs] JBossAS SVN: r97048 - in projects/snowdrop/trunk/documentation/samples/sportsclub: sportsclub-hibernate-dao/src/main/resources and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 26 16:44:09 EST 2009
Author: marius.bogoevici
Date: 2009-11-26 16:44:08 -0500 (Thu, 26 Nov 2009)
New Revision: 97048
Modified:
projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/context.properties
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/infrastructure.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
Log:
other fixes
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml 2009-11-26 19:40:25 UTC (rev 97047)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml 2009-11-26 21:44:08 UTC (rev 97048)
@@ -1,7 +1,7 @@
<datasources>
<local-tx-datasource>
- <jndi-name>StayFitDS</jndi-name>
+ <jndi-name>SportsClubDS</jndi-name>
<connection-url>jdbc:hsqldb:hsql://localhost/sportsclubdb</connection-url>
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/context.properties
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/context.properties 2009-11-26 19:40:25 UTC (rev 97047)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/context.properties 2009-11-26 21:44:08 UTC (rev 97048)
@@ -1 +1,2 @@
hibernate.properties.location=classpath:/hibernate/hibernate.properties
+datasource.jndi.name=SportsClubDS
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/infrastructure.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/infrastructure.xml 2009-11-26 19:40:25 UTC (rev 97047)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/infrastructure.xml 2009-11-26 21:44:08 UTC (rev 97048)
@@ -18,7 +18,7 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <jee:jndi-lookup jndi-name="java:/StayFitDS" id="stayFitDS"/>
+ <jee:jndi-lookup jndi-name="${datasource.jndi.name}" id="stayFitDS"/>
<tx:jta-transaction-manager/>
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml 2009-11-26 19:40:25 UTC (rev 97047)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml 2009-11-26 21:44:08 UTC (rev 97048)
@@ -1,23 +1,27 @@
<!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:c="http://java.sun.com/jstl/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:rich="http://richfaces.org/rich"
- xmlns:a4j="http://richfaces.org/a4j">
-
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<f:view>
-<head>
- <title>Sports Club Spring Application Demo</title>
-</head>
-<body class="main-body" style="position: relative;">
-<div style="position: relative; height: auto; overflow: hidden; min-height: 100%; zoom: 1;" class="main-panel">
- <ui:insert name="content"/>
-</div>
+ <head>
+ <title>Sports Club Subscriptions Spring Application Demo</title>
+ </head>
-</body>
+
+ <body class="main-body" style="position: relative;">
+
+ <div style="position: relative; height: auto; overflow: hidden; min-height: 100%; zoom: 1;" class="main-panel">
+ <ui:insert name="content"/>
+ </div>
+
+ </body>
</f:view>
</html>
\ No newline at end of file
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2009-11-26 19:40:25 UTC (rev 97047)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2009-11-26 21:44:08 UTC (rev 97048)
@@ -1,14 +1,18 @@
<ui:composition 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:rich="http://richfaces.org/rich"
- xmlns:a4j="http://richfaces.org/a4j"
- template="layout/template.xhtml">
- <ui:define name="content">
- <h:form>
- <h:inputText value="#{accountManager.name}" label="Search name"/>
- <h:commandButton action="#{accountManager.searchAccounts}" />
- </h:form>
- </ui:define>
+ 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:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j"
+ template="layout/template.xhtml">
+ <ui:define name="content">
+ <rich:panel>
+ <f:facet name="Search for accounts">
+ <h:form>
+ <h:inputText value="#{accountManager.name}" label="Search name"/>
+ <h:commandButton action="#{accountManager.searchAccounts}"/>
+ </h:form>
+ </f:facet>
+ </rich:panel>
+ </ui:define>
</ui:composition>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list