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...> - 2008-05-13 22:18:20
|
User: cwbrandon
Date: 08/05/13 15:18:27
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet
portlet.xml.vsl
Log:
get rid of unnecessary resource bundle reference
Revision Changes Path
1.6 +0 -2 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- portlet.xml.vsl 11 Apr 2008 22:59:21 -0000 1.5
+++ portlet.xml.vsl 13 May 2008 22:18:27 -0000 1.6
@@ -32,8 +32,6 @@
<portlet-mode>edit</portlet-mode>
<portlet-mode>help</portlet-mode>
</supports>
- <!--supported-locale>en</supported-locale>
- <resource-bundle>com.lighthousepmg.portlet.dental.msgconfig.resources.language.Language</resource-bundle-->
<portlet-info>
<title>$useCase.name</title>
<short-title>$useCase.name</short-title>
|
|
From: Walter M. <wal...@us...> - 2008-05-09 11:29:58
|
User: walterim
Date: 08/05/09 04:29:58
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration
web.xml.vsl
Log:
The Trinidad filter must be loaded before the myfaces extensions filter to keep the file upload working since the myfaces extensions filter changes the form type before the Trinidad processing.
Revision Changes Path
1.16 +9 -9 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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- web.xml.vsl 16 Apr 2008 20:39:02 -0000 1.15
+++ web.xml.vsl 9 May 2008 11:29:57 -0000 1.16
@@ -237,15 +237,6 @@
</filter>
#end
#end
- <filter-mapping>
- <filter-name>MyFaces Extensions Filter</filter-name>
- <url-pattern>*.${facesServletExtension}</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>MyFaces Extensions Filter</filter-name>
- <url-pattern>/faces/*</url-pattern>
- </filter-mapping>
-
#if ($standalone)
<!-- filter-mapping merge-point -->
<filter-mapping>
@@ -278,6 +269,15 @@
#end
#end
+ <filter-mapping>
+ <filter-name>MyFaces Extensions Filter</filter-name>
+ <url-pattern>*.${facesServletExtension}</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>MyFaces Extensions Filter</filter-name>
+ <url-pattern>/faces/*</url-pattern>
+ </filter-mapping>
+
<!-- Listener, that does all the startup work (configuration, init). -->
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
|
|
From: Chad B. <cwb...@us...> - 2008-05-08 23:02:59
|
User: cwbrandon
Date: 08/05/08 16:03:06
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet
PortletPhaseListener.java.vsl
Log:
only include referenced roles (not all defined in the application)
Revision Changes Path
1.29 +0 -3 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.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- cartridge.xml 2 May 2008 21:21:39 -0000 1.28
+++ cartridge.xml 8 May 2008 23:03:06 -0000 1.29
@@ -1145,9 +1145,6 @@
<modelElement variable="useCases">
<type name="org.andromda.metafacades.uml.FrontEndUseCase"/>
</modelElement>
- <modelElement variable="roles">
- <type name="org.andromda.metafacades.uml.Role"/>
- </modelElement>
</modelElements>
</template>
1.11 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl
Index: PortletPhaseListener.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- PortletPhaseListener.java.vsl 6 May 2008 18:49:48 -0000 1.10
+++ PortletPhaseListener.java.vsl 8 May 2008 23:03:06 -0000 1.11
@@ -20,7 +20,7 @@
final String viewId = this.getViewId(event);
if (viewId != null && event.getFacesContext() != null)
{
-#foreach ($role in $roles)
+#foreach ($role in $useCases.iterator().next().getAllRoles())
#set ($userIsInRoleName = "userIs${stringUtils.upperCamelCaseName($role.name.toLowerCase())}")
#set ($specializedRoles = $role.generalizedByActors)
final boolean $userIsInRoleName = event.getFacesContext().getExternalContext().isUserInRole("$role.name")
|
|
From: Chad B. <cwb...@us...> - 2008-05-06 21:55:13
|
User: cwbrandon
Date: 08/05/06 14:55:17
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
renderPortletActionFormInput.vm
Log:
make renderInputTable take the owner parameter into account
Revision Changes Path
1.6 +9 -4 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm
Index: renderPortletActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- renderPortletActionFormInput.vm 6 May 2008 14:43:06 -0000 1.5
+++ renderPortletActionFormInput.vm 6 May 2008 21:55:17 -0000 1.6
@@ -60,7 +60,7 @@
#elseif ($parameter.inputTextarea)
<h:inputTextarea id="$propertyId" value="#{${formValuePropertyName}}" required="$parameter.required" readonly="$parameter.readOnly"/>
#elseif ($parameter.inputTable)
-#renderInputTable($parameter)
+#renderInputTable($parameter $ownerParameter)
#elseif ($parameter.plainText)
<h:outputText value="#{${formValuePropertyName}}"/>
#elseif ($parameter.inputSecret)
@@ -96,14 +96,19 @@
##
## This macro renders an submittable input table
##
-#macro (renderInputTable $parameter)
- <a:dataTable id="$parameter.name"
+#macro (renderInputTable $parameter $ownerParameter)
+#set ($propertyId = $parameter.getFormPropertyId($ownerParameter))
+#set ($valuePropertyName = ${parameter.getFormPropertyName($ownerParameter)})
+#set ($backingListName = ${parameter.getBackingListName($ownerParameter)})
+#set ($backingValueName = ${parameter.getBackingValueName($ownerParameter)})
+#set ($formValuePropertyName = "${formName}.${valuePropertyName}")
+ <a:dataTable id="$propertyId"
columnClasses="list-column-center,list-column-right, list-column-center,list-column-right"
headerClass="list-header"
rowClasses="list-row"
styleClass="list-background"
backingValue="#{${backingValueName}}"
- value="#{${formName}.${parameter.name}}"
+ value="#{${formValuePropertyName}}"
identifierColumns="$parameter.inputTableIdentifierColumns"
var="item">
#foreach ($column in $parameter.tableColumns)
|
|
From: Chad B. <cwb...@us...> - 2008-05-06 18:49:47
|
User: cwbrandon
Date: 08/05/06 11:49:49
Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet
PortletPhaseListener.java.vsl
Log:
Minor improvement
Revision Changes Path
1.10 +2 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl
Index: PortletPhaseListener.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- PortletPhaseListener.java.vsl 30 Apr 2008 01:07:07 -0000 1.9
+++ PortletPhaseListener.java.vsl 6 May 2008 18:49:48 -0000 1.10
@@ -86,7 +86,8 @@
protected void handleAfterPhase(javax.faces.event.PhaseEvent event)
{
final String viewId = this.getViewId(event);
- if (javax.faces.event.PhaseId.INVOKE_APPLICATION.equals(event.getPhaseId()))
+ if (javax.faces.event.PhaseId.INVOKE_APPLICATION.equals(event.getPhaseId()) ||
+ javax.faces.event.PhaseId.APPLY_REQUEST_VALUES.equals(event.getPhaseId()))
{
this.populateView(event, viewId);
}
|
|
From: Chad B. <cwb...@us...> - 2008-05-06 14:43:09
|
User: cwbrandon
Date: 08/05/06 07:43:07
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
renderPortletActionFormInput.vm
Log:
make default layout for selectManyCheckbox pageDirection
Revision Changes Path
1.5 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm
Index: renderPortletActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- renderPortletActionFormInput.vm 6 May 2008 00:07:46 -0000 1.4
+++ renderPortletActionFormInput.vm 6 May 2008 14:43:06 -0000 1.5
@@ -46,7 +46,7 @@
#elseif ($parameter.inputFile)
<t:inputFileUpload id="$propertyId" value="#{${formValuePropertyName}}" storage="file" size="50" required="$parameter.required" readonly="$parameter.readOnly" styleClass="fileUploadInput"/>
#elseif ($parameter.inputMultibox)
- <h:selectManyCheckbox id="$propertyId" value="#{${formValuePropertyName}}" required="$parameter.required">
+ <h:selectManyCheckbox id="$propertyId" value="#{${formValuePropertyName}}" required="$parameter.required" layout="pageDirection">
<c:if test="${!empty ${backingListName}}">
<f:selectItems value="#{${backingListName}}" />
</c:if>
|
|
From: Chad B. <cwb...@us...> - 2008-05-06 00:07:40
|
User: cwbrandon
Date: 08/05/05 17:07:47
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
renderPortletActionFormInput.vm
Log:
don't render labels for hidden params
Revision Changes Path
1.4 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm
Index: renderPortletActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- renderPortletActionFormInput.vm 18 Apr 2008 21:56:33 -0000 1.3
+++ renderPortletActionFormInput.vm 6 May 2008 00:07:46 -0000 1.4
@@ -18,9 +18,9 @@
#set ($backingListName = ${parameter.getBackingListName($ownerParameter)})
#set ($backingValueName = ${parameter.getBackingValueName($ownerParameter)})
#end
- <h:outputLabel for="$propertyId" value="#{messages['$parameter.messageKey']}:" />
#set ($formValuePropertyName = "${formName}.${valuePropertyName}")
#if (!$parameter.table && !($parameter.inputHidden || $ownerParameter.inputHidden))
+ <h:outputLabel for="$propertyId" value="#{messages['$parameter.messageKey']}:" />
#if ($parameter.type.dateType)
#if ($parameter.readOnly)
<h:inputText id="$propertyId" value="#{${formValuePropertyName}}" readonly="true""/>
|
|
From: Chad B. <cwb...@us...> - 2008-05-02 21:21:35
|
User: cwbrandon
Date: 08/05/02 14:21:40
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-action.xhtml.vsl
Removed: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-hidden-parameters.xhtml.vsl
Log:
don't generate hidden parameters for portlets (they aren't needed)
Revision Changes Path
1.28 +0 -16 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.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- cartridge.xml 29 Apr 2008 19:22:12 -0000 1.27
+++ cartridge.xml 2 May 2008 21:21:39 -0000 1.28
@@ -1255,22 +1255,6 @@
</template>
<template
- path="templates/jsf2/views/portlet/view-hidden-parameters.xhtml.vsl"
- outputPattern="${action.viewFragmentPath}-hidden-params.xhtml"
- outlet="views"
- overwrite="true"
- outputCondition="portlet">
- <modelElements variable="action">
- <modelElement>
- <type name="org.andromda.metafacades.uml.FrontEndAction">
- <property name="tableLink">false</property>
- <property name="hiddenParameters"/>
- </type>
- </modelElement>
- </modelElements>
- </template>
-
- <template
path="templates/jsf2/views/portlet/view-popup.xhtml.vsl"
outputPattern="${view.path}.xhtml"
outlet="views"
1.8 +0 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-action.xhtml.vsl
Index: view-action.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-action.xhtml.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- view-action.xhtml.vsl 24 Apr 2008 18:14:22 -0000 1.7
+++ view-action.xhtml.vsl 2 May 2008 21:21:40 -0000 1.8
@@ -26,9 +26,6 @@
#set ($clientValidation = $clientValidation && $action.validationRequired)
#set ($formValidateName = "validate$stringUtils.capitalize($formName)")
<h:form id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end#if($action.needsFileUpload) enctype="multipart/form-data"#end>
-#if (!$action.hiddenParameters.empty)
- <ui:include src="${action.viewFragmentPath}-hidden-params.xhtml"/>
-#end
<h:panelGrid columns="2">
#foreach ($parameter in $action.parameters)
#if (!$parameter.complex || $parameter.type.enumeration)
|
|
From: Chad B. <cwb...@us...> - 2008-04-30 01:06:59
|
User: cwbrandon
Date: 08/04/29 18:07:07
Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet
PortletPhaseListener.java.vsl
Log:
get rid of some unnecessary code
Revision Changes Path
1.9 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl
Index: PortletPhaseListener.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- PortletPhaseListener.java.vsl 30 Apr 2008 01:05:54 -0000 1.8
+++ PortletPhaseListener.java.vsl 30 Apr 2008 01:07:07 -0000 1.9
@@ -28,7 +28,7 @@
|| event.getFacesContext().getExternalContext().isUserInRole("$specializedRole.name")
#end
;
- ((javax.portlet.PortletRequest)event.getFacesContext().getExternalContext().getRequest()).setAttribute("$userIsInRoleName", Boolean.valueOf($userIsInRoleName));
+ ((javax.portlet.PortletRequest)event.getFacesContext().getExternalContext().getRequest()).setAttribute("$userIsInRoleName", $userIsInRoleName);
#end
if (javax.faces.event.PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
{
|
|
From: Chad B. <cwb...@us...> - 2008-04-30 01:05:47
|
User: cwbrandon
Date: 08/04/29 18:05:55
Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet
PortletPhaseListener.java.vsl
Log:
move role logic up
Revision Changes Path
1.8 +5 -5 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl
Index: PortletPhaseListener.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- PortletPhaseListener.java.vsl 29 Apr 2008 19:03:25 -0000 1.7
+++ PortletPhaseListener.java.vsl 30 Apr 2008 01:05:54 -0000 1.8
@@ -20,8 +20,6 @@
final String viewId = this.getViewId(event);
if (viewId != null && event.getFacesContext() != null)
{
- if (javax.faces.event.PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
- {
#foreach ($role in $roles)
#set ($userIsInRoleName = "userIs${stringUtils.upperCamelCaseName($role.name.toLowerCase())}")
#set ($specializedRoles = $role.generalizedByActors)
@@ -32,6 +30,8 @@
;
((javax.portlet.PortletRequest)event.getFacesContext().getExternalContext().getRequest()).setAttribute("$userIsInRoleName", Boolean.valueOf($userIsInRoleName));
#end
+ if (javax.faces.event.PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
+ {
#foreach ($useCase in $useCases)
#set ($controller = $useCase.controller)
#set ($ifClause = "if")
|
|
From: Chad B. <cwb...@us...> - 2008-04-29 19:22:05
|
User: cwbrandon
Date: 08/04/29 12:22:12
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
Log:
add population of any roles to portlet phase listener
Revision Changes Path
1.27 +3 -0 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.26
retrieving revision 1.27
diff -u -w -r1.26 -r1.27
--- cartridge.xml 18 Apr 2008 21:25:09 -0000 1.26
+++ cartridge.xml 29 Apr 2008 19:22:12 -0000 1.27
@@ -1145,6 +1145,9 @@
<modelElement variable="useCases">
<type name="org.andromda.metafacades.uml.FrontEndUseCase"/>
</modelElement>
+ <modelElement variable="roles">
+ <type name="org.andromda.metafacades.uml.Role"/>
+ </modelElement>
</modelElements>
</template>
|
|
From: Chad B. <cwb...@us...> - 2008-04-29 19:03:23
|
User: cwbrandon
Date: 08/04/29 12:03:25
Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet
PortletPhaseListener.java.vsl
Log:
add population of any roles to portlet phase listener
Revision Changes Path
1.7 +10 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl
Index: PortletPhaseListener.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- PortletPhaseListener.java.vsl 7 Apr 2008 15:38:36 -0000 1.6
+++ PortletPhaseListener.java.vsl 29 Apr 2008 19:03:25 -0000 1.7
@@ -22,6 +22,16 @@
{
if (javax.faces.event.PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
{
+#foreach ($role in $roles)
+#set ($userIsInRoleName = "userIs${stringUtils.upperCamelCaseName($role.name.toLowerCase())}")
+#set ($specializedRoles = $role.generalizedByActors)
+ final boolean $userIsInRoleName = event.getFacesContext().getExternalContext().isUserInRole("$role.name")
+#foreach ($specializedRole in $role.generalizedByActors)
+ || event.getFacesContext().getExternalContext().isUserInRole("$specializedRole.name")
+#end
+ ;
+ ((javax.portlet.PortletRequest)event.getFacesContext().getExternalContext().getRequest()).setAttribute("$userIsInRoleName", Boolean.valueOf($userIsInRoleName));
+#end
#foreach ($useCase in $useCases)
#set ($controller = $useCase.controller)
#set ($ifClause = "if")
|
|
From: Chad B. <cwb...@us...> - 2008-04-28 16:25:06
|
User: cwbrandon
Date: 08/04/28 09:25:07
Modified: distribution/src/antrun copy-2-website.xml
Log:
don't copy m2 artifacts, deploy is now used
Revision Changes Path
1.3 +10 -20 plugins/distribution/src/antrun/copy-2-website.xml
Index: copy-2-website.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/distribution/src/antrun/copy-2-website.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- copy-2-website.xml 2 Oct 2006 13:35:14 -0000 1.2
+++ copy-2-website.xml 28 Apr 2008 16:25:07 -0000 1.3
@@ -40,16 +40,6 @@
<include name="andromda/**/*"/>
</fileset>
</copy>
- <echo>
- Copying M2 artifacts
- from ${maven2.repository}/org/andromda
- to ${website.dir}/maven2
- </echo>
- <copy todir="${website.dir}/maven2" preservelastmodified="true">
- <fileset dir="${maven2.repository}">
- <include name="org/andromda/**/*"/>
- </fileset>
- </copy>
<!--
<copy todir="${website.dir}/maven2/org/andromda/distributions" preservelastmodified="true">
<fileset dir="${distribution.output.directory}">
|
|
From: Chad B. <cwb...@us...> - 2008-04-28 16:07:02
|
User: cwbrandon
Date: 08/04/28 09:06:53
Modified: . pom.xml
Log:
fix distribution settings
Revision Changes Path
1.15 +6 -1 plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/pom.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- pom.xml 28 Mar 2008 18:33:37 -0000 1.14
+++ pom.xml 28 Apr 2008 16:06:53 -0000 1.15
@@ -205,7 +205,12 @@
<repository>
<id>andromda-repository</id>
<name>AndroMDA Repository</name>
- <url>scp://galaxy.andromda.org/var/www/andromda/maven2</url>
+ <url>file:/var/www/andromda/maven2</url>
+ <uniqueVersion>false</uniqueVersion>
</repository>
+ <site>
+ <id>website</id>
+ <url>file:/var/www/andromda/docs</url>
+ </site>
</distributionManagement>
</project>
\ No newline at end of file
|
|
From: Chad B. <cwb...@us...> - 2008-04-26 17:36:10
|
User: cwbrandon
Date: 08/04/26 10:36:15
Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFUseCaseLogicImpl.java JSFParameterLogicImpl.java
Log:
improve message resolution for attributes/association ends
Revision Changes Path
1.9 +66 -35 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.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- JSFUseCaseLogicImpl.java 7 Apr 2008 15:38:34 -0000 1.8
+++ JSFUseCaseLogicImpl.java 26 Apr 2008 17:36:15 -0000 1.9
@@ -162,41 +162,9 @@
{
final JSFParameter parameter = (JSFParameter)object;
- final Collection attributes = parameter.getAttributes();
- if (!attributes.isEmpty())
- {
- for (final Iterator iterator = attributes.iterator(); iterator.hasNext();)
- {
- final JSFAttribute attribute = (JSFAttribute)iterator.next();
- messages.put(
- attribute.getMessageKey(),
- attribute.getMessageValue());
- }
- }
- final Collection associationEnds = parameter.getNavigableAssociationEnds();
- if (!associationEnds.isEmpty())
- {
- for (final Iterator iterator = associationEnds.iterator(); iterator.hasNext();)
- {
- final AssociationEndFacade end = (AssociationEndFacade)iterator.next();
- final ClassifierFacade type = end.getType();
- if (type != null)
- {
- final Collection typeAttributes = type.getAttributes();
- if (!attributes.isEmpty())
- {
- for (final Iterator attributeIterator = typeAttributes.iterator();
- attributeIterator.hasNext();)
- {
- final JSFAttribute attribute = (JSFAttribute)attributeIterator.next();
- messages.put(
- attribute.getMessageKey(),
- attribute.getMessageValue());
- }
- }
- }
- }
- }
+ final Collection<ClassifierFacade> resolvingTypes = new ArrayList<ClassifierFacade>();
+ this.collectAttributeMessages(messages, parameter.getAttributes(), resolvingTypes);
+ this.collectAssociationEndMessages(messages, parameter.getNavigableAssociationEnds(), resolvingTypes);
messages.put(
parameter.getMessageKey(),
parameter.getMessageValue());
@@ -440,6 +408,69 @@
}
/**
+ * Collects all attribute messages into the given Map.
+ *
+ * @param messages the Map in which messags are collected.
+ * @param attributes the attributes to collect the messages from.
+ * @param resolvingTypes used to prevent endless recursion.
+ */
+ private void collectAttributeMessages(Map<String,String> messages, Collection attributes,
+ final Collection<ClassifierFacade> resolvingTypes)
+ {
+ if (attributes != null && !attributes.isEmpty())
+ {
+ for (final Iterator iterator = attributes.iterator(); iterator.hasNext();)
+ {
+ final JSFAttribute attribute = (JSFAttribute)iterator.next();
+ messages.put(
+ attribute.getMessageKey(),
+ attribute.getMessageValue());
+ // - lets go another level for nested attributes
+ this.collectTypeMessages(messages, attribute.getType(), resolvingTypes);
+ }
+ }
+ }
+
+ /**
+ * Collects all association end messages into the given Map.
+ *
+ * @param messages the Map in which messags are collected.
+ * @param associationEnds the association ends to collect the messages from.
+ * @param resolvingTypes used to prevent endless recursion.
+ */
+ private void collectAssociationEndMessages(Map<String,String> messages, Collection associationEnds,
+ final Collection<ClassifierFacade> resolvingTypes)
+ {
+ if (associationEnds != null && !associationEnds.isEmpty())
+ {
+ for (final Iterator iterator = associationEnds.iterator(); iterator.hasNext();)
+ {
+ final AssociationEndFacade end = (AssociationEndFacade)iterator.next();
+ this.collectTypeMessages(messages, end.getType(), resolvingTypes);
+ }
+ }
+ }
+
+ private void collectTypeMessages(Map<String,String> messages, ClassifierFacade type,
+ final Collection<ClassifierFacade> resolvingTypes)
+ {
+ if (type != null)
+ {
+ if (!resolvingTypes.contains(type))
+ {
+ resolvingTypes.add(type);
+ if (type.isArrayType())
+ {
+ type = type.getNonArray();
+ }
+ this.collectAttributeMessages(messages, type.getAttributes(), resolvingTypes);
+ this.collectAssociationEndMessages(messages, type.getNavigableConnectingEnds(), resolvingTypes);
+ }
+ resolvingTypes.remove(type);
+ }
+ }
+
+ /**
* @see org.andromda.cartridges.jsf2.metafacades.JSFUseCase#getActionForwards()
*/
protected List handleGetActionForwards()
1.4 +18 -4 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFParameterLogicImpl.java
Index: JSFParameterLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFParameterLogicImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- JSFParameterLogicImpl.java 27 Mar 2008 18:34:52 -0000 1.3
+++ JSFParameterLogicImpl.java 26 Apr 2008 17:36:15 -0000 1.4
@@ -896,11 +896,18 @@
protected Collection handleGetAttributes()
{
Collection attributes = null;
- final ClassifierFacade type = this.getType();
+ ClassifierFacade type = this.getType();
+ if (type != null)
+ {
+ if (type.isArrayType())
+ {
+ type = type.getNonArray();
+ }
if (type != null)
{
attributes = type.getAttributes(true);
}
+ }
return attributes == null ? Collections.EMPTY_LIST : attributes;
}
@@ -910,11 +917,18 @@
protected Collection handleGetNavigableAssociationEnds()
{
Collection associationEnds = null;
- final ClassifierFacade type = this.getType();
+ ClassifierFacade type = this.getType();
+ if (type != null)
+ {
+ if (type.isArrayType())
+ {
+ type = type.getNonArray();
+ }
if (type != null)
{
associationEnds = type.getNavigableConnectingEnds();
}
+ }
return associationEnds == null ? Collections.EMPTY_LIST : associationEnds;
}
|
|
From: Chad B. <cwb...@us...> - 2008-04-25 19:39:19
|
User: cwbrandon
Date: 08/04/25 12:39:22
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-table.xhtml.vsl
Log:
fix table empty check for pageable vs non-pageable tables
Revision Changes Path
1.10 +4 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl
Index: view-table.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- view-table.xhtml.vsl 18 Apr 2008 21:56:33 -0000 1.9
+++ view-table.xhtml.vsl 25 Apr 2008 19:39:22 -0000 1.10
@@ -40,7 +40,11 @@
<t:graphicImage url="/images/arrow-fr.gif"/>
</f:facet>
</t:dataScroller>
+#if ($table.pageableTable)
<c:set var="renderTable" value="#{${table.name} != null and !${table.name}['empty']}"/>
+#else
+ <c:set var="renderTable" value="#{!empty ${table.name}}"/>
+#end
<t:dataScroller id="${table.name}Scroller2"
for="$table.name"
rowsCountVar="rowsCount"
|
|
From: Chad B. <cwb...@us...> - 2008-04-25 15:27:21
|
User: cwbrandon
Date: 08/04/25 08:27:21
Added: andromda-jsf2/src/main/resources/resources/views/images
yes.gif
Log:
add yes image
Revision Changes Path
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/images/yes.gif
<<Binary file>>
|
|
From: Chad B. <cwb...@us...> - 2008-04-24 18:14:19
|
User: cwbrandon
Date: 08/04/24 11:14:22
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-action.xhtml.vsl
Log:
remove liferay specific tag inclusion
Revision Changes Path
1.7 +1 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-action.xhtml.vsl
Index: view-action.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-action.xhtml.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- view-action.xhtml.vsl 18 Apr 2008 21:56:33 -0000 1.6
+++ view-action.xhtml.vsl 24 Apr 2008 18:14:22 -0000 1.7
@@ -4,8 +4,7 @@
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/jsf"
- xmlns:lr="http://www.liferay.com/jsf/facelets">
+ xmlns:a="http://www.andromda.org/cartridges/jsf">
<ui:composition>
#set($formName = $action.formBeanName)
#if ($action.hyperlink || $action.popup)
|
|
From: Chad B. <cwb...@us...> - 2008-04-18 21:56:25
|
User: cwbrandon
Date: 08/04/18 14:56:33
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-action.xhtml.vsl
renderPortletActionFormInput.vm
view-table.xhtml.vsl
Log:
get rid of lr specific tags (for now)
Revision Changes Path
1.6 +2 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-action.xhtml.vsl
Index: view-action.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-action.xhtml.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- view-action.xhtml.vsl 15 Apr 2008 16:31:05 -0000 1.5
+++ view-action.xhtml.vsl 18 Apr 2008 21:56:33 -0000 1.6
@@ -42,9 +42,9 @@
#end
</h:panelGrid>
<h:panelGroup>
- <lr:commandButton value="#{messages['$action.messageKey']}" action="#{${action.controller.beanName}.${action.triggerName}}"/>
+ <h:commandButton value="#{messages['$action.messageKey']}" action="#{${action.controller.beanName}.${action.triggerName}}"/>
#if ($action.resettable)
- <lr:commandButton value="#{messages['$action.trigger.resetMessageKey']}" type="reset"/>
+ <h:commandButton value="#{messages['$action.trigger.resetMessageKey']}" type="reset"/>
#end
</h:panelGroup>
<a:validator#if(!$clientValidation) client="false"#end/>
1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm
Index: renderPortletActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- renderPortletActionFormInput.vm 9 Apr 2008 00:28:17 -0000 1.2
+++ renderPortletActionFormInput.vm 18 Apr 2008 21:56:33 -0000 1.3
@@ -18,7 +18,7 @@
#set ($backingListName = ${parameter.getBackingListName($ownerParameter)})
#set ($backingValueName = ${parameter.getBackingValueName($ownerParameter)})
#end
- <lr:formLabel value="#{messages['$parameter.messageKey']}:" />
+ <h:outputLabel for="$propertyId" value="#{messages['$parameter.messageKey']}:" />
#set ($formValuePropertyName = "${formName}.${valuePropertyName}")
#if (!$parameter.table && !($parameter.inputHidden || $ownerParameter.inputHidden))
#if ($parameter.type.dateType)
1.9 +7 -8 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl
Index: view-table.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- view-table.xhtml.vsl 10 Apr 2008 16:01:48 -0000 1.8
+++ view-table.xhtml.vsl 18 Apr 2008 21:56:33 -0000 1.9
@@ -4,14 +4,13 @@
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/jsf"
- xmlns:lr="http://www.liferay.com/jsf/facelets">
+ xmlns:a="http://www.andromda.org/cartridges/jsf">
<ui:composition>
<h:form>
#set ($targetColumns = $table.targettedTableColumnNames)
<h:panelGroup>
- <lr:portletScroller id="${table.name}Scroller1"
+ <t:dataScroller id="${table.name}Scroller1"
for="$table.name"
fastStep="10"
pageCountVar="pageCount"
@@ -40,9 +39,9 @@
<f:facet name="fastrewind">
<t:graphicImage url="/images/arrow-fr.gif"/>
</f:facet>
- </lr:portletScroller>
+ </t:dataScroller>
<c:set var="renderTable" value="#{${table.name} != null and !${table.name}['empty']}"/>
- <lr:portletScroller id="${table.name}Scroller2"
+ <t:dataScroller id="${table.name}Scroller2"
for="$table.name"
rowsCountVar="rowsCount"
displayedRowsCountVar="displayedRowsCountVar"
@@ -60,8 +59,8 @@
<f:param value="#{pageCount}" />
</h:outputFormat>
<h:outputText value="#{messages['table.results.none.found']}" rendered="#{${table.name} != null and !renderTable}"/>
- </lr:portletScroller>
- <lr:table value="#{${table.name}}" var="row" id="$table.name" sortable="true" rows="10" rendered="#{renderTable}">
+ </t:dataScroller>
+ <t:dataTable value="#{${table.name}}" var="row" id="$table.name" sortable="true" rows="10" rendered="#{renderTable}">
#if (!$table.tableColumns.empty)
#foreach ($column in $table.tableColumns)
#if($column.name)
@@ -123,7 +122,7 @@
</h:column>
#end
#end
- </lr:table>
+ </t:dataTable>
</h:panelGroup>
</h:form>
</ui:composition>
|
|
From: Chad B. <cwb...@us...> - 2008-04-18 21:25:05
|
User: cwbrandon
Date: 08/04/18 14:25:12
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml namespace.xml
Added: andromda-jsf2/src/main/resources/resources/lib/myfaces
tomahawk-1.1.7-SNAPSHOT.jar
andromda-jsf2/src/main/resources/templates/jsf2/utils/portlet
GenericFaceletsPortlet.java.vsl
andromda-jsf2/src/main/resources/resources/lib/portlet
jsf-facelets-portlet-1.1.14.jar
Log:
Add default portlet class
Revision Changes Path
1.26 +24 -0 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.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- cartridge.xml 16 Apr 2008 20:47:10 -0000 1.25
+++ cartridge.xml 18 Apr 2008 21:25:09 -0000 1.26
@@ -76,6 +76,7 @@
<property reference="portletContainer"/>
<property reference="portletClass"/>
<property reference="paginationResultClassName"/>
+ <property reference="defaultPortletClassName"/>
<!-- cartridge-property merge-point -->
@@ -168,6 +169,21 @@
outlet="custom-resources"
overwrite="false"/>
+ <resource
+ path="resources/lib/portlet/*.*"
+ outputPattern="WEB-INF/lib/{0}"
+ outlet="libraries"
+ overwrite="true"
+ lastModifiedCheck="true"
+ outputCondition="portlet"/>
+
+ <resource
+ path="resources/lib/myfaces/*.*"
+ outputPattern="WEB-INF/lib/{0}"
+ outlet="libraries"
+ overwrite="true"
+ lastModifiedCheck="true"/>
+
<!-- process templates on model elements -->
<template
path="templates/jsf2/configuration/web.xml.vsl"
@@ -1049,6 +1065,14 @@
<!-- portlet specific support templates start here -->
<template
+ path="templates/jsf2/utils/portlet/GenericFaceletsPortlet.java.vsl"
+ outputPattern="$stringUtils.replace($managedBeansPackage, '.', '/')/${className}.java"
+ outlet="managed-beans"
+ overwrite="true"
+ outputToSingleFile="true"
+ outputCondition="portlet"/>
+
+ <template
path="templates/jsf2/configuration/portlet/portlet.xml.vsl"
outputPattern="WEB-INF/portlet.xml"
outlet="configuration"
1.10 +7 -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.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- namespace.xml 16 Apr 2008 20:39:01 -0000 1.9
+++ namespace.xml 18 Apr 2008 21:25:09 -0000 1.10
@@ -308,11 +308,17 @@
</documentation>
</property>
<property name="portletClass" required="false">
- <default>com.liferay.portlet.jsf.GenericFaceletsPortlet</default>
+ <default>org.andromda.presentation.jsf2.GenericFaceletsPortlet</default>
<documentation>
The value of the portlet class in the portlet.xml
</documentation>
</property>
+ <property name="defaultPortletClassName" required="false">
+ <default>GenericFaceletsPortlet</default>
+ <documentation>
+ The name of the default portlet class to use.
+ </documentation>
+ </property>
</propertyGroup>
<propertyGroup name="Table Paging (DB paging)">
<documentation>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/lib/myfaces/tomahawk-1.1.7-SNAPSHOT.jar
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/portlet/GenericFaceletsPortlet.java.vsl
Index: GenericFaceletsPortlet.java.vsl
===================================================================
#set ($className = $defaultPortletClassName)
#if ($stringUtils.isNotEmpty($managedBeansPackage))
package $managedBeansPackage;
#end
import java.io.IOException;
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
import javax.faces.application.ViewHandler;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
import javax.portlet.PortletMode;
import javax.portlet.PortletSession;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.UnavailableException;
import org.apache.myfaces.context.servlet.ServletFacesContextImpl;
/**
* Extends the default {@link org.apache.myfaces.portlet.MyFacesGenericPortlet} instance to
* provide the necessary support for Facelets.
*
* @author Raymond Auge
* @author Joel Kozikowski
* @author Chad Brandon
*/
public class $className
extends org.apache.myfaces.portlet.MyFacesGenericPortlet
{
public static final String DEFAULT_VIEW_PARAM = "DEFAULT_VIEW_ID";
public void init() throws UnavailableException, PortletException
{
_editPage = this.getInitParameter("EditPage");
_helpPage = this.getInitParameter("HelpPage");
_viewPage = this.getInitParameter("ViewPage");
super.init();
}
public void render(RenderRequest req, RenderResponse res)
throws IOException, PortletException
{
PortletSession ses = req.getPortletSession();
PortletMode mode = (PortletMode)ses.getAttribute("CurrentPortletMode");
if (mode == null) {
mode = req.getPortletMode();
}
if (mode != req.getPortletMode()) {
req.setAttribute("isPortletModeChanged", Boolean.TRUE);
}
else {
req.setAttribute("isPortletModeChanged", Boolean.FALSE);
}
ses.setAttribute("CurrentPortletMode", mode);
super.render(req, res);
// - if we don't do this, the FacesContext.getCurrentInstance()
// will return null (at least in myfaces 1.1.5)
this.facesContext(req, res);
}
@Override
protected void setDefaultView() throws UnavailableException
{
defaultView = getPortletConfig().getInitParameter(DEFAULT_VIEW);
if (defaultView == null)
{
defaultView = _viewPage;
}
if (defaultView == null)
{
throw new UnavailableException(
"Default JSF view is not specified in portlet.xml");
}
}
protected void doEdit(RenderRequest req, RenderResponse res)
throws IOException, PortletException
{
Boolean isPortletModeChanged =
(Boolean)req.getAttribute("isPortletModeChanged");
if (isPortletModeChanged.booleanValue())
{
setPortletRequestFlag(req);
nonFacesRequest(req, res, _editPage);
return;
}
facesRender(req, res);
}
protected void doHelp(RenderRequest req, RenderResponse res)
throws IOException, PortletException
{
Boolean isPortletModeChanged =
(Boolean)req.getAttribute("isPortletModeChanged");
if (isPortletModeChanged.booleanValue()) {
setPortletRequestFlag(req);
nonFacesRequest(req, res, _helpPage);
return;
}
facesRender(req, res);
}
/**
* Overriden in order to save the VIEW_ID to the portlet session (the version in MyFacesGenericPortlet saves the
* viewId as a render parameter which is lost when executing another portlet). This should be fixed at some point
* in the {@link org.apache.myfaces.portlet.MyFacesGenericPortlet} code at which time this method can be removed.
*/
@Override
public void processAction(ActionRequest request, ActionResponse response)
throws PortletException, IOException
{
if (sessionTimedOut(request)) return;
setPortletRequestFlag(request);
FacesContext facesContext = facesContext(request, response);
try
{
lifecycle.execute(facesContext);
if (!facesContext.getResponseComplete())
{
request.getPortletSession().setAttribute(VIEW_ID, facesContext.getViewRoot().getViewId());
// This here below is what is in the MyFacesGenericPortlet implementation
// response.setRenderParameter(VIEW_ID, facesContext.getViewRoot().getViewId());
}
request.getPortletSession().setAttribute(CURRENT_FACES_CONTEXT, facesContext);
}
catch (Throwable e)
{
facesContext.release();
handleExceptionFromLifecycle(e);
}
finally
{
saveRequestAttributes(request);
}
}
/**
* Overridden in order to retrieve the VIEW_ID from the portlet session (instead of request.getParameter(VIEW_ID)
* as found in {@link org.apache.myfaces.portlet.MyFacesGenericPortlet}). When stored in the request, the VIEW_ID
* is lost when executing anything on another portlet instance. This should be fixed at some point
* in the {@link org.apache.myfaces.portlet.MyFacesGenericPortlet} code at which time this method can be removed.
*/
@Override
protected void facesRender(RenderRequest request, RenderResponse response)
throws PortletException, java.io.IOException
{
setContentType(request, response);
String viewId = request.getParameter(DEFAULT_VIEW_PARAM);
boolean restoreRequired = true;
if (viewId == null)
{
viewId = (String)request.getPortletSession().getAttribute(VIEW_ID);
}
else
{
// - since we're using an explicitly defined default view (we don't
// need to attempt to restore any previous attributes).
restoreRequired = false;
}
// This here below is what was in the MyFacesGenericPortlet implementation
// String viewId = request.getParameter(VIEW_ID);
if (viewId == null || sessionInvalidated(request))
{
setPortletRequestFlag(request);
nonFacesRequest(request, response);
return;
}
setPortletRequestFlag(request);
ServletFacesContextImpl facesContext = null;
try
{
facesContext = (ServletFacesContextImpl)request.getPortletSession().getAttribute(CURRENT_FACES_CONTEXT);
if (facesContext == null) // processAction was not called
{
facesContext = (ServletFacesContextImpl)facesContext(request, response);
setViewRootOnFacesContext(facesContext, viewId);
}
// TODO: not sure if this can happen. Also double check this against spec section 2.1.3
if (facesContext.getResponseComplete()) return;
facesContext.setExternalContext(makeExternalContext(request, response));
if (restoreRequired)
{
restoreRequestAttributes(request);
}
lifecycle.render(facesContext);
}
catch (Throwable e)
{
handleExceptionFromLifecycle(e);
}
}
// Set the view root on a FacesContext to prepare for rendering
private void setViewRootOnFacesContext(FacesContext facesContext, String view)
{
ApplicationFactory appFactory =
(ApplicationFactory)FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
Application application = appFactory.getApplication();
ViewHandler viewHandler = application.getViewHandler();
UIViewRoot viewRoot = viewHandler.createView(facesContext, view);
viewRoot.setViewId(view);
facesContext.setViewRoot(viewRoot);
}
private String _editPage = null;
private String _helpPage = null;
private String _viewPage = null;
}
1.1 cartridges/andromda-jsf2/src/main/resources/resources/lib/portlet/jsf-facelets-portlet-1.1.14.jar
<<Binary file>>
|
|
From: Chad B. <cwb...@us...> - 2008-04-18 21:24:07
|
User: cwbrandon Date: 08/04/18 14:24:12 cartridges/andromda-jsf2/src/main/resources/resources/lib/myfaces - New directory |
|
From: Chad B. <cwb...@us...> - 2008-04-18 21:24:06
|
User: cwbrandon Date: 08/04/18 14:24:13 cartridges/andromda-jsf2/src/main/resources/resources/lib/portlet - New directory |
|
From: Chad B. <cwb...@us...> - 2008-04-18 17:50:46
|
User: cwbrandon
Date: 08/04/18 10:50:52
Modified: . pom.xml
Log:
add jsf2 components to build
Revision Changes Path
1.14 +1 -0 cartridges/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/pom.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- pom.xml 2 Jul 2007 20:05:47 -0000 1.13
+++ pom.xml 18 Apr 2008 17:50:52 -0000 1.14
@@ -82,6 +82,7 @@
<module>andromda-nspring</module>
<module>andromda-aspdotnet</module>
<module>andromda-jsf2</module>
+ <module>andromda-jsf2/components</module>
<module>andromda-seam</module>
</modules>
<properties>
|
|
From: Leif J. <le...@us...> - 2008-04-17 20:41:46
|
User: leifj
Date: 08/04/17 13:41:52
Modified: andromda-jsf2/src/main/resources/templates/jsf2/forms
Form.java.vsl FormImpl.java.vsl
Log:
treat enumerations as non-complex types
Revision Changes Path
1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/Form.java.vsl
Index: Form.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/Form.java.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
1.4 +7 -5 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/FormImpl.java.vsl
Index: FormImpl.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/FormImpl.java.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- FormImpl.java.vsl 3 Apr 2008 22:26:26 -0000 1.3
+++ FormImpl.java.vsl 17 Apr 2008 20:41:51 -0000 1.4
@@ -12,7 +12,7 @@
public ${action.formImplementationName}()
{
#foreach ($field in $action.formFields)
-#if (!$field.complex)
+#if (!$field.complex || $field.type.enumeration)
#renderDateTimeFormatters($field "")
#end
#foreach ($attribute in $field.attributes)
@@ -42,7 +42,7 @@
*/
public $fieldTypeName ${field.getterName}()
{
-#if ($field.complex)
+#if ($field.complex && !$field.type.enumeration)
if (this.$field.name == null)
{
this.$field.name = new ${field.type.fullyQualifiedName}();
@@ -76,12 +76,14 @@
this.$field.name = $field.name;
this.$field.formAttributeSetProperty = true;
}
-#if (!$field.complex && !$field.defaultValuePresent)
+#if ( (!$field.complex && !$field.defaultValuePresent) || $field.type.enumeration)
#renderBackingListImplSupport($field "")
#end
+#if (!$field.type.enumeration)
#foreach ($attribute in $field.attributes)
#renderBackingListImplSupport($attribute $field)
#end
+#end
#end
#if ($action.formResetRequired)
@@ -94,7 +96,7 @@
#foreach($field in $action.parameters)
#if ($field.reset)
this.$field.name = $field.type.javaNullString;
-#elseif ($field.complex)
+#elseif ($field.complex && !$field.type.enumeration)
#foreach ($attribute in $field.type.getAttributes(true))
#if ($attribute.reset)
this.${field.name}.${attribute.setterName}($attribute.type.javaNullString);
|
|
From: Chad B. <cwb...@us...> - 2008-04-16 20:47:08
|
User: cwbrandon
Date: 08/04/16 13:47:10
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
Added: andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay
log4j.xml.vsl
Log:
add log4j.xml for liferay portlets
Revision Changes Path
1.25 +8 -0 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.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- cartridge.xml 16 Apr 2008 20:39:01 -0000 1.24
+++ cartridge.xml 16 Apr 2008 20:47:10 -0000 1.25
@@ -1102,6 +1102,14 @@
</template>
<template
+ path="templates/jsf2/configuration/portlet/liferay/log4j.xml.vsl"
+ outputPattern="WEB-INF/classes/log4j.xml"
+ outlet="custom-configuration"
+ overwrite="false"
+ outputToSingleFile="true"
+ outputCondition="liferayPortlet"/>
+
+ <template
path="templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl"
outputPattern="$stringUtils.replace($managedBeansPackage, '.', '/')/${className}.java"
outlet="managed-beans"
1.1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay/log4j.xml.vsl
Index: log4j.xml.vsl
===================================================================
<?xml version="1.0"?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n" />
</layout>
</appender>
<root>
<priority value="INFO" />
<appender-ref ref="CONSOLE" />
</root>
</log4j:configuration>
|
