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-04-16 20:39:02
|
User: cwbrandon
Date: 08/04/16 13:39:03
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml namespace.xml
andromda-jsf2/src/main/resources/templates/jsf2/configuration
web.xml.vsl
Added: andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay
liferay-portlet.xml.vsl
portlet-config.properties.vsl
andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay/permissions
resource-actions.xml.vsl
Removed: andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet
liferay-portlet.xml.vsl
Log:
add permissions and portlet-config file for liferay portlets
Revision Changes Path
1.24 +24 -1 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.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- cartridge.xml 8 Apr 2008 17:55:41 -0000 1.23
+++ cartridge.xml 16 Apr 2008 20:39:01 -0000 1.24
@@ -1064,7 +1064,7 @@
</template>
<template
- path="templates/jsf2/configuration/portlet/liferay-portlet.xml.vsl"
+ path="templates/jsf2/configuration/portlet/liferay/liferay-portlet.xml.vsl"
outputPattern="WEB-INF/liferay-portlet.xml"
outlet="configuration"
overwrite="true"
@@ -1079,6 +1079,29 @@
</template>
<template
+ path="templates/jsf2/configuration/portlet/liferay/portlet-config.properties.vsl"
+ outputPattern="WEB-INF/classes/portlet-config.properties"
+ outlet="configuration"
+ overwrite="true"
+ outputToSingleFile="true"
+ outputCondition="liferayPortlet"/>
+
+ <template
+ path="templates/jsf2/configuration/portlet/liferay/permissions/resource-actions.xml.vsl"
+ outputPattern="WEB-INF/classes/permissions/resource-actions.xml"
+ outlet="custom-configuration"
+ overwrite="false"
+ 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"
outputPattern="$stringUtils.replace($managedBeansPackage, '.', '/')/${className}.java"
outlet="managed-beans"
1.9 +5 -0 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.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- namespace.xml 27 Mar 2008 18:34:45 -0000 1.8
+++ namespace.xml 16 Apr 2008 20:39:01 -0000 1.9
@@ -24,6 +24,11 @@
that typically appear in WEB-INF, such as faces-config.xml and validation-rules.xml, etc.
</documentation>
</property>
+ <property name="custom-configuration" required="false">
+ <documentation>
+ The location to which any customizable configuration files are generated.
+ </documentation>
+ </property>
<property name="custom-resources" required="false">
<documentation>
The location to which any customizable resources will be generated.
1.1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay/liferay-portlet.xml.vsl
Index: liferay-portlet.xml.vsl
===================================================================
<?xml version="1.0"?>
<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.4.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_4_0.dtd">
<liferay-portlet-app>
#foreach ($useCase in $useCases)
<portlet>
<portlet-name>$jsfUtils.toWebResourceName($useCase.name)</portlet-name>
<instanceable>true</instanceable>
<header-portlet-css>/css/custom.css</header-portlet-css>
<header-portlet-javascript>/js/custom.js</header-portlet-javascript>
<css-class-wrapper>$jsfUtils.toWebResourceName($useCase.name)</css-class-wrapper>
</portlet>
#end
</liferay-portlet-app>
1.1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay/portlet-config.properties.vsl
Index: portlet-config.properties.vsl
===================================================================
language.bundle=message-resources
resource.actions.configs=permissions/resource-actions.xml
1.15 +7 -0 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.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- web.xml.vsl 15 Apr 2008 16:31:38 -0000 1.14
+++ web.xml.vsl 16 Apr 2008 20:39:02 -0000 1.15
@@ -158,6 +158,13 @@
<param-value>true</param-value>
</context-param>
+#if ($liferayPortlet)
+ <context-param>
+ <param-name>portlet_properties</param-name>
+ <param-value>portlet-config.properties</param-value>
+ </context-param>
+
+#end
<!-- context-param merge-point -->
<!-- filter merge-point -->
#if ($securityEnabled && !$roles.empty)
1.1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay/permissions/resource-actions.xml.vsl
Index: resource-actions.xml.vsl
===================================================================
<?xml version="1.0"?>
<resource-action-mapping>
#foreach ($useCase in $useCases)
<portlet-resource>
<portlet-name>$jsfUtils.toWebResourceName($useCase.name)</portlet-name>
<supports>
<action-key>VIEW</action-key>
<action-key>CONFIGURATION</action-key>
</supports>
<community-defaults/>
<guest-defaults/>
<guest-unsupported/>
</portlet-resource>
#end
</resource-action-mapping>
|
|
From: Chad B. <cwb...@us...> - 2008-04-16 20:38:52
|
User: cwbrandon Date: 08/04/16 13:38:56 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay/permissions - New directory |
|
From: Chad B. <cwb...@us...> - 2008-04-16 20:38:51
|
User: cwbrandon Date: 08/04/16 13:38:56 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet/liferay - New directory |
|
From: Chad B. <cwb...@us...> - 2008-04-15 21:42:50
|
User: cwbrandon
Date: 08/04/15 14:42:55
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet
liferay-portlet.xml.vsl
Log:
update for liferay 4.4
Revision Changes Path
1.3 +4 -3 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- liferay-portlet.xml.vsl 28 Mar 2008 21:28:41 -0000 1.2
+++ liferay-portlet.xml.vsl 15 Apr 2008 21:42:54 -0000 1.3
@@ -1,13 +1,14 @@
<?xml version="1.0"?>
-<!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">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.4.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_4_0.dtd">
<liferay-portlet-app>
#foreach ($useCase in $useCases)
<portlet>
<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>
+ <header-portlet-css>/css/custom.css</header-portlet-css>
+ <header-portlet-javascript>/js/custom.js</header-portlet-javascript>
+ <css-class-wrapper>$jsfUtils.toWebResourceName($useCase.name)</css-class-wrapper>
</portlet>
#end
</liferay-portlet-app>
\ No newline at end of file
|
|
From: Chad B. <cwb...@us...> - 2008-04-15 16:31:37
|
User: cwbrandon
Date: 08/04/15 09:31:38
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration
web.xml.vsl
Log:
update ExtensionsFilter class to org.apache.myfaces.webapp.filter.ExtensionsFilter
Revision Changes Path
1.14 +1 -1 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.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- web.xml.vsl 11 Apr 2008 22:59:21 -0000 1.13
+++ web.xml.vsl 15 Apr 2008 16:31:38 -0000 1.14
@@ -169,7 +169,7 @@
<!-- Extensions Filter -->
<filter>
<filter-name>MyFaces Extensions Filter</filter-name>
- <filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class>
+ <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
<init-param>
<description>
Set the size limit for uploaded files.
|
|
From: Chad B. <cwb...@us...> - 2008-04-15 16:31:12
|
User: cwbrandon
Date: 08/04/15 09:31:05
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-action.xhtml.vsl
Log:
remove commented code
Revision Changes Path
1.5 +0 -8 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- view-action.xhtml.vsl 11 Apr 2008 15:54:05 -0000 1.4
+++ view-action.xhtml.vsl 15 Apr 2008 16:31:05 -0000 1.5
@@ -16,14 +16,6 @@
<a:popup scrolling="yes" height="350px" width="550px" actionOpen="#{${action.controller.beanName}.${action.triggerName}}" center="false">
#end
<h:outputText value="#{messages['$action.messageKey']}"/>
-##foreach ($parameter in $action.parameters)
-##if (!$parameter.complex || $parameter.type.enumeration)
-##renderActionCommandLinkParameter($parameter "")
-##end
-##foreach ($attribute in $parameter.attributes)
-##renderActionCommandLinkParameter($attribute $parameter)
-##end
-##end
#if ($action.hyperlink)
</h:commandLink>
#else
|
|
From: Chad B. <cwb...@us...> - 2008-04-11 22:59:16
|
User: cwbrandon
Date: 08/04/11 15:59:21
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration
web.xml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/configuration/portlet
portlet.xml.vsl
Log:
add support for all tomahawk components with portlets
Revision Changes Path
1.13 +32 -13 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.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- web.xml.vsl 21 Mar 2008 16:07:13 -0000 1.12
+++ web.xml.vsl 11 Apr 2008 22:59:21 -0000 1.13
@@ -98,9 +98,24 @@
better choice than the standard JSF server-side state saving.
</description>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+#if ($standalone)
<param-value>$stateSavingMethod</param-value>
+#else
+ <param-value>server</param-value>
+#end
</context-param>
+#if ($portlet)
+ <context-param>
+ <description>
+ Set the custom AddResource class that allows the myfaces resources to be written into portlet pages without
+ requiring the head tag, etc.
+ </description>
+ <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
+ <param-value>org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.AddResource</param-value>
+ </context-param>
+
+#end
<context-param>
<description>
This parameter tells MyFaces if javascript code should be allowed in the
@@ -142,6 +157,7 @@
<param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
<param-value>true</param-value>
</context-param>
+
<!-- context-param merge-point -->
<!-- filter merge-point -->
#if ($securityEnabled && !$roles.empty)
@@ -150,13 +166,6 @@
<filter-class>${managedBeansPackage}.UserRoleFilter</filter-class>
</filter>
#end
-#if ($standalone)
- <!-- Trinidad Filter -->
- <filter>
- <filter-name>Trinidad Filter</filter-name>
- <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
- </filter>
-
<!-- Extensions Filter -->
<filter>
<filter-name>MyFaces Extensions Filter</filter-name>
@@ -195,6 +204,14 @@
</init-param>
-->
</filter>
+
+#if ($standalone)
+ <!-- Trinidad Filter -->
+ <filter>
+ <filter-name>Trinidad Filter</filter-name>
+ <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
+ </filter>
+
#foreach ($useCase in $useCases)
#foreach ($view in $useCase.views)
#if ($view.populatorRequired)
@@ -212,19 +229,21 @@
<filter-class>$manageable.populatorType</filter-class>
</filter>
#end
-
- <!-- filter-mapping merge-point -->
+#end
<filter-mapping>
- <filter-name>Trinidad Filter</filter-name>
+ <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>*.${facesServletExtension}</url-pattern>
+ <url-pattern>/faces/*</url-pattern>
</filter-mapping>
+
+#if ($standalone)
+ <!-- filter-mapping merge-point -->
<filter-mapping>
- <filter-name>MyFaces Extensions Filter</filter-name>
- <url-pattern>/faces/myFacesExtensionResource/*</url-pattern>
+ <filter-name>Trinidad Filter</filter-name>
+ <url-pattern>*.${facesServletExtension}</url-pattern>
</filter-mapping>
#if ($securityEnabled && !$roles.empty)
1.5 +9 -1 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- portlet.xml.vsl 29 Mar 2008 00:05:32 -0000 1.4
+++ portlet.xml.vsl 11 Apr 2008 22:59:21 -0000 1.5
@@ -6,7 +6,15 @@
<portlet>
<portlet-name>$jsfUtils.toWebResourceName($useCase.name)</portlet-name>
<display-name>$useCase.name</display-name>
- <portlet-class>$portletClass</portlet-class>
+ <portlet-class>org.apache.portals.bridges.portletfilter.FilterPortlet</portlet-class>
+ <init-param>
+ <name>portlet-class</name>
+ <value>$portletClass</value>
+ </init-param>
+ <init-param>
+ <name>portlet-filters</name>
+ <value>org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.ExtensionsPortletFilter</value>
+ </init-param>
<init-param>
<name>EditPage</name>
<value>${useCase.portletEditPath}.xhtml</value>
|
|
From: Chad B. <cwb...@us...> - 2008-04-11 22:58:12
|
User: cwbrandon
Date: 08/04/11 15:58:18
Modified: andromda-jsf2/src/main/resources/resources/views/css
custom.css
Log:
fix comment
Revision Changes Path
1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/resources/views/css/custom.css
Index: custom.css
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/resources/views/css/custom.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- custom.css 2 Mar 2008 20:59:16 -0000 1.2
+++ custom.css 11 Apr 2008 22:58:18 -0000 1.3
@@ -1 +1 @@
-/** Add any custom styles (to be used across skins) to this css **/
+/** Add any custom styles to this css **/
|
|
From: Chad B. <cwb...@us...> - 2008-04-11 22:57:12
|
User: cwbrandon
Date: 08/04/11 15:57:13
Modified: andromda-jsf2/components pom.xml
Log:
typo
Revision Changes Path
1.4 +1 -1 cartridges/andromda-jsf2/components/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/components/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- pom.xml 11 Apr 2008 22:56:49 -0000 1.3
+++ pom.xml 11 Apr 2008 22:57:12 -0000 1.4
@@ -12,7 +12,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>AndroMDA JSF2 Cartridge Components</name>
- <description>Constains custom JSF2 components used by the JSF2 cartridge.</description>
+ <description>Contains custom JSF2 components used by the JSF2 cartridge.</description>
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
|
|
From: Chad B. <cwb...@us...> - 2008-04-11 22:56:42
|
User: cwbrandon
Date: 08/04/11 15:56:49
Added: andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support
HttpServletRequestWrapper.java
ExtensionsResponseWrapper.java
MockHttpServletRequest.java
ServletOutputStreamWrapper.java
MultipartRequest.java ServletContextWrapper.java
HttpServletResponseWrapper.java
HttpSessionWrapper.java
MultipartPortletRequestWrapper.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk
AddResource.java ExtensionsPortletFilter.java
andromda-jsf2/components pom.xml
Log:
add jsf2 components (that has some tomahawk portlet specific support at this point).
Revision Changes Path
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support/HttpServletRequestWrapper.java
Index: HttpServletRequestWrapper.java
===================================================================
package org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.support;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
import javax.portlet.PortalContext;
import javax.portlet.PortletContext;
import javax.portlet.PortletMode;
import javax.portlet.PortletPreferences;
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
import javax.portlet.WindowState;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletInputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
/**
* This class is a dummy HttpServletRequest.
*
* @author <a href="mailto:shi...@ya...">Shinsuke Sugaya</a>
* @author Chad Brandon
*/
public class HttpServletRequestWrapper
implements HttpServletRequest
{
private PortletRequest portletRequest;
private PortletContext portletContext;
public HttpServletRequestWrapper(
PortletRequest portletRequest,
PortletContext portletContext)
{
this.portletRequest = portletRequest;
this.portletContext = portletContext;
}
public String getAuthType()
{
return portletRequest.getAuthType();
}
public String getContextPath()
{
return portletRequest.getContextPath();
}
public Cookie[] getCookies()
{
return null;
}
public long getDateHeader(String dateHeader)
{
return 0;
}
public String getHeader(String header)
{
return null;
}
public Enumeration getHeaderNames()
{
return null;
}
public Enumeration getHeaders(String arg0)
{
return null;
}
public int getIntHeader(String arg0)
{
return 0;
}
public String getMethod()
{
return null;
}
public String getPathInfo()
{
return null;
}
public String getPathTranslated()
{
return null;
}
public String getQueryString()
{
return null;
}
public String getRemoteUser()
{
return portletRequest.getRemoteUser();
}
public String getRequestedSessionId()
{
return portletRequest.getRequestedSessionId();
}
public String getRequestURI()
{
return null;
}
public StringBuffer getRequestURL()
{
return null;
}
public String getServletPath()
{
return null;
}
public HttpSession getSession()
{
return new HttpSessionWrapper(portletRequest.getPortletSession(),
this.portletContext);
}
public HttpSession getSession(boolean create)
{
return new HttpSessionWrapper(portletRequest.getPortletSession(create),
this.portletContext);
}
public Principal getUserPrincipal()
{
return portletRequest.getUserPrincipal();
}
public boolean isRequestedSessionIdFromCookie()
{
return false;
}
public boolean isRequestedSessionIdFromUrl()
{
return false;
}
public boolean isRequestedSessionIdFromURL()
{
return false;
}
public boolean isRequestedSessionIdValid()
{
return portletRequest.isRequestedSessionIdValid();
}
public boolean isUserInRole(String arg0)
{
return portletRequest.isUserInRole(arg0);
}
public Object getAttribute(String arg0)
{
return portletRequest.getAttribute(arg0);
}
public Enumeration getAttributeNames()
{
return portletRequest.getAttributeNames();
}
public String getCharacterEncoding()
{
return null;
}
public int getContentLength()
{
return 0;
}
public String getContentType()
{
return null;
}
public ServletInputStream getInputStream() throws IOException
{
return null;
}
public Locale getLocale()
{
return portletRequest.getLocale();
}
public Enumeration getLocales()
{
return portletRequest.getLocales();
}
public String getParameter(String arg0)
{
return portletRequest.getParameter(arg0);
}
public Map getParameterMap()
{
return portletRequest.getParameterMap();
}
public Enumeration getParameterNames()
{
return portletRequest.getParameterNames();
}
public String[] getParameterValues(String arg0)
{
return portletRequest.getParameterValues(arg0);
}
public String getProtocol()
{
return null;
}
public BufferedReader getReader() throws IOException
{
return null;
}
public String getRealPath(String arg0)
{
return null;
}
public String getRemoteAddr()
{
return null;
}
public String getRemoteHost()
{
return null;
}
public RequestDispatcher getRequestDispatcher(String arg0)
{
return null;
}
public String getScheme()
{
return portletRequest.getScheme();
}
public String getServerName()
{
return portletRequest.getServerName();
}
public int getServerPort()
{
return portletRequest.getServerPort();
}
public boolean isSecure()
{
return portletRequest.isSecure();
}
public void removeAttribute(String arg0)
{
portletRequest.removeAttribute(arg0);
}
public void setAttribute(String arg0, Object arg1)
{
portletRequest.setAttribute(arg0, arg1);
}
public void setCharacterEncoding(String encoding) throws UnsupportedEncodingException
{
}
public PortalContext getPortalContext()
{
return portletRequest.getPortalContext();
}
public PortletMode getPortletMode()
{
return portletRequest.getPortletMode();
}
public PortletSession getPortletSession()
{
return portletRequest.getPortletSession();
}
public PortletSession getPortletSession(boolean create)
{
return portletRequest.getPortletSession(create);
}
public PortletPreferences getPreferences()
{
return portletRequest.getPreferences();
}
public Enumeration getProperties(String arg0)
{
return portletRequest.getProperties(arg0);
}
public String getProperty(String arg0)
{
return portletRequest.getProperty(arg0);
}
public Enumeration getPropertyNames()
{
return portletRequest.getPropertyNames();
}
public String getResponseContentType()
{
return portletRequest.getResponseContentType();
}
public Enumeration getResponseContentTypes()
{
return portletRequest.getResponseContentTypes();
}
public WindowState getWindowState()
{
return portletRequest.getWindowState();
}
public boolean isPortletModeAllowed(PortletMode portletMode)
{
return portletRequest.isPortletModeAllowed(portletMode);
}
public boolean isWindowStateAllowed(WindowState windowState)
{
return portletRequest.isWindowStateAllowed(windowState);
}
public int getRemotePort()
{
return 0;
}
public String getLocalName()
{
return null;
}
public String getLocalAddr()
{
return null;
}
public int getLocalPort()
{
return 0;
}
}
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support/ExtensionsResponseWrapper.java
Index: ExtensionsResponseWrapper.java
===================================================================
package org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.support;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.util.Locale;
import javax.portlet.PortletURL;
import javax.portlet.RenderResponse;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import org.xml.sax.InputSource;
/**
* @author Sylvain Vieujot (latest modification by $Author: cwbrandon $)
* @author Chad Brandon
*/
public class ExtensionsResponseWrapper
extends HttpServletResponseWrapper
implements RenderResponse
{
private ByteArrayOutputStream stream = null;
private PrintWriter printWriter = null;
private String contentType;
private RenderResponse response;
public ExtensionsResponseWrapper(
HttpServletResponse servletResponse,
RenderResponse response)
{
super(servletResponse);
this.response = response;
stream = new ByteArrayOutputStream();
}
public byte[] getBytes()
{
return stream.toByteArray();
}
public String toString()
{
try
{
return this.stream.toString(getCharacterEncoding());
}
catch (UnsupportedEncodingException e)
{
// an attempt to set an invalid character encoding would have caused
// this exception before
throw new RuntimeException("Response accepted invalid character encoding "
+ getCharacterEncoding());
}
}
/**
* This method is used by Tomcat.
*
* @throws IOException
*/
public PrintWriter getWriter()
{
if (printWriter == null)
{
OutputStreamWriter streamWriter = new OutputStreamWriter(this.stream, Charset.forName(getCharacterEncoding()));
printWriter = new PrintWriter(streamWriter, true);
}
return printWriter;
}
/**
* This method is used by Jetty.
*
* @throws IOException
*/
public ServletOutputStream getOutputStream() throws IOException
{
return new MyServletOutputStream(this.stream);
}
public InputSource getInputSource()
{
ByteArrayInputStream bais = new ByteArrayInputStream(stream.toByteArray());
return new InputSource(bais);
}
/**
* Prevent content-length being set as the page might be modified.
*/
public void setContentLength(int contentLength)
{
}
public void setContentType(String contentType)
{
super.setContentType(contentType);
this.contentType = contentType;
}
public String getContentType()
{
return contentType;
}
public void flushBuffer() throws IOException
{
this.stream.flush();
}
public void finishResponse()
{
try
{
if (printWriter != null)
{
printWriter.close();
}
else
{
if (this.stream != null)
{
this.stream.close();
}
}
}
catch (IOException e)
{
}
}
/**
* Used in the <code>getOutputStream()</code> method.
*/
private class MyServletOutputStream
extends ServletOutputStream
{
private OutputStream outputStream;
public MyServletOutputStream(
OutputStream outputStream)
{
this.outputStream = outputStream;
}
public void write(int b) throws IOException
{
outputStream.write(b);
}
public void write(byte[] bytes) throws IOException
{
outputStream.write(bytes);
}
public void write(byte[] bytes, int off, int len) throws IOException
{
outputStream.write(bytes, off, len);
}
}
public PortletURL createActionURL()
{
return this.response.createActionURL();
}
public PortletURL createRenderURL()
{
return this.response.createRenderURL();
}
public int getBufferSize()
{
return this.response.getBufferSize();
}
public String getCharacterEncoding()
{
return this.response.getCharacterEncoding();
}
public Locale getLocale()
{
return this.response.getLocale();
}
public String getNamespace()
{
return this.response.getNamespace();
}
public OutputStream getPortletOutputStream() throws IOException
{
return this.stream;
}
public boolean isCommitted()
{
return this.response.isCommitted();
}
public void reset()
{
this.response.reset();
}
public void resetBuffer()
{
this.response.resetBuffer();
}
public void setBufferSize(int bufferSize)
{
this.response.setBufferSize(bufferSize);
}
public void setTitle(String title)
{
this.response.setTitle(title);
}
public void addProperty(String arg0, String arg1)
{
this.response.addProperty(arg0, arg1);
}
public String encodeURL(String arg0)
{
return this.response.encodeURL(arg0);
}
public void setProperty(String arg0, String arg1)
{
this.response.setProperty(arg0, arg1);
}
}
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support/MockHttpServletRequest.java
Index: MockHttpServletRequest.java
===================================================================
package org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.support;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletInputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
public class MockHttpServletRequest
implements HttpServletRequest
{
public String getAuthType()
{
return null;
}
public String getContextPath()
{
return null;
}
public Cookie[] getCookies()
{
return null;
}
public long getDateHeader(String arg0)
{
return 0;
}
public String getHeader(String arg0)
{
return null;
}
public Enumeration getHeaderNames()
{
return null;
}
public Enumeration getHeaders(String arg0)
{
return null;
}
public int getIntHeader(String arg0)
{
return 0;
}
public String getMethod()
{
return null;
}
public String getPathInfo()
{
return null;
}
public String getPathTranslated()
{
return null;
}
public String getQueryString()
{
return null;
}
public String getRemoteUser()
{
return null;
}
public String getRequestURI()
{
return null;
}
public StringBuffer getRequestURL()
{
return null;
}
public String getRequestedSessionId()
{
return null;
}
public String getServletPath()
{
return null;
}
public HttpSession getSession()
{
return null;
}
public HttpSession getSession(boolean arg0)
{
return null;
}
public Principal getUserPrincipal()
{
return null;
}
public boolean isRequestedSessionIdFromCookie()
{
return false;
}
public boolean isRequestedSessionIdFromURL()
{
return false;
}
public boolean isRequestedSessionIdFromUrl()
{
return false;
}
public boolean isRequestedSessionIdValid()
{
return false;
}
public boolean isUserInRole(String arg0)
{
return false;
}
public Object getAttribute(String arg0)
{
return null;
}
public Enumeration getAttributeNames()
{
return null;
}
public String getCharacterEncoding()
{
return null;
}
public int getContentLength()
{
return 0;
}
public String getContentType()
{
return null;
}
public ServletInputStream getInputStream() throws IOException
{
return null;
}
public String getLocalAddr()
{
return null;
}
public String getLocalName()
{
return null;
}
public int getLocalPort()
{
return 0;
}
public Locale getLocale()
{
return null;
}
public Enumeration getLocales()
{
return null;
}
public String getParameter(String arg0)
{
return null;
}
public Map getParameterMap()
{
return null;
}
public Enumeration getParameterNames()
{
return null;
}
public String[] getParameterValues(String arg0)
{
return null;
}
public String getProtocol()
{
return null;
}
public BufferedReader getReader() throws IOException
{
return null;
}
public String getRealPath(String arg0)
{
return null;
}
public String getRemoteAddr()
{
return null;
}
public String getRemoteHost()
{
return null;
}
public int getRemotePort()
{
return 0;
}
public RequestDispatcher getRequestDispatcher(String arg0)
{
return null;
}
public String getScheme()
{
return null;
}
public String getServerName()
{
return null;
}
public int getServerPort()
{
return 0;
}
public boolean isSecure()
{
return false;
}
public void removeAttribute(String arg0)
{
}
public void setAttribute(String arg0, Object arg1)
{
}
public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException
{
}
}
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support/ServletOutputStreamWrapper.java
Index: ServletOutputStreamWrapper.java
===================================================================
package org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.support;
import java.io.CharConversionException;
import java.io.IOException;
import java.io.OutputStream;
import java.text.MessageFormat;
import javax.servlet.ServletOutputStream;
/**
* This class is a dummy ServletOutputStream.
*
* @author <a href="mailto:shi...@ya...">Shinsuke Sugaya</a>
*
*/
public class ServletOutputStreamWrapper extends ServletOutputStream {
private OutputStream outputStream;
public ServletOutputStreamWrapper(OutputStream outputStream) {
this.outputStream = outputStream;
}
/**
* Writes a <code>String</code> to the client, without a carriage
* return-line feed (CRLF) character at the end.
*
*
* @param s
* the <code>String</code> to send to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void print(String s) throws IOException {
if (s == null)
s = "null";
int len = s.length();
for (int i = 0; i < len; i++) {
char c = s.charAt(i);
//
// XXX NOTE: This is clearly incorrect for many strings,
// but is the only consistent approach within the current
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
//
if ((c & 0xff00) != 0) { // high order byte must be zero
String errMsg = "Not an ISO 8859-1 character: {0}";
Object[] errArgs = new Object[1];
errArgs[0] = new Character(c);
errMsg = MessageFormat.format(errMsg, errArgs);
throw new CharConversionException(errMsg);
}
write(c);
}
}
/**
* Writes a <code>boolean</code> value to the client, with no carriage
* return-line feed (CRLF) character at the end.
*
* @param b
* the <code>boolean</code> value to send to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void print(boolean b) throws IOException {
String msg;
if (b) {
msg = "true";
} else {
msg = "false";
}
print(msg);
}
/**
* Writes a character to the client, with no carriage return-line feed
* (CRLF) at the end.
*
* @param c
* the character to send to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void print(char c) throws IOException {
print(String.valueOf(c));
}
/**
*
* Writes an int to the client, with no carriage return-line feed (CRLF) at
* the end.
*
* @param i
* the int to send to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void print(int i) throws IOException {
print(String.valueOf(i));
}
/**
*
* Writes a <code>long</code> value to the client, with no carriage
* return-line feed (CRLF) at the end.
*
* @param l
* the <code>long</code> value to send to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void print(long l) throws IOException {
print(String.valueOf(l));
}
/**
*
* Writes a <code>float</code> value to the client, with no carriage
* return-line feed (CRLF) at the end.
*
* @param f
* the <code>float</code> value to send to the client
*
* @exception IOException
* if an input or output exception occurred
*
*
*/
public void print(float f) throws IOException {
print(String.valueOf(f));
}
/**
*
* Writes a <code>double</code> value to the client, with no carriage
* return-line feed (CRLF) at the end.
*
* @param d
* the <code>double</code> value to send to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void print(double d) throws IOException {
print(String.valueOf(d));
}
/**
* Writes a carriage return-line feed (CRLF) to the client.
*
*
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void println() throws IOException {
print("\r\n");
}
/**
* Writes a <code>String</code> to the client, followed by a carriage
* return-line feed (CRLF).
*
*
* @param s
* the <code>String</code> to write to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void println(String s) throws IOException {
print(s);
println();
}
/**
*
* Writes a <code>boolean</code> value to the client, followed by a
* carriage return-line feed (CRLF).
*
*
* @param b
* the <code>boolean</code> value to write to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void println(boolean b) throws IOException {
print(b);
println();
}
/**
*
* Writes a character to the client, followed by a carriage return-line feed
* (CRLF).
*
* @param c
* the character to write to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void println(char c) throws IOException {
print(c);
println();
}
/**
*
* Writes an int to the client, followed by a carriage return-line feed
* (CRLF) character.
*
*
* @param i
* the int to write to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void println(int i) throws IOException {
print(i);
println();
}
/**
*
* Writes a <code>long</code> value to the client, followed by a carriage
* return-line feed (CRLF).
*
*
* @param l
* the <code>long</code> value to write to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void println(long l) throws IOException {
print(l);
println();
}
/**
*
* Writes a <code>float</code> value to the client, followed by a carriage
* return-line feed (CRLF).
*
* @param f
* the <code>float</code> value to write to the client
*
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void println(float f) throws IOException {
print(f);
println();
}
/**
*
* Writes a <code>double</code> value to the client, followed by a
* carriage return-line feed (CRLF).
*
*
* @param d
* the <code>double</code> value to write to the client
*
* @exception IOException
* if an input or output exception occurred
*
*/
public void println(double d) throws IOException {
print(d);
println();
}
/*
* (non-Javadoc)
*
* @see java.io.OutputStream#write(int)
*/
public void write(int b) throws IOException {
outputStream.write(b);
}
/*
* (non-Javadoc)
*
* @see java.io.OutputStream#close()
*/
public void close() throws IOException {
outputStream.close();
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
public boolean equals(Object obj) {
return outputStream.equals(obj);
}
/*
* (non-Javadoc)
*
* @see java.io.OutputStream#flush()
*/
public void flush() throws IOException {
outputStream.flush();
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
public int hashCode() {
return outputStream.hashCode();
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
public String toString() {
return outputStream.toString();
}
/*
* (non-Javadoc)
*
* @see java.io.OutputStream#write(byte[], int, int)
*/
public void write(byte[] b, int off, int len) throws IOException {
outputStream.write(b, off, len);
}
/*
* (non-Javadoc)
*
* @see java.io.OutputStream#write(byte[])
*/
public void write(byte[] b) throws IOException {
outputStream.write(b);
}
}
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support/MultipartRequest.java
Index: MultipartRequest.java
===================================================================
package org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.support;
import java.util.Map;
import org.apache.commons.fileupload.FileItem;
/**
* This interface handles the multpart request for inputFileUpload components.
*
* @author <a href="mailto:shi...@ya...">Shinsuke Sugaya</a>
*/
public interface MultipartRequest {
// Hook for the t:inputFileUpload tag.
public abstract FileItem getFileItem(String fieldName);
/**
* Not used internaly by MyFaces, but provides a way to handle the uploaded
* files out of MyFaces.
*/
public abstract Map getFileItems();
}
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support/ServletContextWrapper.java
Index: ServletContextWrapper.java
===================================================================
package org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.support;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
import java.util.Set;
import javax.portlet.PortletContext;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
public class ServletContextWrapper implements ServletContext {
private PortletContext portletContext;
public ServletContextWrapper(PortletContext portletContext) {
this.portletContext = portletContext;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getAttribute(java.lang.String)
*/
public Object getAttribute(String arg0) {
return portletContext.getAttribute(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getAttributeNames()
*/
public Enumeration getAttributeNames() {
return portletContext.getAttributeNames();
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getContext(java.lang.String)
*/
public ServletContext getContext(String arg0) {
// TODO Portlet API does not have this method
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getInitParameter(java.lang.String)
*/
public String getInitParameter(String arg0) {
return portletContext.getInitParameter(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getInitParameterNames()
*/
public Enumeration getInitParameterNames() {
return portletContext.getInitParameterNames();
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getMajorVersion()
*/
public int getMajorVersion() {
return portletContext.getMajorVersion();
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getMimeType(java.lang.String)
*/
public String getMimeType(String arg0) {
return portletContext.getMimeType(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getMinorVersion()
*/
public int getMinorVersion() {
return portletContext.getMinorVersion();
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getNamedDispatcher(java.lang.String)
*/
public RequestDispatcher getNamedDispatcher(String arg0) {
// TODO Portlet API does not have this method
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getRealPath(java.lang.String)
*/
public String getRealPath(String arg0) {
return portletContext.getRealPath(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getRequestDispatcher(java.lang.String)
*/
public RequestDispatcher getRequestDispatcher(String arg0) {
// TODO Portlet API does not have this method
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getResource(java.lang.String)
*/
public URL getResource(String arg0) throws MalformedURLException {
return portletContext.getResource(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getResourceAsStream(java.lang.String)
*/
public InputStream getResourceAsStream(String arg0) {
return portletContext.getResourceAsStream(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getResourcePaths(java.lang.String)
*/
public Set getResourcePaths(String arg0) {
return portletContext.getResourcePaths(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getServerInfo()
*/
public String getServerInfo() {
return portletContext.getServerInfo();
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getServlet(java.lang.String)
*/
public Servlet getServlet(String arg0) throws ServletException {
// TODO Portlet API does not have this method
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getServletContextName()
*/
public String getServletContextName() {
return portletContext.getPortletContextName();
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getServletNames()
*/
public Enumeration getServletNames() {
// TODO Portlet API does not have this method
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#getServlets()
*/
public Enumeration getServlets() {
// TODO Portlet API does not have this method
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#log(java.lang.Exception,
* java.lang.String)
*/
public void log(Exception arg0, String arg1) {
portletContext.log(arg1, new Exception(arg0));
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#log(java.lang.String,
* java.lang.Throwable)
*/
public void log(String arg0, Throwable arg1) {
portletContext.log(arg0, arg1);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#log(java.lang.String)
*/
public void log(String arg0) {
portletContext.log(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#removeAttribute(java.lang.String)
*/
public void removeAttribute(String arg0) {
portletContext.removeAttribute(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletContext#setAttribute(java.lang.String,
* java.lang.Object)
*/
public void setAttribute(String arg0, Object arg1) {
portletContext.setAttribute(arg0, arg1);
}
}
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support/HttpServletResponseWrapper.java
Index: HttpServletResponseWrapper.java
===================================================================
package org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.support;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.Locale;
import javax.portlet.PortletURL;
import javax.portlet.RenderResponse;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
/**
* This class is a dummy HttpServletResponse.
*
* @author <a href="mailto:shi...@ya...">Shinsuke Sugaya</a>
*/
public class HttpServletResponseWrapper
implements HttpServletResponse, RenderResponse
{
private RenderResponse renderResponse;
public HttpServletResponseWrapper(
RenderResponse renderResponse)
{
this.renderResponse = renderResponse;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponseWrapper#getWriter()
*/
public PrintWriter getWriter() throws IOException
{
return this.renderResponse.getWriter();
}
/**
* Returns writer to which MyFaces' AddResource stores elements.
*
* @return writer which has elements, such as <script> and
* <link> public StringWriter getStringWriter() { return
* (StringWriter) writer; }
*/
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#flushBuffer()
*/
public void flushBuffer() throws IOException
{
if (renderResponse != null)
{
renderResponse.flushBuffer();
}
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#getBufferSize()
*/
public int getBufferSize()
{
if (renderResponse != null)
{
return renderResponse.getBufferSize();
}
return 0;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#getCharacterEncoding()
*/
public String getCharacterEncoding()
{
if (renderResponse != null)
{
return renderResponse.getCharacterEncoding();
}
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#getLocale()
*/
public Locale getLocale()
{
if (renderResponse != null)
{
return renderResponse.getLocale();
}
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#getOutputStream()
*/
public ServletOutputStream getOutputStream() throws IOException
{
if (renderResponse != null)
{
return new ServletOutputStreamWrapper(renderResponse.getPortletOutputStream());
}
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#isCommitted()
*/
public boolean isCommitted()
{
if (renderResponse != null)
{
return renderResponse.isCommitted();
}
return false;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#reset()
*/
public void reset()
{
if (renderResponse != null)
{
renderResponse.reset();
}
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#resetBuffer()
*/
public void resetBuffer()
{
if (renderResponse != null)
{
renderResponse.resetBuffer();
}
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#setBufferSize(int)
*/
public void setBufferSize(int arg0)
{
renderResponse.setBufferSize(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#setContentLength(int)
*/
public void setContentLength(int arg0)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#setContentType(java.lang.String)
*/
public void setContentType(String arg0)
{
if (renderResponse != null)
{
renderResponse.setContentType(arg0);
}
}
/*
* (non-Javadoc)
*
* @see javax.servlet.ServletResponse#setLocale(java.util.Locale)
*/
public void setLocale(Locale arg0)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#addCookie(javax.servlet.http.Cookie)
*/
public void addCookie(Cookie arg0)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#addDateHeader(java.lang.String,
* long)
*/
public void addDateHeader(String arg0, long arg1)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#addHeader(java.lang.String,
* java.lang.String)
*/
public void addHeader(String arg0, String arg1)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#addIntHeader(java.lang.String,
* int)
*/
public void addIntHeader(String arg0, int arg1)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#containsHeader(java.lang.String)
*/
public boolean containsHeader(String arg0)
{
return false;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#encodeRedirectUrl(java.lang.String)
*/
public String encodeRedirectUrl(String arg0)
{
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#encodeRedirectURL(java.lang.String)
*/
public String encodeRedirectURL(String arg0)
{
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#encodeUrl(java.lang.String)
*/
public String encodeUrl(String arg0)
{
if (renderResponse != null)
{
return renderResponse.encodeURL(arg0);
}
return null;
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#encodeURL(java.lang.String)
*/
public String encodeURL(String arg0)
{
return renderResponse.encodeURL(arg0);
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#sendError(int,
* java.lang.String)
*/
public void sendError(int arg0, String arg1) throws IOException
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#sendError(int)
*/
public void sendError(int arg0) throws IOException
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#sendRedirect(java.lang.String)
*/
public void sendRedirect(String arg0) throws IOException
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#setDateHeader(java.lang.String,
* long)
*/
public void setDateHeader(String arg0, long arg1)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#setHeader(java.lang.String,
* java.lang.String)
*/
public void setHeader(String arg0, String arg1)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#setIntHeader(java.lang.String,
* int)
*/
public void setIntHeader(String arg0, int arg1)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#setStatus(int,
* java.lang.String)
*/
public void setStatus(int arg0, String arg1)
{
}
/*
* (non-Javadoc)
*
* @see javax.servlet.http.HttpServletResponse#setStatus(int)
*/
public void setStatus(int arg0)
{
}
/*
* (non-Javadoc)
*
* @see javax.portlet.PortletResponse#addProperty(java.lang.String,
* java.lang.String)
*/
public void addProperty(String arg0, String arg1)
{
renderResponse.addProperty(arg0, arg1);
}
/*
* (non-Javadoc)
*
* @see javax.portlet.PortletResponse#setProperty(java.lang.String,
* java.lang.String)
*/
public void setProperty(String arg0, String arg1)
{
renderResponse.setProperty(arg0, arg1);
}
public String getContentType()
{
if (renderResponse != null)
{
return renderResponse.getContentType();
}
return null;
}
public void setCharacterEncoding(String arg0)
{
}
/*
* (non-Javadoc)
*
* @see javax.portlet.RenderResponse#createActionURL()
*/
public PortletURL createActionURL()
{
return this.renderResponse.createActionURL();
}
/*
* (non-Javadoc)
*
* @see javax.portlet.RenderResponse#createRenderURL()
*/
public PortletURL createRenderURL()
{
return this.createRenderURL();
}
/*
* (non-Javadoc)
*
* @see javax.portlet.RenderResponse#getNamespace()
*/
public String getNamespace()
{
return this.getNamespace();
}
/*
* (non-Javadoc)
*
* @see javax.portlet.RenderResponse#getPortletOutputStream()
*/
public OutputStream getPortletOutputStream() throws IOException
{
return this.getPortletOutputStream();
}
/*
* (non-Javadoc)
*
* @see javax.portlet.RenderResponse#setTitle(java.lang.String)
*/
public void setTitle(String title)
{
this.renderResponse.setTitle(title);
}
}
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support/HttpSessionWrapper.java
Index: HttpSessionWrapper.java
===================================================================
package org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.support;
import java.util.ArrayList;
import java.util.Enumeration;
import javax.portlet.PortletContext;
import javax.portlet.PortletSession;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
/**
* This class is a dummy HttpSessionWrapper.
*
* @author <a href="mailto:shi...@ya...">Shinsuke Sugaya</a>
*/
public class HttpSessionWrapper
implements HttpSession
{
private PortletSession portletSession;
private PortletContext portletContext;
public HttpSessionWrapper(
PortletSession portletSession,
PortletContext portletContext)
{
this.portletSession = portletSession;
this.portletContext = portletContext;
}
public long getCreationTime()
{
return portletSession.getCreationTime();
}
public String getId()
{
return portletSession.getId();
}
public long getLastAccessedTime()
{
return portletSession.getLastAccessedTime();
}
public ServletContext getServletContext()
{
return new ServletContextWrapper(portletContext);
}
public void setMaxInactiveInterval(int arg0)
{
portletSession.setMaxInactiveInterval(arg0);
}
public int getMaxInactiveInterval()
{
return portletSession.getMaxInactiveInterval();
}
public HttpSessionContext getSessionContext()
{
// TODO Portlet API does not have this method
return null;
}
public Object getAttribute(String arg0)
{
return portletSession.getAttribute(arg0);
}
public Object getValue(String arg0)
{
return portletSession.getAttribute(arg0);
}
public Enumeration getAttributeNames()
{
return portletSession.getAttributeNames();
}
public String[] getValueNames()
{
ArrayList objs = new ArrayList();
for (Enumeration e = portletSession.getAttributeNames(); e.hasMoreElements();)
{
String key = (String)e.nextElement();
objs.add(key);
}
String[] values = new String[objs.size()];
for (int i = 0; i < objs.size(); i++)
{
values[i] = (String)objs.get(i);
}
return values;
}
public void setAttribute(String arg0, Object arg1)
{
portletSession.setAttribute(arg0, arg1);
}
public void putValue(String arg0, Object arg1)
{
portletSession.setAttribute(arg0, arg1);
}
public void removeAttribute(String arg0)
{
portletSession.removeAttribute(arg0);
}
public void removeValue(String arg0)
{
portletSession.removeAttribute(arg0);
}
public void invalidate()
{
portletSession.invalidate();
}
public boolean isNew()
{
return portletSession.isNew();
}
}
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support/MultipartPortletRequestWrapper.java
Index: MultipartPortletRequestWrapper.java
===================================================================
package org.andromda.cartridges.jsf2.portlet.myfaces.tomahawk.support;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.security.Principal;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.portlet.ActionRequest;
import javax.portlet.PortalContext;
import javax.portlet.PortletMode;
import javax.portlet.PortletPreferences;
import javax.portlet.PortletSession;
import javax.portlet.WindowState;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadBase;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.portlet.PortletFileUpload;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.webapp.filter.MultipartRequestWrapper;
/**
* This class handles multipart/form-date request for Portlet. It will be called
* if the request is multipart/form-data.
*
* @author <a href="mailto:shi...@ya...">Shinsuke Sugaya</a>
* @author Sylvain Vieujot
*/
public class MultipartPortletRequestWrapper
implements ActionRequest, MultipartRequest
{
private static Log log = LogFactory.getLog(MultipartPortletRequestWrapper.class);
private ActionRequest request = null;
private Map parametersMap = null;
private PortletFileUpload fileUpload = null;
private Map fileItems = null;
private int maxSize;
private int thresholdSize;
private String repositoryPath;
public MultipartPortletRequestWrapper(
ActionRequest request,
int maxSize,
int thresholdSize,
String repositoryPath)
{
this.request = request;
this.maxSize = maxSize;
this.thresholdSize = thresholdSize;
this.repositoryPath = repositoryPath;
}
private void parseRequest()
{
DiskFileItemFactory diskFileItemFactory = new DiskFileItemFactory();
diskFileItemFactory.setSizeThreshold(thresholdSize);
if (repositoryPath != null && repositoryPath.trim().length() > 0)
diskFileItemFactory.setRepository(new File(repositoryPath));
fileUpload = new PortletFileUpload();
fileUpload.setFileItemFactory(diskFileItemFactory);
fileUpload.setSizeMax(maxSize);
String charset = request.getCharacterEncoding();
fileUpload.setHeaderEncoding(charset);
List requestParameters = null;
try
{
requestParameters = fileUpload.parseRequest(request);
}
catch (FileUploadBase.SizeLimitExceededException e)
{
// TODO: find a way to notify the user about the fact that the
// uploaded file exceeded size limit
if (log.isInfoEnabled())
log.info("user tried to upload a file that exceeded file-size limitations.", e);
requestParameters = Collections.EMPTY_LIST;
}
catch (FileUploadException fue)
{
log.error("Exception while uploading file.", fue);
requestParameters = Collections.EMPTY_LIST;
}
parametersMap = new HashMap(requestParameters.size());
fileItems = new HashMap();
for (Iterator iter = requestParameters.iterator(); iter.hasNext();)
{
FileItem fileItem = (FileItem)iter.next();
if (fileItem.isFormField())
{
String name = fileItem.getFieldName();
// The following code avoids commons-fileupload charset problem.
// After fixing commons-fileupload, this code should be
//
// String value = fileItem.getString();
//
String value = null;
if (charset == null)
{
value = fileItem.getString();
}
else
{
try
{
value = new String(fileItem.get(), charset);
}
catch (UnsupportedEncodingException e)
{
value = fileItem.getString();
}
}
addTextParameter(name, value);
}
else
{ // fileItem is a File
if (fileItem.getName() != null)
{
fileItems.put(fileItem.getFieldName(), fileItem);
}
}
}
// Add the query string paramters
for (Iterator it = request.getParameterMap().entrySet().iterator(); it.hasNext();)
{
Map.Entry entry = (Map.Entry)it.next();
String[] valuesArray = (String[])entry.getValue();
for (int i = 0; i < valuesArray.length; i++)
{
addTextParameter((String)entry.getKey(), valuesArray[i]);
}
}
}
private void addTextParameter(String name, String value)
{
if (!parametersMap.containsKey(name))
{
String[] valuesArray =
{
value
};
parametersMap.put(name, valuesArray);
}
else
{
String[] storedValues = (String[])parametersMap.get(name);
int lengthSrc = storedValues.length;
String[] valuesArray = new String[lengthSrc + 1];
System.arraycopy(storedValues, 0, valuesArray, 0, lengthSrc);
valuesArray[lengthSrc] = value;
parametersMap.put(name, valuesArray);
}
}
public Enumeration getParameterNames()
{
if (parametersMap == null)
parseRequest();
return Collections.enumeration(parametersMap.keySet());
}
public String getParameter(String name)
{
if (parametersMap == null)
parseRequest();
String[] values ...
[truncated message content] |
|
From: Chad B. <cwb...@us...> - 2008-04-11 22:56:38
|
User: cwbrandon Date: 08/04/11 15:56:43 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces - New directory |
|
From: Chad B. <cwb...@us...> - 2008-04-11 22:56:38
|
User: cwbrandon Date: 08/04/11 15:56:35 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet - New directory |
|
From: Chad B. <cwb...@us...> - 2008-04-11 22:56:38
|
User: cwbrandon Date: 08/04/11 15:56:43 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk - New directory |
|
From: Chad B. <cwb...@us...> - 2008-04-11 22:56:38
|
User: cwbrandon Date: 08/04/11 15:56:44 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/portlet/myfaces/tomahawk/support - New directory |
|
From: Chad B. <cwb...@us...> - 2008-04-11 15:54:11
|
User: cwbrandon
Date: 08/04/11 08:54:06
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-action.xhtml.vsl
Log:
don't need params passed in the command links since they are passed transparently in the form
Revision Changes Path
1.4 +8 -8 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- view-action.xhtml.vsl 9 Apr 2008 15:48:43 -0000 1.3
+++ view-action.xhtml.vsl 11 Apr 2008 15:54:05 -0000 1.4
@@ -16,14 +16,14 @@
<a:popup scrolling="yes" height="350px" width="550px" actionOpen="#{${action.controller.beanName}.${action.triggerName}}" center="false">
#end
<h:outputText value="#{messages['$action.messageKey']}"/>
-#foreach ($parameter in $action.parameters)
-#if (!$parameter.complex || $parameter.type.enumeration)
-#renderActionCommandLinkParameter($parameter "")
-#end
-#foreach ($attribute in $parameter.attributes)
-#renderActionCommandLinkParameter($attribute $parameter)
-#end
-#end
+##foreach ($parameter in $action.parameters)
+##if (!$parameter.complex || $parameter.type.enumeration)
+##renderActionCommandLinkParameter($parameter "")
+##end
+##foreach ($attribute in $parameter.attributes)
+##renderActionCommandLinkParameter($attribute $parameter)
+##end
+##end
#if ($action.hyperlink)
</h:commandLink>
#else
|
|
From: Chad B. <cwb...@us...> - 2008-04-10 16:01:47
|
User: cwbrandon
Date: 08/04/10 09:01:48
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-table.xhtml.vsl
Log:
get rid of border from navigation images
Revision Changes Path
1.8 +6 -6 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- view-table.xhtml.vsl 2 Apr 2008 22:37:47 -0000 1.7
+++ view-table.xhtml.vsl 10 Apr 2008 16:01:48 -0000 1.8
@@ -23,22 +23,22 @@
paginatorActiveColumnStyle="font-weight:bold;"
immediate="true">
<f:facet name="first">
- <t:graphicImage url="/images/arrow-first.gif" border="1" />
+ <t:graphicImage url="/images/arrow-first.gif"/>
</f:facet>
<f:facet name="last">
- <t:graphicImage url="/images/arrow-last.gif" border="1" />
+ <t:graphicImage url="/images/arrow-last.gif"/>
</f:facet>
<f:facet name="previous">
- <t:graphicImage url="/images/arrow-previous.gif" border="1" />
+ <t:graphicImage url="/images/arrow-previous.gif"/>
</f:facet>
<f:facet name="next">
- <t:graphicImage url="/images/arrow-next.gif" border="1" />
+ <t:graphicImage url="/images/arrow-next.gif"/>
</f:facet>
<f:facet name="fastforward">
- <t:graphicImage url="/images/arrow-ff.gif" border="1" />
+ <t:graphicImage url="/images/arrow-ff.gif"/>
</f:facet>
<f:facet name="fastrewind">
- <t:graphicImage url="/images/arrow-fr.gif" border="1" />
+ <t:graphicImage url="/images/arrow-fr.gif"/>
</f:facet>
</lr:portletScroller>
<c:set var="renderTable" value="#{${table.name} != null and !${table.name}['empty']}"/>
|
|
From: Chad B. <cwb...@us...> - 2008-04-10 15:24:00
|
User: cwbrandon
Date: 08/04/10 07:28:31
Modified: conf andromda.xml
Log:
only find the uml14 profiles
Revision Changes Path
1.3 +2 -2 cartridges/conf/andromda.xml
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/conf/andromda.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- andromda.xml 19 Dec 2005 05:14:09 -0000 1.2
+++ andromda.xml 10 Apr 2008 14:28:31 -0000 1.3
@@ -9,7 +9,7 @@
<uri>${model.uri}</uri>
<moduleSearchLocations>
<location>${maven.repo.local}/andromda/xml.zips</location>
- <location patterns="**/*.xml.zip">${settings.localRepository}/org/andromda/profiles</location>
+ <location patterns="**/*.xml.zip">${settings.localRepository}/org/andromda/profiles/uml14</location>
<location patterns="**/*.xml.zip">${settings.localRepository}/org/andromda/metafacades</location>
</moduleSearchLocations>
<modelPackages>
|
|
From: Chad B. <cwb...@us...> - 2008-04-10 15:00:03
|
User: cwbrandon
Date: 08/04/10 08:00:04
Added: andromda-jsf2/src/main/resources/resources/views/images
arrow-collapse.gif arrow-expand.gif
Log:
arrows for collapsing and expanding details in tables
Revision Changes Path
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/images/arrow-collapse.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/images/arrow-expand.gif
<<Binary file>>
|
|
From: Chad B. <cwb...@us...> - 2008-04-10 14:58:05
|
User: cwbrandon
Date: 08/04/10 07:57:49
Modified: andromda-jsf2/src/main/resources/resources/views/images
arrow-next.gif arrow-ff.gif arrow-fr.gif
arrow-previous.gif arrow-last.gif arrow-first.gif
Log:
shrink the arrows a tiny bit
Revision Changes Path
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/resources/views/images/arrow-next.gif
<<Binary file>>
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/resources/views/images/arrow-ff.gif
<<Binary file>>
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/resources/views/images/arrow-fr.gif
<<Binary file>>
1.2 +1 -2 cartridges/andromda-jsf2/src/main/resources/resources/views/images/arrow-previous.gif
<<Binary file>>
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/resources/views/images/arrow-last.gif
<<Binary file>>
1.2 +1 -2 cartridges/andromda-jsf2/src/main/resources/resources/views/images/arrow-first.gif
<<Binary file>>
|
|
From: Chad B. <cwb...@us...> - 2008-04-09 15:48:39
|
User: cwbrandon
Date: 08/04/09 08:48:43
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-action.xhtml.vsl
Log:
fix typo
Revision Changes Path
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- view-action.xhtml.vsl 9 Apr 2008 15:40:45 -0000 1.2
+++ view-action.xhtml.vsl 9 Apr 2008 15:48:43 -0000 1.3
@@ -29,7 +29,7 @@
#else
</a:popup>
#end
-<h:form>
+</h:form>
<br/><br/>
#else
#set ($clientValidation = $clientValidation && $action.validationRequired)
|
|
From: Chad B. <cwb...@us...> - 2008-04-09 15:40:54
|
User: cwbrandon
Date: 08/04/09 08:40:45
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-action.xhtml.vsl
Log:
fix link
Revision Changes Path
1.2 +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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-action.xhtml.vsl 21 Mar 2008 16:07:11 -0000 1.1
+++ view-action.xhtml.vsl 9 Apr 2008 15:40:45 -0000 1.2
@@ -11,7 +11,7 @@
#if ($action.hyperlink || $action.popup)
<h:form>
#if ($action.hyperlink)
- <a:commandLink action="#{${action.controller.beanName}.${action.triggerName}}">
+ <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}">
#else
<a:popup scrolling="yes" height="350px" width="550px" actionOpen="#{${action.controller.beanName}.${action.triggerName}}" center="false">
#end
|
|
From: Chad B. <cwb...@us...> - 2008-04-09 01:12:32
|
User: cwbrandon
Date: 08/04/08 18:12:34
Modified: andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet
Preferences.java.vsl
Log:
minor improvement
Revision Changes Path
1.6 +2 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl
Index: Preferences.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- Preferences.java.vsl 9 Apr 2008 00:47:32 -0000 1.5
+++ Preferences.java.vsl 9 Apr 2008 01:12:34 -0000 1.6
@@ -47,11 +47,11 @@
{
final java.lang.String value = this.getPreferences().getValue("$attribute.name", null);
#if (!$attribute.type.stringType)
- final $attribute.type.wrapperName wrappedValue = value != null ? ${attribute.type.wrapperName}.valueOf(value) :#if ($attribute.defaultValue) ${attribute.defaultValue}#else null#end;
+ final $attribute.type.wrapperName wrappedValue = value != null ? ${attribute.type.wrapperName}.valueOf(value) : null;
#* *##if ($attribute.type.primitive)
return wrappedValue != null ? wrappedValue.${attribute.getterSetterTypeName}Value() : #if ($attribute.defaultValue)${attribute.defaultValue}#else${attribute.type.javaNullString}#end;
#* *##else
- return wrappedValue;
+ return wrappedValue == null ?#if ($attribute.defaultValue) ${attribute.defaultValue}#else null#end : null;
#* *##end
#else
return value;
|
|
From: Chad B. <cwb...@us...> - 2008-04-09 00:47:25
|
User: cwbrandon
Date: 08/04/08 17:47:32
Modified: andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet
Preferences.java.vsl
Log:
generate default value in portlet prefs
Revision Changes Path
1.5 +2 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl
Index: Preferences.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Preferences.java.vsl 28 Mar 2008 23:11:37 -0000 1.4
+++ Preferences.java.vsl 9 Apr 2008 00:47:32 -0000 1.5
@@ -47,9 +47,9 @@
{
final java.lang.String value = this.getPreferences().getValue("$attribute.name", null);
#if (!$attribute.type.stringType)
- final $attribute.type.wrapperName wrappedValue = value != null ? ${attribute.type.wrapperName}.valueOf(value) : null;
+ final $attribute.type.wrapperName wrappedValue = value != null ? ${attribute.type.wrapperName}.valueOf(value) :#if ($attribute.defaultValue) ${attribute.defaultValue}#else null#end;
#* *##if ($attribute.type.primitive)
- return wrappedValue != null ? wrappedValue.${attribute.getterSetterTypeName}Value() : $attribute.type.javaNullString;
+ return wrappedValue != null ? wrappedValue.${attribute.getterSetterTypeName}Value() : #if ($attribute.defaultValue)${attribute.defaultValue}#else${attribute.type.javaNullString}#end;
#* *##else
return wrappedValue;
#* *##end
|
|
From: Chad B. <cwb...@us...> - 2008-04-09 00:28:11
|
User: cwbrandon
Date: 08/04/08 17:28:17
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
renderPortletActionFormInput.vm
Log:
fix display of select one boxes
Revision Changes Path
1.2 +2 -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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- renderPortletActionFormInput.vm 21 Mar 2008 16:07:11 -0000 1.1
+++ renderPortletActionFormInput.vm 9 Apr 2008 00:28:17 -0000 1.2
@@ -37,7 +37,8 @@
#if ($multiSelect)
#set ($selectBoxType = "selectManyListbox")
#end
- <h:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" required="$parameter.required" readonly="$parameter.readOnly" valuePassThru="true"#if ($multiSelect) size="$defaultMultiSelectSize"#end>
+ <h:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" required="$parameter.required" readonly="$parameter.readOnly" size=#if ($multiSelect)"$defaultMultiSelectSize"#else"1"#end>
+ <f:selectItem itemValue="" itemLabel=""/>
<c:if test="${!empty ${backingListName}}">
<f:selectItems value="#{${backingListName}}" />
</c:if>
|
|
From: Chad B. <cwb...@us...> - 2008-04-08 17:55:50
|
User: cwbrandon
Date: 08/04/08 10:55:42
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
Log:
don't generate crud index if no manageables
Revision Changes Path
1.23 +2 -1 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.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- cartridge.xml 8 Apr 2008 17:00:24 -0000 1.22
+++ cartridge.xml 8 Apr 2008 17:55:41 -0000 1.23
@@ -1024,7 +1024,8 @@
outputPattern="crud-index.xhtml"
outlet="views"
overwrite="true"
- outputToSingleFile="true">
+ outputToSingleFile="true"
+ outputOnEmptyElements="false">
<modelElements>
<modelElement variable="manageables">
<type name="org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity"/>
|
