Menu
▾
▴
andromdaplugins-cvs — Each commit to the project CVS repository posts a message to this mailing list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(178) |
Feb
(169) |
Mar
(286) |
Apr
(117) |
May
(98) |
Jun
(68) |
Jul
(63) |
Aug
(121) |
Sep
(88) |
Oct
(124) |
Nov
(2) |
Dec
(111) |
| 2007 |
Jan
(224) |
Feb
(69) |
Mar
(10) |
Apr
(72) |
May
(7) |
Jun
(21) |
Jul
(33) |
Aug
(35) |
Sep
(12) |
Oct
(22) |
Nov
(5) |
Dec
(6) |
| 2008 |
Jan
(2) |
Feb
(10) |
Mar
(39) |
Apr
(58) |
May
(34) |
Jun
(9) |
Jul
(27) |
Aug
(10) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Chad B. <cwb...@us...> - 2007-07-19 18:48:29
|
User: cwbrandon
Date: 07/07/19 11:48:32
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
layout.xhtml.vsl
Log:
change logout and prefs to tabs
Revision Changes Path
1.11 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
Index: layout.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- layout.xhtml.vsl 19 Jul 2007 18:09:31 -0000 1.10
+++ layout.xhtml.vsl 19 Jul 2007 18:48:31 -0000 1.11
@@ -73,7 +73,7 @@
#end
<f:facet name="navigationGlobal">
<tr:form>
- <tr:navigationPane hint="buttons">
+ <tr:navigationPane hint="tabs">
<tr:commandNavigationItem text="#{messages['menu.preferences']}" action="preferences"/>
#if ($stringUtils.isNotBlank($securityRealm))
<tr:commandNavigationItem text="#{messages['logout.action']}" action="logout" rendered="#{!empty remoteUser}"/>
|
|
From: Chad B. <cwb...@us...> - 2007-07-19 18:09:30
|
User: cwbrandon
Date: 07/07/19 11:09:32
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/jsp
view.jsp.vsl login.jsp.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
view-action.xhtml.vsl view-table.xhtml.vsl
view-variables.xhtml.vsl login.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes
footer.jspf.vsl registration-header.jsp.vsl
view-variables.jspf.vsl header.jsp.vsl
view-table.jspf.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
layout.xhtml.vsl return.xhtml.vsl header.xhtml.vsl
footer.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud
view.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views
renderActionFormInput.vm
Log:
change h:outputText to tr:outputText (to keep consistent styling)
Revision Changes Path
1.4 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/view.jsp.vsl
Index: view.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/view.jsp.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- view.jsp.vsl 5 Jul 2007 17:09:21 -0000 1.3
+++ view.jsp.vsl 19 Jul 2007 18:09:27 -0000 1.4
@@ -38,15 +38,15 @@
<h:panelGrid columns="1" style="text-align:right" width="100%">
<h:panelGroup styleClass="userPanel">
<t:graphicImage url="/images/user.gif"/>
- <h:outputText value=" #{remoteUser}"/>
+ <tr:outputText value=" #{remoteUser}"/>
</h:panelGroup>
</h:panelGrid>
- <h:outputText value="~"/>
+ <tr:outputText value="~"/>
<h:panelGrid columns="1" width="100%">
<tr:form>
<tr:menuList>
<tr:commandNavigationItem action="logout" styleClass="userPanel">
- <h:outputText value="#{messages['logout.action']}" style="text-align:left;"/>
+ <tr:outputText value="#{messages['logout.action']}" style="text-align:left;"/>
</tr:commandNavigationItem>
</tr:menuList>
</tr:form>
1.5 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl
Index: login.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- login.jsp.vsl 19 Jul 2007 17:48:22 -0000 1.4
+++ login.jsp.vsl 19 Jul 2007 18:09:29 -0000 1.5
@@ -32,7 +32,7 @@
<jsp:directive.include file="/includes/footer.jspf"/>
</f:facet>
<t:div id="pageContent">
- <h:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
+ <tr:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
<f:verbatim><br/></f:verbatim>
#set ($actionParam = "param.action")
<tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}" styleClass="error"/>
1.4 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl
Index: view-action.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- view-action.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.3
+++ view-action.xhtml.vsl 19 Jul 2007 18:09:30 -0000 1.4
@@ -15,7 +15,7 @@
#else
<a:popup scrolling="yes" height="350px" width="550px" actionOpen="#{${action.controller.beanName}.${action.triggerName}}" center="false">
#end
- <h:outputText value="#{messages['$action.messageKey']}"/>
+ <tr:outputText value="#{messages['$action.messageKey']}"/>
#foreach ($parameter in $action.parameters)
#if (!$parameter.complex || $parameter.type.enumeration)
#renderActionCommandLinkParameter($parameter "")
1.3 +7 -7 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-table.xhtml.vsl
Index: view-table.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-table.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- view-table.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.2
+++ view-table.xhtml.vsl 19 Jul 2007 18:09:30 -0000 1.3
@@ -32,25 +32,25 @@
#end
<tr:column sortable="true" sortProperty="$columnName">
<f:facet name="header">
- <h:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
+ <tr:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
</f:facet>
#set ($tableColumnActions = $table.getTableColumnActions($columnName))
#if (!$tableColumnActions.empty)
#set ($action = $tableColumnActions.iterator().next())
<tr:commandLink action="#{${action.controller.beanName}.${action.triggerName}}">
- <h:outputText value="#{row.${columnName}}">
+ <tr:outputText value="#{row.${columnName}}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
#renderTableCommandLinkParameters()
</tr:commandLink>
#else
- <h:outputText value="#{row.${columnName}}">
+ <tr:outputText value="#{row.${columnName}}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
</tr:column>
#end
@@ -59,11 +59,11 @@
<f:facet name="header">
<t:graphicImage url="/images/space.gif"/>
</f:facet>
- <h:outputText value="#{row}">
+ <tr:outputText value="#{row}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
</tr:column>
#end
## - render any table hyperlink actions
1.3 +12 -12 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-variables.xhtml.vsl
Index: view-variables.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-variables.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- view-variables.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.2
+++ view-variables.xhtml.vsl 19 Jul 2007 18:09:30 -0000 1.3
@@ -9,48 +9,48 @@
#foreach ($variable in $view.variables)
#if (!$variable.table)
#if ($variable.attributes.empty)
- <h:outputText value="#{messages['$variable.messageKey']} :"/>
+ <tr:outputText value="#{messages['$variable.messageKey']} :"/>
#if ($variable.type.collectionType || $variable.type.arrayType)
<c:forEach var="item" items="${${variable.name}}" varStatus="status">
${item} <c:if test="${!status.last}">,</c:if>
</c:forEach>
#else
- <h:outputText value="#{${variable.name}}">
+ <tr:outputText value="#{${variable.name}}">
#if ($variable.type.dateType)
<a:convertDateTime pattern="$variable.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#else
#foreach ($attribute in $variable.attributes)
- <h:outputText value="#{messages['$attribute.messageKey']} :"/>
- <h:outputText value="#{${variable.name}.${attribute.name}}">
+ <tr:outputText value="#{messages['$attribute.messageKey']} :"/>
+ <tr:outputText value="#{${variable.name}.${attribute.name}}">
#if ($attribute.type.dateType)
<a:convertDateTime pattern="$attribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#foreach ($associationEnd in $variable.navigableAssociationEnds)
#if ($associationEnd.many)
<c:forEach var="item" items="${${variable.name}.${associationEnd.name}}">
<c:set var="item" value="${item}" scope="request"/>
#foreach ($itemAttribute in $associationEnd.type.getAttributes(true))
- <h:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
- <h:outputText value="#{item.${itemAttribute.name}}">
+ <tr:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
+ <tr:outputText value="#{item.${itemAttribute.name}}">
#if ($itemAttribute.type.dateType)
<a:convertDateTime pattern="$itemAttribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
</c:forEach>
#else
#foreach ($itemAttribute in $associationEnd.type.getAttributes(true))
- <h:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
- <h:outputText value="#{item.${itemAttribute.name}}">
+ <tr:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
+ <tr:outputText value="#{item.${itemAttribute.name}}">
#if ($itemAttribute.type.dateType)
<a:convertDateTime pattern="$itemAttribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#end
#end
1.8 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl
Index: login.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- login.xhtml.vsl 19 Jul 2007 17:48:22 -0000 1.7
+++ login.xhtml.vsl 19 Jul 2007 18:09:30 -0000 1.8
@@ -24,7 +24,7 @@
</ui:insert>
</f:facet>
<div id="pageContent">
- <h:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
+ <tr:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
<br/>
#set ($actionParam = "param.action")
<tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}" styleClass="error"/>
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/footer.jspf.vsl
Index: footer.jspf.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/footer.jspf.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- footer.jspf.vsl 5 Dec 2006 19:39:15 -0000 1.1
+++ footer.jspf.vsl 19 Jul 2007 18:09:30 -0000 1.2
@@ -1,3 +1,3 @@
<h:panelGroup id="footer">
- <h:outputText value="#{messages['footer.message']}" escape="false"/>
+ <tr:outputText value="#{messages['footer.message']}" escape="false"/>
</h:panelGroup>
\ No newline at end of file
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/registration-header.jsp.vsl
Index: registration-header.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/registration-header.jsp.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- registration-header.jsp.vsl 5 Dec 2006 19:39:15 -0000 1.1
+++ registration-header.jsp.vsl 19 Jul 2007 18:09:30 -0000 1.2
@@ -1,7 +1,7 @@
<%@ include file="/$jspIncludes" %>
<h:panelGrid id="header_group1" columns="1" styleClass="pageHeader" width="100%" >
- <h:outputText value="#{messages['application.name']}" styleClass="applicationTitle"/>
+ <tr:outputText value="#{messages['application.name']}" styleClass="applicationTitle"/>
</h:panelGrid>
1.2 +12 -12 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-variables.jspf.vsl
Index: view-variables.jspf.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-variables.jspf.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-variables.jspf.vsl 5 Dec 2006 19:39:15 -0000 1.1
+++ view-variables.jspf.vsl 19 Jul 2007 18:09:30 -0000 1.2
@@ -2,7 +2,7 @@
#foreach ($variable in $view.variables)
#if (!$variable.table)
#if ($variable.attributes.empty)
- <h:outputText value="#{messages['$variable.messageKey']} :"/>
+ <tr:outputText value="#{messages['$variable.messageKey']} :"/>
#if ($variable.type.collectionType || $variable.type.arrayType)
<f:verbatim>
<c:forEach var="item" items="${${variable.name}}" varStatus="status">
@@ -10,42 +10,42 @@
</c:forEach>
</f:verbatim>
#else
- <h:outputText value="#{${variable.name}}">
+ <tr:outputText value="#{${variable.name}}">
#if ($variable.type.dateType)
<a:convertDateTime pattern="$variable.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#else
#foreach ($attribute in $variable.attributes)
- <h:outputText value="#{messages['$attribute.messageKey']} :"/>
- <h:outputText value="#{${variable.name}.${attribute.name}}">
+ <tr:outputText value="#{messages['$attribute.messageKey']} :"/>
+ <tr:outputText value="#{${variable.name}.${attribute.name}}">
#if ($attribute.type.dateType)
<a:convertDateTime pattern="$attribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#foreach ($associationEnd in $variable.navigableAssociationEnds)
#if ($associationEnd.many)
<c:forEach var="item" items="${${variable.name}.${associationEnd.name}}">
<c:set var="item" value="${item}" scope="request"/>
#foreach ($itemAttribute in $associationEnd.type.getAttributes(true))
- <h:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
- <h:outputText value="#{item.${itemAttribute.name}}">
+ <tr:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
+ <tr:outputText value="#{item.${itemAttribute.name}}">
#if ($itemAttribute.type.dateType)
<a:convertDateTime pattern="$itemAttribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
</c:forEach>
#else
#foreach ($itemAttribute in $associationEnd.type.getAttributes(true))
- <h:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
- <h:outputText value="#{item.${itemAttribute.name}}">
+ <tr:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
+ <tr:outputText value="#{item.${itemAttribute.name}}">
#if ($itemAttribute.type.dateType)
<a:convertDateTime pattern="$itemAttribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#end
#end
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/header.jsp.vsl
Index: header.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/header.jsp.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- header.jsp.vsl 5 Dec 2006 19:39:16 -0000 1.1
+++ header.jsp.vsl 19 Jul 2007 18:09:30 -0000 1.2
@@ -1,3 +1,3 @@
-<t:div id="pageHeader"><h:outputText value="#{messages['application.name']}"/></t:div>
+<t:div id="pageHeader"><tr:outputText value="#{messages['application.name']}"/></t:div>
1.2 +7 -7 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-table.jspf.vsl
Index: view-table.jspf.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-table.jspf.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-table.jspf.vsl 5 Dec 2006 19:39:16 -0000 1.1
+++ view-table.jspf.vsl 19 Jul 2007 18:09:31 -0000 1.2
@@ -23,25 +23,25 @@
#end
<tr:column sortable="true" sortProperty="$columnName">
<f:facet name="header">
- <h:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
+ <tr:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
</f:facet>
#set ($tableColumnActions = $table.getTableColumnActions($columnName))
#if (!$tableColumnActions.empty)
#set ($action = $tableColumnActions.iterator().next())
<tr:commandLink action="#{${action.controller.beanName}.${action.triggerName}}">
- <h:outputText value="#{row.${columnName}}">
+ <tr:outputText value="#{row.${columnName}}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
#renderTableCommandLinkParameters()
</tr:commandLink>
#else
- <h:outputText value="#{row.${columnName}}">
+ <tr:outputText value="#{row.${columnName}}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
</tr:column>
#end
@@ -50,11 +50,11 @@
<f:facet name="header">
<t:graphicImage url="/images/space.gif"/>
</f:facet>
- <h:outputText value="#{row}">
+ <tr:outputText value="#{row}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
</tr:column>
#end
## - render any table hyperlink actions
1.10 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
Index: layout.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- layout.xhtml.vsl 5 Jul 2007 17:09:23 -0000 1.9
+++ layout.xhtml.vsl 19 Jul 2007 18:09:31 -0000 1.10
@@ -27,7 +27,7 @@
<f:facet name="infoUser">
<tr:panelGroupLayout>
<tr:image source="/images/user.gif"/>
- <h:outputText value=" #{remoteUser}"/>
+ <tr:outputText value=" #{remoteUser}"/>
</tr:panelGroupLayout>
</f:facet>
#end
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/return.xhtml.vsl
Index: return.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/return.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- return.xhtml.vsl 5 Dec 2006 19:39:25 -0000 1.1
+++ return.xhtml.vsl 19 Jul 2007 18:09:31 -0000 1.2
@@ -4,7 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition>
<h:panelGroup id="return">
- <tr:goLink destination="#{messages['return.link.uri']}"><h:outputText value="#{messages['return.link.text']}" escape="false"/></tr:goLink>
+ <tr:goLink destination="#{messages['return.link.uri']}"><tr:outputText value="#{messages['return.link.text']}" escape="false"/></tr:goLink>
</h:panelGroup>
</ui:composition>
</html>
1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/header.xhtml.vsl
Index: header.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/header.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- header.xhtml.vsl 4 Mar 2007 19:08:30 -0000 1.2
+++ header.xhtml.vsl 19 Jul 2007 18:09:31 -0000 1.3
@@ -4,7 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition>
<tr:panelGroupLayout inlineStyle="overflow: auto; font-size: x-large; font-weight: bold;">
- <h:outputText>#{messages['application.name']}</h:outputText>
+ <tr:outputText>#{messages['application.name']}</tr:outputText>
</tr:panelGroupLayout>
</ui:composition>
</html>
1.2 +3 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/footer.xhtml.vsl
Index: footer.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/footer.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- footer.xhtml.vsl 5 Dec 2006 19:39:25 -0000 1.1
+++ footer.xhtml.vsl 19 Jul 2007 18:09:31 -0000 1.2
@@ -1,9 +1,10 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad">
<ui:composition>
<h:panelGroup id="footer">
- <h:outputText value="#{messages['footer.message']}" escape="false"/>
+ <tr:outputText value="#{messages['footer.message']}" escape="false"/>
</h:panelGroup>
</ui:composition>
</html>
1.9 +5 -5 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl
Index: view.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- view.xhtml.vsl 5 Jul 2007 17:09:25 -0000 1.8
+++ view.xhtml.vsl 19 Jul 2007 18:09:32 -0000 1.9
@@ -42,7 +42,7 @@
</c:if>
</tr:selectOneRadio>
#elseif ($parameter.plainText)
- <h:outputText value="#{${formValuePropertyName}}"/>
+ <tr:outputText value="#{${formValuePropertyName}}"/>
#else
##if the widget type is not defined explicitly ...
#if($parameter.type.enumeration)
@@ -143,18 +143,18 @@
#if(!$member.hidden && !$member.inputFile)
<tr:column sortable=#if($manageable.tableSortable)"true"#else"false"#end sortProperty="$member.name">
<f:facet name="header">
- <h:outputText value="#{messages['$member.messageKey']}"/>
+ <tr:outputText value="#{messages['$member.messageKey']}"/>
</f:facet>
#if($member.type.enumeration)
<c:set var="messageKey" value="${member.type.messageKey}.#{row.${member.name}}"/>
- <h:outputText value="#{messages[messageKey]}">
+ <tr:outputText value="#{messages[messageKey]}">
#else
- <h:outputText value="#{row.${member.name}}">
+ <tr:outputText value="#{row.${member.name}}">
#end
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
</tr:column>
#end
#end
1.6 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm
Index: renderActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- renderActionFormInput.vm 4 Mar 2007 16:06:54 -0000 1.5
+++ renderActionFormInput.vm 19 Jul 2007 18:09:32 -0000 1.6
@@ -60,7 +60,7 @@
#elseif ($parameter.inputTable)
#renderInputTable($parameter)
#elseif ($parameter.plainText)
- <h:outputText value="#{${formValuePropertyName}}"/>
+ <tr:outputText value="#{${formValuePropertyName}}"/>
#elseif ($parameter.inputSecret)
<tr:panelLabelAndMessage label="#{messages['$parameter.messageKey']}:" showRequired="$parameter.required">
<h:inputSecret id="$propertyId" value="#{${formValuePropertyName}}" required="$parameter.required" readonly="$parameter.readOnly"/>
@@ -110,7 +110,7 @@
#set ($columnId = $column.getFormPropertyId($parameter))
<h:column>
<f:facet name="header">
- <h:outputText value="#{messages['$column.messageKey']}"/>
+ <tr:outputText value="#{messages['$column.messageKey']}"/>
</f:facet>
#if ($column.type.dateType)
#if ($column.readOnly)
@@ -132,7 +132,7 @@
#end
</h:inputText>
#else
- <h:outputText value="#{item.${column.name}}"/>
+ <tr:outputText value="#{item.${column.name}}"/>
#end
#if ($column.inputTypePresent)
<t:message for="$columnId" styleClass="error" showDetail="true" showSummary="false"/>
|
|
From: Chad B. <cwb...@us...> - 2007-07-19 17:48:23
|
User: cwbrandon
Date: 07/07/19 10:48:22
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/jsp
login.jsp.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
login.xhtml.vsl
Log:
set style for login error text
Revision Changes Path
1.4 +2 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl
Index: login.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- login.jsp.vsl 6 Jul 2007 19:40:28 -0000 1.3
+++ login.jsp.vsl 19 Jul 2007 17:48:22 -0000 1.4
@@ -35,8 +35,8 @@
<h:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
<f:verbatim><br/></f:verbatim>
#set ($actionParam = "param.action")
- <tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}"/>
- <tr:outputText value="#{messages['login.error.role']}" rendered="${${actionParam} == 'roleError'}"/>
+ <tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}" styleClass="error"/>
+ <tr:outputText value="#{messages['login.error.role']}" rendered="${${actionParam} == 'roleError'}" styleClass="error"/>
<tr:form>
<tr:panelFormLayout>
<tr:inputText id="j_username" label="#{messages['login.username']}:" />
1.7 +2 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl
Index: login.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- login.xhtml.vsl 6 Jul 2007 19:40:28 -0000 1.6
+++ login.xhtml.vsl 19 Jul 2007 17:48:22 -0000 1.7
@@ -27,8 +27,8 @@
<h:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
<br/>
#set ($actionParam = "param.action")
- <tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}"/>
- <tr:outputText value="#{messages['login.error.role']}" rendered="${${actionParam} == 'roleError'}"/>
+ <tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}" styleClass="error"/>
+ <tr:outputText value="#{messages['login.error.role']}" rendered="${${actionParam} == 'roleError'}" styleClass="error"/>
<tr:form>
<tr:panelFormLayout>
<tr:inputText id="j_username" label="#{messages['login.username']}:" />
|
|
From: Chad B. <cwb...@us...> - 2007-07-19 17:41:13
|
User: cwbrandon
Date: 07/07/19 10:41:16
Modified: andromda-jsf2/src/main/resources/templates/jsf2/messages
messages.properties.vsl
Log:
make preferences link lowercase to be consistent with logout link
Revision Changes Path
1.5 +4 -4 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/messages/messages.properties.vsl
Index: messages.properties.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/messages/messages.properties.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- messages.properties.vsl 1 Jul 2007 19:21:28 -0000 1.4
+++ messages.properties.vsl 19 Jul 2007 17:41:16 -0000 1.5
@@ -135,7 +135,7 @@
#
# Messages for preferences
#
-menu.preferences=Preferences
+menu.preferences=preferences
preferences.menu.theme=Menu Theme
preferences.title=Preferences
preferences.apply=Apply
|
|
From: Chad B. <cwb...@us...> - 2007-07-19 17:38:54
|
User: cwbrandon
Date: 07/07/19 10:38:57
Modified: andromda-jsf2/src/main/resources/resources/views/skins/purple
purpleSkin.css
andromda-jsf2/src/main/resources/resources/views/skins/beach
beach.css
Log:
add pageContent
Revision Changes Path
1.2 +45 -40 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/purple/purpleSkin.css
Index: purpleSkin.css
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/resources/views/skins/purple/purpleSkin.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- purpleSkin.css 5 Dec 2006 19:39:34 -0000 1.1
+++ purpleSkin.css 19 Jul 2007 17:38:56 -0000 1.2
@@ -571,3 +571,8 @@
af|inputText::content {background-color:pink}
}
}
+
+#pageContent
+{
+ margin: 25px;
+}
\ No newline at end of file
1.2 +36 -31 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/beach/beach.css
Index: beach.css
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/resources/views/skins/beach/beach.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- beach.css 5 Dec 2006 19:39:01 -0000 1.1
+++ beach.css 19 Jul 2007 17:38:57 -0000 1.2
@@ -445,3 +445,8 @@
{
-ora-rule-ref: selector(".AFStartTextAlign:alias");
}
+
+#pageContent
+{
+ margin: 25px;
+}
\ No newline at end of file
|
|
From: Chad B. <cwb...@us...> - 2007-07-19 17:31:42
|
User: cwbrandon
Date: 07/07/19 10:31:43
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
namespace.xml
Log:
make default skin "default"
Revision Changes Path
1.5 +1 -1 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- namespace.xml 19 Jul 2007 17:11:05 -0000 1.4
+++ namespace.xml 19 Jul 2007 17:31:43 -0000 1.5
@@ -137,7 +137,7 @@
</documentation>
</property>
<property name="skin">
- <default>beach</default>
+ <default>default</default>
<documentation>
The default skin to be applied (i.e look and feel of the application).
</documentation>
|
|
From: Chad B. <cwb...@us...> - 2007-07-19 17:26:58
|
User: cwbrandon
Date: 07/07/19 10:27:01
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
andromda-jsf2/src/main/resources/templates/jsf2/configuration
trinidad-skins.xml.vsl
Removed: andromda-jsf2/src/main/resources/templates/jsf2/configuration
adf-faces-config.xml.vsl
andromda-jsf2/src/main/resources/resources/configuration/adf
adf-faces-skins.xml
Log:
cleanup - remove some unused files
Revision Changes Path
1.8 +0 -13 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- cartridge.xml 19 Jul 2007 17:11:05 -0000 1.7
+++ cartridge.xml 19 Jul 2007 17:27:00 -0000 1.8
@@ -151,13 +151,6 @@
lastModifiedCheck="true"/>
<resource
- path="resources/configuration/adf/*.xml"
- outputPattern="WEB-INF/{0}"
- outlet="configuration"
- overwrite="true"
- lastModifiedCheck="true"/>
-
- <resource
path="resources/views/css/*"
outputPattern="css/{0}"
outlet="custom-resources"
@@ -492,12 +485,6 @@
overwrite="true"/>
<template
- path="templates/jsf2/utils/AdfFacesContextWrapper.java.vsl"
- outputPattern="$stringUtils.replace($managedBeansPackage, '.', '/')/${className}.java"
- outlet="managed-beans"
- overwrite="true"/>
-
- <template
path="templates/jsf2/utils/JsfUtils.java.vsl"
outputPattern="$stringUtils.replace($managedBeansPackage, '.', '/')/${className}.java"
outlet="managed-beans"
1.2 +7 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/trinidad-skins.xml.vsl
Index: trinidad-skins.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/trinidad-skins.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- trinidad-skins.xml.vsl 5 Dec 2006 19:39:00 -0000 1.1
+++ trinidad-skins.xml.vsl 19 Jul 2007 17:27:00 -0000 1.2
@@ -46,5 +46,12 @@
skins/beach/beach.css
</style-sheet-name>
</skin>
+ <skin>
+ <id>default.desktop</id>
+ <family>default</family>
+ <render-kit-id> org.apache.myfaces.trinidad.desktop</render-kit-id>
+ <style-sheet-name>skins/default/default.css</style-sheet-name>
+ <bundle-name>messages</bundle-name>
+ </skin>
<!-- trinidad-skins merge-point -->
</skins>
|
|
From: Chad B. <cwb...@us...> - 2007-07-19 17:11:10
|
User: cwbrandon
Date: 07/07/19 10:11:07
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml namespace.xml
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences
preferences.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/preferences
Preferences.java.vsl
andromda-jsf2/src/main/resources/templates/jsf2/configuration
faces-config.xml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences
preferences.jsp.vsl
Log:
get rid of unused menu selection preference
Revision Changes Path
1.7 +0 -2 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- cartridge.xml 9 Jul 2007 17:55:08 -0000 1.6
+++ cartridge.xml 19 Jul 2007 17:11:05 -0000 1.7
@@ -28,8 +28,6 @@
<property reference="managedBeansPackage"/>
<property reference="preferencesClassName"/>
<property reference="preferencesBeanName"/>
- <property reference="menuLayout"/>
- <property reference="menuTheme"/>
<property reference="applicationName"/>
<property reference="formPopulatorName"/>
<property reference="exceptionHandlerPattern"/>
1.4 +13 -34 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- namespace.xml 20 Feb 2007 10:10:32 -0000 1.3
+++ namespace.xml 19 Jul 2007 17:11:05 -0000 1.4
@@ -148,33 +148,12 @@
Defines the bean name under which the preferences class will be stored.
</documentation>
</property>
- <property name="menuLayout">
- <default>vbr</default>
- <documentation>
- The menu layout. Valid values are:
- <ul>
- <li>hbr</li>
- <li>hur</li>
- <li>hul</li>
- <li>vbr</li>
- <li>vur</li>
- <li>vur</li>
- </ul>
- </documentation>
- </property>
<property name="maxTableRows">
<default>10</default>
<documentation>
The dfault value to set for the maximum rows displayed in a table.
</documentation>
</property>
- <property name="menuTheme">
- <default>ThemePanel</default>
- <documentation>
- The navigation theme to use (the possible choices are:
- ThemeOffice, ThemeMiniBlack, ThemeIE, ThemePanel).
- </documentation>
- </property>
<property name="navigationStyle">
<default>sidebar</default>
<documentation>Controls the way navigation items are displayed</documentation></property>
1.5 +0 -6 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl
Index: preferences.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- preferences.xhtml.vsl 5 Jul 2007 17:09:25 -0000 1.4
+++ preferences.xhtml.vsl 19 Jul 2007 17:11:06 -0000 1.5
@@ -13,12 +13,6 @@
<ui:define name="content">
<tr:form id="$preferencesBeanName">
<tr:panelFormLayout>
- <tr:selectOneChoice id="menuTheme" value="#{${preferencesBeanName}.menuTheme}" label="#{messages['preferences.menu.theme']}:">
- <f:selectItem itemLabel="Office" itemValue="ThemeOffice"/>
- <f:selectItem itemLabel="Mini Black" itemValue="ThemeMiniBlack"/>
- <f:selectItem itemLabel="IE" itemValue="ThemeIE"/>
- <f:selectItem itemLabel="Panel" itemValue="ThemePanel"/>
- </tr:selectOneChoice>
<tr:selectOneChoice id="skin" value="#{${preferencesBeanName}.skin}" label="#{messages['preferences.skin']}:">
<f:selectItem itemLabel="Default" itemValue="default"/>
<f:selectItem itemLabel="Beach" itemValue="beach"/>
1.2 +12 -24 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/preferences/Preferences.java.vsl
Index: Preferences.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/preferences/Preferences.java.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Preferences.java.vsl 5 Dec 2006 19:39:32 -0000 1.1
+++ Preferences.java.vsl 19 Jul 2007 17:11:06 -0000 1.2
@@ -10,21 +10,6 @@
public class $preferencesClassName
implements java.io.Serializable
{
- private String menuTheme;
-
- /**
- * The theme to use for the JSCookMenu.
- */
- public String getMenuTheme()
- {
- return this.menuTheme;
- }
-
- public void setMenuTheme(final String menuTheme)
- {
- this.menuTheme = menuTheme;
- }
-
/**
* The skin to apply.
*/
@@ -52,9 +37,12 @@
public void setMaxTableRows(final String maxTableRows)
{
- try {
+ try
+ {
this.maxTableRows = Integer.parseInt(maxTableRows);
- } catch (Exception ex) {
+ }
+ catch (Exception ex)
+ {
this.maxTableRows = 1;
}
}
1.11 +4 -8 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl
Index: faces-config.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- faces-config.xml.vsl 1 Jul 2007 19:17:49 -0000 1.10
+++ faces-config.xml.vsl 19 Jul 2007 17:11:06 -0000 1.11
@@ -286,10 +286,6 @@
<property-name>skin</property-name>
<value>$skin</value>
</managed-property>
- <managed-property>
- <property-name>menuTheme</property-name>
- <value>$menuTheme</value>
- </managed-property>
#if ($stringUtils.isNotBlank($maxTableRows))
<managed-property>
<property-name>maxTableRows</property-name>
1.3 +10 -16 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences/preferences.jsp.vsl
Index: preferences.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences/preferences.jsp.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- preferences.jsp.vsl 12 Dec 2006 18:46:32 -0000 1.2
+++ preferences.jsp.vsl 19 Jul 2007 17:11:07 -0000 1.3
@@ -38,12 +38,6 @@
</f:facet>
<h:form id="$preferencesBeanName">
<tr:panelFormLayout>
- <tr:selectOneChoice id="theme" value="#{${preferencesBeanName}.menuTheme}" label="#{messages['preferences.menu.theme']}:">
- <f:selectItem itemLabel="Office" itemValue="ThemeOffice"/>
- <f:selectItem itemLabel="Mini Black" itemValue="ThemeMiniBlack"/>
- <f:selectItem itemLabel="IE" itemValue="ThemeIE"/>
- <f:selectItem itemLabel="Panel" itemValue="ThemePanel"/>
- </tr:selectOneChoice>
<tr:selectOneChoice id="skin" value="#{${preferencesBeanName}.skin}" label="#{messages['preferences.skin']}:">
<f:selectItem itemLabel="Default" itemValue="default"/>
<f:selectItem itemLabel="Beach" itemValue="beach"/>
|
|
From: Vance K. <va...@us...> - 2007-07-12 12:32:15
|
User: vancek
Date: 07/07/12 05:32:13
Modified: samples/timetracker-ejb3/mda/src/main/config andromda.xml
Log:
add missing properties
Revision Changes Path
1.3 +6 -1 plugins/samples/timetracker-ejb3/mda/src/main/config/andromda.xml
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/samples/timetracker-ejb3/mda/src/main/config/andromda.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- andromda.xml 6 Feb 2007 02:54:50 -0000 1.2
+++ andromda.xml 12 Jul 2007 12:32:13 -0000 1.3
@@ -43,6 +43,12 @@
</namespace>
<namespace name="ejb3">
<properties>
+ <property name="dataSourceName">${dataSource.name}</property>
+ <property name="dataSource">${dataSource}</property>
+ <property name="username">${jdbc.username}</property>
+ <property name="password">${jdbc.password}</property>
+ <property name="driver">${jdbc.driver}</property>
+ <property name="connectionUrl">${jdbc.url}</property>
<property name="entity-beans">${core.generated.dir}</property>
<property name="entity-impls">${core.manual.dir}</property>
<property name="entity-config">${core.generated.dir}</property>
@@ -65,7 +71,6 @@
<property name="persistenceContainerName">jboss</property>
<property name="persistenceContextUnitName">${application.id}</property>
<property name="entityManagerName">${application.id}</property>
- <property name="entityManagerJTADataSource">${dataSource}</property>
<property name="hibernateDialect">${hibernate.dialect}</property>
<property name="hibernateHbm2DDLAuto">update</property>
<property name="enableTemplating">true</property>
|
|
From: Chad B. <cwb...@us...> - 2007-07-09 22:02:43
|
User: cwbrandon
Date: 07/07/09 15:00:54
Modified: andromda-aspdotnet/src/main/uml
AspDotNetMetafacadeModelv4.xml.zip
andromda-aspdotnet/src/main/java/org/andromda/cartridges/aspdotnet/metafacades
AspWebFormLogicImpl.java
Log:
Get rid of getTables() from AspWebForm since its inherted from UML metafacades now
Revision Changes Path
1.5 +99 -119 cartridges/andromda-aspdotnet/src/main/uml/AspDotNetMetafacadeModelv4.xml.zip
<<Binary file>>
1.2 +1 -24 cartridges/andromda-aspdotnet/src/main/java/org/andromda/cartridges/aspdotnet/metafacades/AspWebFormLogicImpl.java
Index: AspWebFormLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-aspdotnet/src/main/java/org/andromda/cartridges/aspdotnet/metafacades/AspWebFormLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- AspWebFormLogicImpl.java 17 Sep 2006 17:30:04 -0000 1.1
+++ AspWebFormLogicImpl.java 9 Jul 2007 22:00:53 -0000 1.2
@@ -241,27 +241,4 @@
return ((AspController) this.getUseCase().getController())
.getSessionObjects();
}
-
- /**
- * @see org.andromda.cartridges.aspdotnet.metafacades.AspWebForm#GetTables()
- */
- protected List handleGetTables()
- {
- final List tables = new ArrayList();
- final List variables = this.getVariables();
- for (int ctr = 0; ctr < variables.size(); ctr++)
- {
- final Object object = variables.get(ctr);
- if (object instanceof AspParameter)
- {
- final AspParameter variable = (AspParameter)object;
- if (variable.isTable())
- {
- tables.add(variable);
- }
- }
- }
- return tables;
- }
-
}
|
|
From: Chad B. <cwb...@us...> - 2007-07-09 19:06:53
|
User: cwbrandon
Date: 07/07/09 12:06:55
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
registration-layout.xhtml.vsl
Log:
add missing title
Revision Changes Path
1.3 +3 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/registration-layout.xhtml.vsl
Index: registration-layout.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/registration-layout.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- registration-layout.xhtml.vsl 9 Jul 2007 19:01:12 -0000 1.2
+++ registration-layout.xhtml.vsl 9 Jul 2007 19:06:55 -0000 1.3
@@ -23,7 +23,9 @@
</ui:insert>
</f:facet>
<div id="pageContent">
+ <tr:panelHeader text="#{title}">
<ui:insert name="content"/>
+ </tr:panelHeader>
</div>
</tr:panelPage>
</trh:body>
|
|
From: Chad B. <cwb...@us...> - 2007-07-09 19:01:11
|
User: cwbrandon
Date: 07/07/09 12:01:13
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
registration-layout.xhtml.vsl
Log:
fix registration layout
Revision Changes Path
1.2 +7 -16 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/registration-layout.xhtml.vsl
Index: registration-layout.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/registration-layout.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- registration-layout.xhtml.vsl 5 Dec 2006 19:39:25 -0000 1.1
+++ registration-layout.xhtml.vsl 9 Jul 2007 19:01:12 -0000 1.2
@@ -1,18 +1,15 @@
<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:c="http://java.sun.com/jstl/core"
- xmlns:fn="http://java.sun.com/jsp/jstl/functions"
xmlns:t="http://myfaces.apache.org/tomahawk"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ xmlns:trh="http://myfaces.apache.org/trinidad/html">
<ui:insert name="head">
<ui:include src="head.xhtml"/>
</ui:insert>
- <body>
-
+ <trh:body>
<ui:insert name="title"/>
<tr:panelPage>
<f:facet name="branding">
@@ -20,11 +17,6 @@
<ui:include src="header.xhtml"/>
</ui:insert>
</f:facet>
- <f:facet name="menu2">
- <tr:menuBar>
- <t:graphicImage url="/images/space.gif"/>
- </tr:menuBar>
- </f:facet>
<f:facet name="appCopyright">
<ui:insert name="footer">
<ui:include src="footer.xhtml"/>
@@ -34,7 +26,6 @@
<ui:insert name="content"/>
</div>
</tr:panelPage>
-
- </body>
+ </trh:body>
</html>
|
|
From: Chad B. <cwb...@us...> - 2007-07-09 17:55:07
|
User: cwbrandon
Date: 07/07/09 10:55:09
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip
Log:
Fix table rendering bug (depends on latest fix in andromda 3.3-SNAPSHOT)
Revision Changes Path
1.6 +6 -8 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- cartridge.xml 5 Jul 2007 17:09:24 -0000 1.5
+++ cartridge.xml 9 Jul 2007 17:55:08 -0000 1.6
@@ -670,11 +670,10 @@
outlet="views"
overwrite="true"
outputCondition="viewTypeIsFacelets">
- <modelElements variable="table">
+ <modelElements>
<modelElement>
- <type name="org.andromda.metafacades.uml.FrontEndParameter">
- <property name="table"/>
- <property name="view"/>
+ <type name="org.andromda.metafacades.uml.FrontEndView">
+ <property name="tables" variable="table"/>
</type>
</modelElement>
</modelElements>
@@ -847,11 +846,10 @@
outlet="views"
overwrite="true"
outputCondition="viewTypeIsJsp">
- <modelElements variable="table">
+ <modelElements>
<modelElement>
- <type name="org.andromda.metafacades.uml.FrontEndParameter">
- <property name="table"/>
- <property name="view"/>
+ <type name="org.andromda.metafacades.uml.FrontEndView">
+ <property name="tables" variable="table"/>
</type>
</modelElement>
</modelElements>
1.7 +179 -185 cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Chad B. <cwb...@us...> - 2007-07-06 19:40:27
|
User: cwbrandon
Date: 07/07/06 12:40:28
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/jsp
login.jsp.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
login.xhtml.vsl
Log:
fix registration link
Revision Changes Path
1.3 +7 -10 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl
Index: login.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- login.jsp.vsl 6 Jul 2007 18:27:50 -0000 1.2
+++ login.jsp.vsl 6 Jul 2007 19:40:28 -0000 1.3
@@ -33,7 +33,7 @@
</f:facet>
<t:div id="pageContent">
<h:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
- <br/>
+ <f:verbatim><br/></f:verbatim>
#set ($actionParam = "param.action")
<tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}"/>
<tr:outputText value="#{messages['login.error.role']}" rendered="${${actionParam} == 'roleError'}"/>
@@ -50,16 +50,13 @@
</tr:panelFormLayout>
</tr:form>
#if (!$registrationUseCases.empty)
- <tr>
- <td colspan="2"/>
- <td>
- <a href="${pageContext.request.contextPath}${registrationUseCases.iterator().next().path}.${facesServletExtension}" class="registerAsNewUserLink" tabindex="20">
- <fmt:message key="login.register.as.new.user"/>
- </a>
- </td>
- </tr>
+ <f:verbatim><br/></f:verbatim>
+ <tr:form>
+ <tr:commandLink action="#{${useCase.controller.beanName}.${useCase.controllerAction}}" text=" #{messages['login.register.as.new.user']}"/>
+ </tr:form>
+ <f:verbatim><br/></f:verbatim>
#end
- </f:verbatim>
+
</t:div>
</tr:panelPage>
1.6 +6 -8 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl
Index: login.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- login.xhtml.vsl 6 Jul 2007 18:27:50 -0000 1.5
+++ login.xhtml.vsl 6 Jul 2007 19:40:28 -0000 1.6
@@ -42,14 +42,12 @@
</tr:panelFormLayout>
</tr:form>
#if (!$registrationUseCases.empty)
- <tr>
- <td colspan="2"/>
- <td>
- <a href="${facesContext.externalContext.request.contextPath}${registrationUseCases.iterator().next().path}.${facesServletExtension}" class="registerAsNewUserLink">
- #{messages['login.register.as.new.user']}
- </a>
- </td>
- </tr>
+#set ($useCase = $registrationUseCases.iterator().next())
+ <br/>
+ <tr:form>
+ <tr:commandLink action="#{${useCase.controller.beanName}.${useCase.controllerAction}}" text=" #{messages['login.register.as.new.user']}"/>
+ </tr:form>
+ <br/>
#end
</div>
</tr:panelPage>
|
|
From: Chad B. <cwb...@us...> - 2007-07-06 18:27:49
|
User: cwbrandon
Date: 07/07/06 11:27:50
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/jsp
login.jsp.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
login.xhtml.vsl
Log:
fix layout of the login page
Revision Changes Path
1.2 +25 -49 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl
Index: login.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- login.jsp.vsl 5 Dec 2006 19:39:21 -0000 1.1
+++ login.jsp.vsl 6 Jul 2007 18:27:50 -0000 1.2
@@ -33,44 +33,22 @@
</f:facet>
<t:div id="pageContent">
<h:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
- <f:verbatim>
<br/>
- <form id="login" name="login" action="j_security_check" method="post">
- <table cellpadding="0" cellspacing="0" border="0" class="xu">
#set ($actionParam = "param.action")
- <c:choose>
- <c:when test="${${actionParam} == 'error'}">
- <tr>
- <td colspan="2"/>
- <td><div class="error"><fmt:message key="login.error"/></div></td>
- </tr>
- </c:when>
- <c:when test="${${actionParam} == 'roleError'}">
- <tr>
- <td colspan="2"/>
- <td>
- <div class="error"><fmt:message key="login.error.role"/></div>
- </td>
- </tr>
- </c:when>
- </c:choose>
- <tr>
- <td class="xv" width="37%"><span class="xa"><label for="login:j_username"><fmt:message key="login.username"/>:</label></span></td>
- <td width="12"><img src="${pageContext.request.contextPath}/adf/images/t.gif" width="12"/></td>
- <td valign="top" width="63%"><input type="text" name="j_username" class="x6" size="30" tabindex="10"/></td>
- </tr>
- <tr>
- <td class="xv"><span class="xa"><label for="login:j_password"><fmt:message key="login.password"/>:</label></span></td>
- <td width="12"><img src="${pageContext.request.contextPath}/adf/images/t.gif" width="12"/></td>
- <td valign="top"><input id="j_password" name="j_password" class="x6" size="30" type="password" tabindex="10"/></td>
- </tr>
- <tr>
- <td colspan="2"/>
- <td>
- <button class="xj" onclick="document.forms[0].submit();" type="button" tabindex="10"><fmt:message key="login.submit"/></button>
- <button class="xj" onclick="document.forms[0].reset();" type="button"><fmt:message key="login.reset"/></button>
- </td>
- </tr>
+ <tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}"/>
+ <tr:outputText value="#{messages['login.error.role']}" rendered="${${actionParam} == 'roleError'}"/>
+ <tr:form>
+ <tr:panelFormLayout>
+ <tr:inputText id="j_username" label="#{messages['login.username']}:" />
+ <tr:inputText id="j_password" secret="true" label="#{messages['login.password']}:" />
+ <f:facet name="footer">
+ <tr:panelButtonBar>
+ <tr:goButton text="#{messages['login.submit']}" onclick="document.forms[0].action='j_security_check';document.forms[0].submit();" />
+ <tr:goButton text="#{messages['login.reset']}" onclick="document.forms[0].reset();" />
+ </tr:panelButtonBar>
+ </f:facet>
+ </tr:panelFormLayout>
+ </tr:form>
#if (!$registrationUseCases.empty)
<tr>
<td colspan="2"/>
@@ -81,8 +59,6 @@
</td>
</tr>
#end
- </table>
- </form>
</f:verbatim>
</t:div>
</tr:panelPage>
@@ -90,7 +66,7 @@
<script type="text/javascript" language="Javascript1.1">
<![CDATA[
<!--
- var field = document.forms["login"].elements["j_username"];
+ var field = document.forms[0].elements["j_username"];
field.focus();
field.select();
//-->
1.5 +15 -44 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl
Index: login.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- login.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.4
+++ login.xhtml.vsl 6 Jul 2007 18:27:50 -0000 1.5
@@ -26,48 +26,21 @@
<div id="pageContent">
<h:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
<br/>
- <form id="login" name="login" action="j_security_check" method="post">
- <table cellpadding="0" cellspacing="0" border="0" class="xu">
#set ($actionParam = "param.action")
- <c:choose>
- <c:when test="${${actionParam} == 'error'}">
- <tr>
- <td colspan="2"/>
- <td>
- <div class="error">#{messages['login.error']}</div>
- </td>
- </tr>
- </c:when>
- <c:when test="${${actionParam} == 'roleError'}">
- <tr>
- <td colspan="2"/>
- <td>
- <div class="error">#{messages['login.error.role']}</div>
- </td>
- </tr>
- </c:when>
- </c:choose>
- <tr>
- <td class="xv" width="37%"><span class="xa"><label for="login:j_username">#{messages['login.username']}:</label></span></td>
- <td width="12"><img src="${facesContext.externalContext.request.contextPath}/adf/images/t.gif" width="12"/></td>
- <td valign="top" width="63%"><input type="text" name="j_username" class="x6" size="30"/></td>
- </tr>
- <tr>
- <td class="xv"><span class="xa"><label for="login:j_password">#{messages['login.password']}:</label></span></td>
- <td width="12"><img src="${facesContext.externalContext.request.contextPath}/adf/images/t.gif" width="12"/></td>
- <td valign="top"><input id="j_password" name="j_password" class="x6" size="30" type="password"/></td>
- </tr>
- <tr>
- <td colspan="2"/>
- <td>
+ <tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}"/>
+ <tr:outputText value="#{messages['login.error.role']}" rendered="${${actionParam} == 'roleError'}"/>
<tr:form>
+ <tr:panelFormLayout>
+ <tr:inputText id="j_username" label="#{messages['login.username']}:" />
+ <tr:inputText id="j_password" secret="true" label="#{messages['login.password']}:" />
+ <f:facet name="footer">
<tr:panelButtonBar>
- <tr:commandButton text="#{messages['login.submit']}" onclick="document.forms[0].submit();"/>
- <tr:commandButton text="#{messages['login.reset']}" onclick="document.forms[0].reset();"/>
+ <tr:goButton text="#{messages['login.submit']}" onclick="document.forms[0].action='j_security_check';document.forms[0].submit();" />
+ <tr:goButton text="#{messages['login.reset']}" onclick="document.forms[0].reset();" />
</tr:panelButtonBar>
+ </f:facet>
+ </tr:panelFormLayout>
</tr:form>
- </td>
- </tr>
#if (!$registrationUseCases.empty)
<tr>
<td colspan="2"/>
@@ -78,13 +51,11 @@
</td>
</tr>
#end
- </table>
- </form>
</div>
</tr:panelPage>
<script type="text/javascript" language="Javascript1.1">
- var field = document.forms["login"].elements["j_username"];
+ var field = document.forms[0].elements["j_username"];
field.focus();
field.select();
</script>
|
|
From: Chad B. <cwb...@us...> - 2007-07-05 20:20:25
|
User: cwbrandon
Date: 07/07/05 13:20:28
Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFUseCaseLogicImpl.java
Log:
typo
Revision Changes Path
1.4 +9 -7 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java
Index: JSFUseCaseLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- JSFUseCaseLogicImpl.java 5 Jul 2007 18:46:10 -0000 1.3
+++ JSFUseCaseLogicImpl.java 5 Jul 2007 20:20:27 -0000 1.4
@@ -723,18 +723,20 @@
{
public Object transform(Object object)
{
- IncludeFacade include = (IncludeFacade)object;
- return inc.getAddition();
+ final IncludeFacade include = (IncludeFacade)object;
+ return include.getAddition();
}
});
}
- private static boolean isParent(final JSFUseCase useCase0, final JSFUseCase useCase1)
+ private static boolean isParent(final JSFUseCase useCase1, final JSFUseCase useCase2)
{
- return CollectionUtils.exists(useCase1.getIncludes(),new Predicate() {
- public boolean evaluate(Object o) {
- final IncludeFacade inc = (IncludeFacade)o;
- return inc.getAddition().equals(useCase0);
+ return CollectionUtils.exists(useCase2.getIncludes(), new Predicate()
+ {
+ public boolean evaluate(Object object)
+ {
+ final IncludeFacade include = (IncludeFacade)object;
+ return include.getAddition().equals(useCase1);
}
});
}
|
|
From: Chad B. <cwb...@us...> - 2007-07-05 18:46:08
|
User: cwbrandon
Date: 07/07/05 11:46:10
Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFUseCaseLogicImpl.java
Log:
minor formatting
Revision Changes Path
1.3 +44 -42 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java
Index: JSFUseCaseLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- JSFUseCaseLogicImpl.java 12 Feb 2007 16:54:55 -0000 1.2
+++ JSFUseCaseLogicImpl.java 5 Jul 2007 18:46:10 -0000 1.3
@@ -719,9 +719,11 @@
*/
protected Collection handleGetNavigationChildren()
{
- return CollectionUtils.collect(getIncludes(),new Transformer() {
- public Object transform(Object o) {
- IncludeFacade inc = (IncludeFacade)o;
+ return CollectionUtils.collect(getIncludes(), new Transformer()
+ {
+ public Object transform(Object object)
+ {
+ IncludeFacade include = (IncludeFacade)object;
return inc.getAddition();
}
});
|
|
From: Chad B. <cwb...@us...> - 2007-07-05 17:09:23
|
User: cwbrandon
Date: 07/07/05 10:09:25
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/jsp
view.jsp.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
view-action.xhtml.vsl view-table.xhtml.vsl
view-variables.xhtml.vsl login.xhtml.vsl
view-hidden-parameters.xhtml.vsl view.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
layout.xhtml.vsl
andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes
view-action.jspf.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud
view.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences
preferences.xhtml.vsl
Removed: andromda-jsf2/src/main/resources/resources/configuration/facelets
andromda.taglib.xml tomahawk.taglib.xml
Log:
Fix javascript validation, get rid of use of subform for normal forms (since it doesn't allow the attributes necessary for js validation). Minor cleanup
Revision Changes Path
1.3 +5 -5 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/view.jsp.vsl
Index: view.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/view.jsp.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- view.jsp.vsl 11 Dec 2006 13:44:00 -0000 1.2
+++ view.jsp.vsl 5 Jul 2007 17:09:21 -0000 1.3
@@ -7,7 +7,7 @@
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
xmlns:xm="http://java.sun.com/jsp/jstl/xml"
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:a="http://www.andromda.org/cartridges/jsf2"
+ xmlns:a="http://www.andromda.org/cartridges/jsf"
xmlns:trh="http://myfaces.apache.org/trinidad/html"
xmlns:tr="http://myfaces.apache.org/trinidad">
<jsp:directive.page contentType="text/html;charset=utf-8"/>
1.3 +5 -5 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl
Index: view-action.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- view-action.xhtml.vsl 3 Jul 2007 17:28:44 -0000 1.2
+++ view-action.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.3
@@ -4,12 +4,12 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:t="http://myfaces.apache.org/tomahawk"
- xmlns:a="http://www.andromda.org/cartridges/jsf2"
+ xmlns:a="http://www.andromda.org/cartridges/jsf"
xmlns:tr="http://myfaces.apache.org/trinidad">
<ui:composition>
#set($formName = $action.formBeanName)
#if ($action.hyperlink || $action.popup)
-<tr:subform>
+<tr:form>
#if ($action.hyperlink)
<tr:commandLink action="#{${action.controller.beanName}.${action.triggerName}}">
#else
@@ -29,12 +29,12 @@
#else
</a:popup>
#end
-</tr:subform>
+</tr:form>
<br/><br/>
#else
#set ($clientValidation = $clientValidation && $action.validationRequired)
#set ($formValidateName = "validate$stringUtils.capitalize($formName)")
-<tr:subform id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end>
+<tr:form id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end#if($view.needsFileUpload) usesUpload="true"#end>
#if (!$action.hiddenParameters.empty)
<ui:include src="${action.viewFragmentPath}-hidden-params.xhtml"/>
#end
@@ -58,7 +58,7 @@
</f:facet>
</tr:panelFormLayout>
<a:validator#if(!$clientValidation) client="false"#end/>
-</tr:subform>
+</tr:form>
#end
</ui:composition>
</html>
1.2 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-table.xhtml.vsl
Index: view-table.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-table.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-table.xhtml.vsl 5 Dec 2006 19:39:14 -0000 1.1
+++ view-table.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.2
@@ -17,10 +17,10 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:t="http://myfaces.apache.org/tomahawk"
- xmlns:a="http://www.andromda.org/cartridges/jsf2"
+ xmlns:a="http://www.andromda.org/cartridges/jsf"
xmlns:tr="http://myfaces.apache.org/trinidad">
<ui:composition>
-<tr:subform>
+<tr:form>
#set ($targetColumns = $table.targettedTableColumnNames)
<tr:table allDetailsEnabled="true" var="row" rowBandingInterval="1" value="#{${table.name}}" rows="#{${preferencesBeanName}.maxTableRows}" width="90%">
#if (!$table.tableColumns.empty)
@@ -97,6 +97,6 @@
#end
#end
</tr:table>
-</tr:subform>
+</tr:form>
</ui:composition>
</html>
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-variables.xhtml.vsl
Index: view-variables.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-variables.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-variables.xhtml.vsl 5 Dec 2006 19:39:14 -0000 1.1
+++ view-variables.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.2
@@ -2,7 +2,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:a="http://www.andromda.org/cartridges/jsf2"
+ xmlns:a="http://www.andromda.org/cartridges/jsf"
xmlns:tr="http://myfaces.apache.org/trinidad">
<ui:composition>
<h:panelGrid columns="2" columnClasses="variableLabel,variableText">
1.4 +7 -7 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl
Index: login.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- login.xhtml.vsl 30 Dec 2006 19:00:20 -0000 1.3
+++ login.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.4
@@ -60,12 +60,12 @@
<tr>
<td colspan="2"/>
<td>
- <tr:subform>
+ <tr:form>
<tr:panelButtonBar>
<tr:commandButton text="#{messages['login.submit']}" onclick="document.forms[0].submit();"/>
<tr:commandButton text="#{messages['login.reset']}" onclick="document.forms[0].reset();"/>
</tr:panelButtonBar>
- </tr:subform>
+ </tr:form>
</td>
</tr>
#if (!$registrationUseCases.empty)
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-hidden-parameters.xhtml.vsl
Index: view-hidden-parameters.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-hidden-parameters.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-hidden-parameters.xhtml.vsl 5 Dec 2006 19:39:14 -0000 1.1
+++ view-hidden-parameters.xhtml.vsl 5 Jul 2007 17:09:22 -0000 1.2
@@ -18,7 +18,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:a="http://www.andromda.org/cartridges/jsf2">
+ xmlns:a="http://www.andromda.org/cartridges/jsf">
<ui:composition>
##
## This xhtml composition stores all hidden parameters for an action.
1.4 +0 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view.xhtml.vsl
Index: view.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view.xhtml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- view.xhtml.vsl 3 Jul 2007 17:13:22 -0000 1.3
+++ view.xhtml.vsl 5 Jul 2007 17:09:22 -0000 1.4
@@ -10,9 +10,6 @@
#set ($layout = "/layout/layout.xhtml")
#end
<ui:composition template="$layout">
- <ui:define name="usesUpload">
- <c:set var="usesUpload" value="${view.needsFileUpload}" scope="request"/>
- </ui:define>
<ui:define name="title">
<c:set var="title" value="#{messages['${view.titleKey}']}" scope="request"/>
</ui:define>
1.9 +59 -48 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
Index: layout.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- layout.xhtml.vsl 3 Jul 2007 17:15:32 -0000 1.8
+++ layout.xhtml.vsl 5 Jul 2007 17:09:23 -0000 1.9
@@ -13,8 +13,6 @@
</ui:insert>
<c:set var="remoteUser" value="${facesContext.externalContext.request.userPrincipal.name}" scope="request"/>
<trh:body>
- <ui:insert name="usesUpload"/>
- <tr:form usesUpload="#{usesUpload}">
<ui:insert name="title"/>
<tr:panelPage>
<f:facet name="branding">
@@ -35,64 +33,78 @@
#end
#if ($navigationStyle.equals("full"))
<f:facet name="navigation1">
+ <tr:form>
<tr:navigationPane hint="tabs" level="0" var="item" value="#{menuModel.model}">
<f:facet name="nodeStamp">
<tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
</f:facet>
</tr:navigationPane>
+ </tr:form>
</f:facet>
<f:facet name="navigation2">
+ <tr:form>
<tr:navigationPane hint="bar" level="1" var="item" value="#{menuModel.model}">
<f:facet name="nodeStamp">
<tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
</f:facet>
</tr:navigationPane>
+ </tr:form>
</f:facet>
<f:facet name="navigation3">
+ <tr:form>
<tr:navigationPane hint="list" level="2" var="item" value="#{menuModel.model}">
<f:facet name="nodeStamp">
<tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
</f:facet>
</tr:navigationPane>
+ </tr:form>
</f:facet>
#end
#if ($navigationStyle.equals("sidebar"))
<f:facet name="navigation3">
+ <tr:form>
<tr:navigationTree var="item" value="#{menuModel.model}">
<f:facet name="nodeStamp">
<tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
</f:facet>
</tr:navigationTree>
+ </tr:form>
</f:facet>
#end
<f:facet name="navigationGlobal">
+ <tr:form>
<tr:navigationPane hint="buttons">
<tr:commandNavigationItem text="#{messages['menu.preferences']}" action="preferences"/>
#if ($stringUtils.isNotBlank($securityRealm))
- <c:if test="${!empty remoteUser}">
- <tr:commandNavigationItem text="#{messages['logout.action']}" action="logout"/>
- </c:if>
+ <tr:commandNavigationItem text="#{messages['logout.action']}" action="logout" rendered="#{!empty remoteUser}"/>
#end
</tr:navigationPane>
+ </tr:form>
</f:facet>
##using breadcrumbs ?
## <f:facet name="location">
+## <tr:form>
## <tr:breadCrumbs var="item" value="#{menuModel.model}">
## <f:facet name="nodeStamp">
## <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
## </f:facet>
## </tr:breadCrumbs>
+## </tr:form>
## </f:facet>
<f:facet name="appCopyright">
+ <tr:form>
<ui:insert name="footer">
<ui:include src="footer.xhtml"/>
</ui:insert>
+ </tr:form>
</f:facet>
## using return ? don't forget to remove the return.xhtml
## <f:facet name="infoReturn">
+## <tr:form>
## <ui:insert name="return">
## <ui:include src="return.xhtml"/>
## </ui:insert>
+## </tr:form>
## </f:facet>
<div id="pageContent">
<tr:panelHeader text="#{title}">
@@ -100,6 +112,5 @@
</tr:panelHeader>
</div>
</tr:panelPage>
- </tr:form>
</trh:body>
</html>
1.5 +96 -104 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- cartridge.xml 20 Feb 2007 10:10:32 -0000 1.4
+++ cartridge.xml 5 Jul 2007 17:09:24 -0000 1.5
@@ -153,14 +153,6 @@
lastModifiedCheck="true"/>
<resource
- path="resources/configuration/facelets/*.xml"
- outputPattern="WEB-INF/{0}"
- outlet="configuration"
- overwrite="true"
- outputCondition="viewTypeIsFacelets"
- lastModifiedCheck="true"/>
-
- <resource
path="resources/configuration/adf/*.xml"
outputPattern="WEB-INF/{0}"
outlet="configuration"
1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-action.jspf.vsl
Index: view-action.jspf.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-action.jspf.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- view-action.jspf.vsl 3 Jul 2007 17:28:44 -0000 1.2
+++ view-action.jspf.vsl 5 Jul 2007 17:09:24 -0000 1.3
@@ -24,7 +24,7 @@
#else
#set ($clientValidation = $clientValidation && $action.validationRequired)
#set ($formValidateName = "validate$stringUtils.capitalize($formName)")
-<h:form id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end>
+<h:form id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end#if($view.needsFileUpload) usesUpload="true"#end>
#if (!$action.hiddenParameters.empty)
<jsp:directive.include file="${action.viewFragmentPath}-hidden-params.jspf"/>
#end
1.8 +14 -17 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl
Index: view.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- view.xhtml.vsl 3 Jul 2007 17:13:22 -0000 1.7
+++ view.xhtml.vsl 5 Jul 2007 17:09:25 -0000 1.8
@@ -82,9 +82,6 @@
#set ($layout = "/layout/layout.xhtml")
<ui:composition template="$layout">
- <ui:define name="usesUpload">
- <c:set var="usesUpload" value="${manageable.needsFileUpload}" scope="request"/>
- </ui:define>
<ui:define name="title">
<c:set var="title" value="#{messages['${manageable.viewTitleKey}']}" scope="request"/>
</ui:define>
@@ -93,7 +90,7 @@
## deixei false em função da discrepância com o uso do \ no javascript#set ($clientValidation = $clientValidation && $manageable.validationRequired)
#set ($clientValidation = false)
#set ($formValidateName = "validate$stringUtils.capitalize($formName)")
- <tr:subform id="${formName}_search" rendered="#{!${formName}.editState}">
+ <tr:form id="${formName}_search" rendered="#{!${formName}.editState}"#if($view.needsFileUpload) usesUpload="true"#end>
<tr:panelFormLayout>
#foreach ($field in $manageable.manageableSearchAttributes)
#renderSearchInput($field)
@@ -162,12 +159,12 @@
#end
#end
</tr:table>
- </tr:subform>
+ </tr:form>
<tr:group rendered="#{${formName}.editState}">
<tr:commandLink action="#{${manageable.controllerBeanName}.back}" accessKey="#{messages['action.back.access.key']}">
<t:graphicImage url="/skins/#{${preferencesBeanName}.skin}/images/back.gif" title="#{messages['action.back']}" border="0" />
</tr:commandLink>
- <tr:subform id="${formName}_edit" #if($clientValidation) onsubmit="return $formValidateName(this);"#end>
+ <tr:form id="${formName}_edit" #if($clientValidation) onsubmit="return $formValidateName(this);"#end#if($view.needsFileUpload) usesUpload="true"#end>
<tr:panelFormLayout>
#foreach ($field in $manageable.manageableAttributes)
#if($field.hidden)
@@ -221,7 +218,7 @@
</f:facet>
</tr:panelFormLayout>
<a:validator#if(!$clientValidation) client="false"#end/>
- </tr:subform>
+ </tr:form>
</tr:group>
</ui:define>
</ui:composition>
1.4 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl
Index: preferences.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- preferences.xhtml.vsl 12 Dec 2006 18:46:32 -0000 1.3
+++ preferences.xhtml.vsl 5 Jul 2007 17:09:25 -0000 1.4
@@ -11,7 +11,7 @@
<c:set var="title" value="#{messages['preferences.title']}" scope="request"/>
</ui:define>
<ui:define name="content">
- <tr:subform id="$preferencesBeanName">
+ <tr:form id="$preferencesBeanName">
<tr:panelFormLayout>
<tr:selectOneChoice id="menuTheme" value="#{${preferencesBeanName}.menuTheme}" label="#{messages['preferences.menu.theme']}:">
<f:selectItem itemLabel="Office" itemValue="ThemeOffice"/>
@@ -33,7 +33,7 @@
</tr:panelButtonBar>
</f:facet>
</tr:panelFormLayout>
- </tr:subform>
+ </tr:form>
</ui:define>
</ui:composition>
|
|
From: Chad B. <cwb...@us...> - 2007-07-03 17:28:43
|
User: cwbrandon
Date: 07/07/03 10:28:44
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes
view-action.jspf.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
view-action.xhtml.vsl
Log:
get rid of enctype (not used)
Revision Changes Path
1.2 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-action.jspf.vsl
Index: view-action.jspf.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-action.jspf.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-action.jspf.vsl 5 Dec 2006 19:39:16 -0000 1.1
+++ view-action.jspf.vsl 3 Jul 2007 17:28:44 -0000 1.2
@@ -24,7 +24,7 @@
#else
#set ($clientValidation = $clientValidation && $action.validationRequired)
#set ($formValidateName = "validate$stringUtils.capitalize($formName)")
-<h:form id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end enctype="multipart/form-data">
+<h:form id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end>
#if (!$action.hiddenParameters.empty)
<jsp:directive.include file="${action.viewFragmentPath}-hidden-params.jspf"/>
#end
1.2 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl
Index: view-action.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-action.xhtml.vsl 5 Dec 2006 19:39:14 -0000 1.1
+++ view-action.xhtml.vsl 3 Jul 2007 17:28:44 -0000 1.2
@@ -34,7 +34,7 @@
#else
#set ($clientValidation = $clientValidation && $action.validationRequired)
#set ($formValidateName = "validate$stringUtils.capitalize($formName)")
-<tr:subform id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end enctype="multipart/form-data">
+<tr:subform id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end>
#if (!$action.hiddenParameters.empty)
<ui:include src="${action.viewFragmentPath}-hidden-params.xhtml"/>
#end
|
|
From: Chad B. <cwb...@us...> - 2007-07-03 17:15:30
|
User: cwbrandon
Date: 07/07/03 10:15:32
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
layout.xhtml.vsl
Log:
indentation fix
Revision Changes Path
1.8 +2 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
Index: layout.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- layout.xhtml.vsl 3 Jul 2007 17:13:22 -0000 1.7
+++ layout.xhtml.vsl 3 Jul 2007 17:15:32 -0000 1.8
@@ -88,7 +88,7 @@
<ui:include src="footer.xhtml"/>
</ui:insert>
</f:facet>
-## using return ? don't forget to remove de return.xhtml
+## using return ? don't forget to remove the return.xhtml
## <f:facet name="infoReturn">
## <ui:insert name="return">
## <ui:include src="return.xhtml"/>
|
|
From: Chad B. <cwb...@us...> - 2007-07-03 17:13:21
|
User: cwbrandon
Date: 07/07/03 10:13:23
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud
view.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
layout.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
view.xhtml.vsl
Log:
get rid of tabs
Revision Changes Path
1.7 +57 -57 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl
Index: view.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
1.7 +6 -6 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
Index: layout.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
1.3 +4 -4 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view.xhtml.vsl
Index: view.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
|
|
From: Chad B. <cwb...@us...> - 2007-07-02 20:05:47
|
User: cwbrandon
Date: 07/07/02 13:05:47
Modified: . pom.xml
Log:
get rid of components in jsf2 cartridge
Revision Changes Path
1.13 +4 -5 cartridges/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/pom.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- pom.xml 16 Apr 2007 14:04:10 -0000 1.12
+++ pom.xml 2 Jul 2007 20:05:47 -0000 1.13
@@ -82,7 +82,6 @@
<module>andromda-nspring</module>
<module>andromda-aspdotnet</module>
<module>andromda-jsf2</module>
- <module>andromda-jsf2/components</module>
<module>andromda-seam</module>
</modules>
<properties>
|
|
From: Chad B. <cwb...@us...> - 2007-07-02 18:55:06
|
User: cwbrandon
Date: 07/07/02 11:55:01
Modified: andromda-jsf2/src/main/resources/templates/jsf2/utils
NavigationItem.java.vsl
andromda-jsf2/src/main/resources/templates/jsf2/configuration
validator-rules.xml.vsl web.xml.vsl
andromda-jsf2 pom.xml
Removed: andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/validator
JSFValidator.java ValidatorMessages.java
JSFValidatorException.java ParameterChecks.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/component
JSFValidatorComponent.java contenttypes.properties
BinaryFile.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/taglib
ConvertDateTimeTag.java JSFValidatorTag.java
BinaryFileTag.java PopupFrameTag.java
HtmlExtendedDataTableTag.java RoleAssociated.java
PermissionChecker.java
andromda-jsf2/components/src/main/resources/META-INF
jsf-taglib.tld faces-config.xml
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2
Constants.java Messages.java JSFServlet.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/component/html
HtmlPopupFrame.java HtmlExtendedDataTable.java
andromda-jsf2/components .project .classpath pom.xml
.cvsignore
andromda-jsf2/components/src/main/resources/popup/html
closePopup.jsf closePopupRefresh.jsf
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/converters
DateTimeConverter.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/utils
ComponentUtils.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/renderkit/html
PopupRenderer.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/renderkit
BinaryFileRenderer.java
andromda-jsf2/components/src/main/resources/popup/js
popup.js
Log:
Remove "components" and use the one from the regular jsf cartridge (so we don't duplicate more code). One from the regular jsf cartridge has a bunch of bug fixes not present in this "jsf2" components module as well.
Revision Changes Path
1.4 +175 -120 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/NavigationItem.java.vsl
Index: NavigationItem.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/NavigationItem.java.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NavigationItem.java.vsl 12 Feb 2007 18:57:28 -0000 1.3
+++ NavigationItem.java.vsl 2 Jul 2007 18:54:57 -0000 1.4
@@ -6,16 +6,13 @@
import java.util.List;
import java.lang.StringBuffer;
import org.apache.commons.beanutils.MethodUtils;
-import javax.servlet.http.HttpServletRequest;
/**
- *
* @author Leif Johansson
*/
public class $className
- implements java.io.Serializable, org.andromda.cartridges.jsf2.taglib.RoleAssociated
+ implements java.io.Serializable
{
-
private String label = null;
private String outcome = null;
private String viewId = null;
@@ -26,60 +23,74 @@
private String roles = null;
private String[] _roles = null;
- public NavigationItem() {}
+ public NavigationItem()
+ {}
- public String getLabel() {
+ public String getLabel()
+ {
return label;
}
- public void setLabel(String label) {
+ public void setLabel(String label)
+ {
this.label = label;
}
- public String getOutcome() {
+ public String getOutcome()
+ {
return outcome;
}
- public void setOutcome(String outcome) {
+ public void setOutcome(String outcome)
+ {
this.outcome = outcome;
}
- public String getViewId() {
+ public String getViewId()
+ {
return viewId;
}
- public void setViewId(String viewId) {
+ public void setViewId(String viewId)
+ {
this.viewId = viewId;
}
- public List getChildren() {
+ public List getChildren()
+ {
return children;
}
- public void setChildren(List children) {
+ public void setChildren(List children)
+ {
this.children = children;
}
- public String getIco() {
+ public String getIco()
+ {
return icon;
}
- public void setIco(String icon) {
+ public void setIco(String icon)
+ {
this.icon = icon;
}
- public String getRoles() {
+ public String getRoles()
+ {
return roles;
}
- private void _updateRoles() {
+ private void _updateRoles()
+ {
if (roles != null && roles.length() > 0)
_roles = roles.split(",");
else
_roles = null;
}
- public void setRoles(String roles) {
+ public void setRoles(String roles)
+ {
this.roles = roles;
_updateRoles();
}
@@ -91,37 +102,81 @@
public boolean isRendered()
{
- return org.andromda.cartridges.jsf2.taglib.PermissionChecker.isUserInItemRoles(this);
+ return this.isUserInItemRoles();
+ }
+
+ public boolean isUserInItemRoles()
+ {
+ String[] roles = this.getAssociatedRoles();
+
+ if (roles == null || roles.length == 0)
+ { // no constraints at all
+
+ return true;
+ }
+
+ javax.faces.context.ExternalContext ctx =
+ javax.faces.context.FacesContext.getCurrentInstance().getExternalContext();
+
+ if (ctx.getUserPrincipal() == null)
+ { // not logged in
+
+ return false;
+ }
+
+ for (int i = 0; i < roles.length; i++)
+ {
+ String role = roles[i];
+
+ if (ctx.isUserInRole(role))
+ {
+ return true;
+ }
+ }
+
+ return false;
}
- public String getAction() {
- try {
- return (java.lang.String)MethodUtils.invokeMethod(getControllerBean(),getControllerAction(),null);
- } catch (Exception ex) {
+ public String getAction()
+ {
+ try
+ {
+ return (java.lang.String)MethodUtils.invokeMethod(
+ getControllerBean(),
+ getControllerAction(),
+ null);
+ }
+ catch (Exception ex)
+ {
ex.printStackTrace();
return null;
}
}
- public void setControllerBean(Object controllerBean) {
+ public void setControllerBean(Object controllerBean)
+ {
this.controllerBean = controllerBean;
}
- public Object getControllerBean() {
+ public Object getControllerBean()
+ {
return controllerBean;
}
- public void setControllerAction(String controllerAction) {
+ public void setControllerAction(String controllerAction)
+ {
this.controllerAction = controllerAction;
}
- public String getControllerAction() {
+ public String getControllerAction()
+ {
return this.controllerAction;
}
- public String toString() {
+ public String toString()
+ {
StringBuffer buf = new StringBuffer();
- buf.append("NavigationItem[");
+ buf.append(this.getClass().getName() + "[");
buf.append("label=").append(label);
buf.append(",outcome=").append(outcome);
buf.append(",viewId=").append(viewId);
1.2 +51 -51 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/validator-rules.xml.vsl
Index: validator-rules.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/validator-rules.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- validator-rules.xml.vsl 5 Dec 2006 19:39:00 -0000 1.1
+++ validator-rules.xml.vsl 2 Jul 2007 18:54:59 -0000 1.2
@@ -6,7 +6,7 @@
<global>
<validator name="required"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateRequired"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -70,7 +70,7 @@
</validator>
<validator name="minlength"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateMinLength"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -115,7 +115,7 @@
</validator>
<validator name="maxlength"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateMaxLength"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -160,7 +160,7 @@
</validator>
<validator name="mask"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateMask"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -210,7 +210,7 @@
</validator>
<validator name="byte"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateByte"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -282,7 +282,7 @@
</validator>
<validator name="short"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateShort"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -357,7 +357,7 @@
</validator>
<validator name="integer"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateInteger"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -432,7 +432,7 @@
</validator>
<validator name="long"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateLong"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -506,7 +506,7 @@
</validator>
<validator name="float"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateDouble"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -584,7 +584,7 @@
</validator>
<validator name="equal"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateEqual"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -640,7 +640,7 @@
</validator>
<validator name="date"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateDate"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -795,7 +795,7 @@
</validator>
<validator name="time"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateTime"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -922,7 +922,7 @@
</validator>
<validator name="intRange"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateLongRange"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -973,7 +973,7 @@
</validator>
<validator name="floatRange"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateDoubleRange"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -1023,7 +1023,7 @@
</validator>
<validator name="creditCard"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateCreditCard"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -1102,7 +1102,7 @@
<validator name="email"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateEmail"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -1196,7 +1196,7 @@
</validator>
<validator name="url"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateUrl"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
1.9 +3 -12 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
Index: web.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- web.xml.vsl 21 Feb 2007 19:41:23 -0000 1.8
+++ web.xml.vsl 2 Jul 2007 18:54:59 -0000 1.9
@@ -33,15 +33,6 @@
<param-value>true</param-value>
</context-param>
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>
- /WEB-INF/tomahawk.taglib.xml;
- /WEB-INF/andromda.taglib.xml;
- <!-- facelets tag-lib merge-point -->
- </param-value>
- </context-param>
-
<!-- Trinidad has its own ViewHandler, which is a "decorating"
view handler - for example, it needs to wrap methods like renderView()
to perform some extra pre- and post-handling. Facelets, on the other
@@ -285,7 +276,7 @@
#end
<servlet>
<servlet-name>AndroMDA JSF Servlet</servlet-name>
- <servlet-class>org.andromda.cartridges.jsf2.JSFServlet</servlet-class>
+ <servlet-class>org.andromda.cartridges.jsf.JSFServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
1.7 +4 -11 cartridges/andromda-jsf2/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- pom.xml 29 Jun 2007 15:17:10 -0000 1.6
+++ pom.xml 2 Jul 2007 18:55:00 -0000 1.7
@@ -15,8 +15,8 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}-components</artifactId>
- <version>${pom.version}</version>
+ <artifactId>andromda-jsf-cartridge-components</artifactId>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -28,25 +28,18 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-cartridge-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.andromda.translationlibraries</groupId>
- <artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2</version>
- </dependency>
- </dependencies>
<configuration>
<artifacts>
<artifact>
<groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}-components</artifactId>
+ <artifactId>andromda-jsf-cartridge-components</artifactId>
<path>resources/WEB-INF/lib</path>
</artifact>
</artifacts>
|
|
From: Chad B. <cwb...@us...> - 2007-07-02 17:10:14
|
User: cwbrandon
Date: 07/07/02 10:10:15
Modified: andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
Controller.java.vsl
Log:
untabify
Revision Changes Path
1.8 +108 -108 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
Index: Controller.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
|
|
From: Walter M. <wal...@us...> - 2007-07-02 14:25:11
|
User: walterim
Date: 07/07/02 07:25:13
Modified: andromda-ejb3/src/site/fml faq.fml
Log:
FAQ update about ejb3+Manageable Entities
Revision Changes Path
1.8 +8 -0 cartridges/andromda-ejb3/src/site/fml/faq.fml
Index: faq.fml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/fml/faq.fml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- faq.fml 12 Feb 2007 02:37:31 -0000 1.7
+++ faq.fml 2 Jul 2007 14:25:12 -0000 1.8
@@ -136,5 +136,13 @@
</p>
</answer>
</faq>
+ <faq id="JSF_manageable_entities">
+ <question>Does ejb3 cartridge support Manageable Entities ?</question>
+ <answer>
+ <p>
+ Yes. The ejb3 cartidge can be used with the JSF2 cartridge to get full support to Manageable Entities.
+ </p>
+ </answer>
+ </faq>
</part>
</faqs>
|
