Menu
▾
▴
[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet liferay-portlet.xml.vsl portlet.xml.vsl
|
From: Chad B. <cwb...@us...> - 2008-03-28 21:28:38
|
User: cwbrandon
Date: 08/03/28 14:28:42
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
help.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet
liferay-portlet.xml.vsl portlet.xml.vsl
Log:
improvements to help and edit generation
Revision Changes Path
1.18 +28 -10 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.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- cartridge.xml 28 Mar 2008 18:37:02 -0000 1.17
+++ cartridge.xml 28 Mar 2008 21:28:40 -0000 1.18
@@ -1053,11 +1053,9 @@
outputToSingleFile="true"
outputCondition="portlet"
outputOnEmptyElements="false">
- <modelElements>
- <modelElement variable="applicationUseCases">
- <type name="org.andromda.metafacades.uml.FrontEndUseCase">
- <property name="entryUseCase"/>
- </type>
+ <modelElements variable="useCases">
+ <modelElement>
+ <type name="org.andromda.metafacades.uml.FrontEndUseCase"/>
</modelElement>
</modelElements>
</template>
@@ -1067,7 +1065,15 @@
outputPattern="WEB-INF/liferay-portlet.xml"
outlet="configuration"
overwrite="true"
- outputCondition="liferayPortlet"/>
+ outputToSingleFile="true"
+ outputCondition="liferayPortlet"
+ outputOnEmptyElements="false">
+ <modelElements variable="useCases">
+ <modelElement>
+ <type name="org.andromda.metafacades.uml.FrontEndUseCase"/>
+ </modelElement>
+ </modelElements>
+ </template>
<template
path="templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl"
@@ -1088,17 +1094,29 @@
<template
path="templates/jsf2/views/portlet/help.xhtml.vsl"
- outputPattern="portlet-help.xhtml"
+ outputPattern="${useCase.pathRoot}/${jsfUtils.toWebResourceName($useCase.name)}-portlet-help.xhtml"
outlet="views"
overwrite="true"
- outputCondition="portlet"/>
+ outputCondition="portlet">
+ <modelElements variable="useCase">
+ <modelElement>
+ <type name="org.andromda.metafacades.uml.FrontEndUseCase"/>
+ </modelElement>
+ </modelElements>
+ </template>
<template
path="templates/jsf2/views/portlet/edit.xhtml.vsl"
- outputPattern="portlet-edit.xhtml"
+ outputPattern="${useCase.pathRoot}/${jsfUtils.toWebResourceName($useCase.name)}-portlet-edit.xhtml"
outlet="views"
overwrite="true"
- outputCondition="portlet"/>
+ outputCondition="portlet">
+ <modelElements variable="useCase">
+ <modelElement>
+ <type name="org.andromda.metafacades.uml.FrontEndUseCase"/>
+ </modelElement>
+ </modelElements>
+ </template>
<template
path="templates/jsf2/views/portlet/layout.xhtml.vsl"
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/help.xhtml.vsl
Index: help.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/help.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- help.xhtml.vsl 21 Mar 2008 16:07:11 -0000 1.1
+++ help.xhtml.vsl 28 Mar 2008 21:28:41 -0000 1.2
@@ -1,4 +1,4 @@
<div xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html">
-<strong><font size="4">Help with $applicationName</font></strong><br />
+<strong><font size="4">Help with $useCase.name</font></strong><br />
</div>
\ No newline at end of file
1.2 +3 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay-portlet.xml.vsl
Index: liferay-portlet.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay-portlet.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- liferay-portlet.xml.vsl 21 Mar 2008 16:07:13 -0000 1.1
+++ liferay-portlet.xml.vsl 28 Mar 2008 21:28:41 -0000 1.2
@@ -2,10 +2,12 @@
<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
<liferay-portlet-app>
+#foreach ($useCase in $useCases)
<portlet>
- <portlet-name>$jsfUtils.toWebResourceName($applicationName)</portlet-name>
+ <portlet-name>$jsfUtils.toWebResourceName($useCase.name)</portlet-name>
<instanceable>true</instanceable>
<header-css>/css/custom.css</header-css>
<header-javascript>/js/custom.js</header-javascript>
</portlet>
+#end
</liferay-portlet-app>
\ No newline at end of file
1.3 +11 -10 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/portlet.xml.vsl
Index: portlet.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/portlet.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- portlet.xml.vsl 28 Mar 2008 20:46:35 -0000 1.2
+++ portlet.xml.vsl 28 Mar 2008 21:28:42 -0000 1.3
@@ -2,22 +2,22 @@
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-#set ($useCase = $applicationUseCases.iterator().next())
+#foreach ($useCase in $useCases)
<portlet>
- <portlet-name>$jsfUtils.toWebResourceName($applicationName)</portlet-name>
- <display-name>$applicationName</display-name>
+ <portlet-name>$jsfUtils.toWebResourceName($useCase.name)</portlet-name>
+ <display-name>$useCase.name</display-name>
<portlet-class>$portletClass</portlet-class>
<init-param>
<name>EditPage</name>
- <value>/portlet-edit.xhtml</value>
+ <value>${useCase.pathRoot}/${jsfUtils.toWebResourceName($useCase.name)}-portlet-edit.xhtml</value>
</init-param>
<init-param>
<name>HelpPage</name>
- <value>/portlet-help.xhtml</value>
+ <value>${useCase.pathRoot}/${jsfUtils.toWebResourceName($useCase.name)}-portlet-help.xhtml</value>
</init-param>
<init-param>
<name>ViewPage</name>
- <value>${$useCase.initialTargetPath}.xhtml</value>
+ <value>${useCase.initialTargetPath}.xhtml</value>
</init-param>
<supports>
<mime-type>text/html</mime-type>
@@ -27,9 +27,9 @@
<!--supported-locale>en</supported-locale>
<resource-bundle>com.lighthousepmg.portlet.dental.msgconfig.resources.language.Language</resource-bundle-->
<portlet-info>
- <title>$applicationName</title>
- <short-title>$applicationName</short-title>
- <keywords>$applicationName</keywords>
+ <title>$useCase.name</title>
+ <short-title>$useCase.name</short-title>
+ <keywords>$useCase.name</keywords>
</portlet-info>
#if ($useCase.preferences)
<portlet-preferences>
@@ -45,4 +45,5 @@
</portlet-preferences>
#end
</portlet>
+#end
</portlet-app>
|
