Menu
▾
▴
[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/components/src/main/resources/popup/js popup.js
|
From: Chad B. <cwb...@us...> - 2007-07-02 18:55:06
|
User: cwbrandon
Date: 07/07/02 11:55:01
Modified: andromda-jsf2/src/main/resources/templates/jsf2/utils
NavigationItem.java.vsl
andromda-jsf2/src/main/resources/templates/jsf2/configuration
validator-rules.xml.vsl web.xml.vsl
andromda-jsf2 pom.xml
Removed: andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/validator
JSFValidator.java ValidatorMessages.java
JSFValidatorException.java ParameterChecks.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/component
JSFValidatorComponent.java contenttypes.properties
BinaryFile.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/taglib
ConvertDateTimeTag.java JSFValidatorTag.java
BinaryFileTag.java PopupFrameTag.java
HtmlExtendedDataTableTag.java RoleAssociated.java
PermissionChecker.java
andromda-jsf2/components/src/main/resources/META-INF
jsf-taglib.tld faces-config.xml
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2
Constants.java Messages.java JSFServlet.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/component/html
HtmlPopupFrame.java HtmlExtendedDataTable.java
andromda-jsf2/components .project .classpath pom.xml
.cvsignore
andromda-jsf2/components/src/main/resources/popup/html
closePopup.jsf closePopupRefresh.jsf
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/converters
DateTimeConverter.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/utils
ComponentUtils.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/renderkit/html
PopupRenderer.java
andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/renderkit
BinaryFileRenderer.java
andromda-jsf2/components/src/main/resources/popup/js
popup.js
Log:
Remove "components" and use the one from the regular jsf cartridge (so we don't duplicate more code). One from the regular jsf cartridge has a bunch of bug fixes not present in this "jsf2" components module as well.
Revision Changes Path
1.4 +175 -120 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/NavigationItem.java.vsl
Index: NavigationItem.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/NavigationItem.java.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NavigationItem.java.vsl 12 Feb 2007 18:57:28 -0000 1.3
+++ NavigationItem.java.vsl 2 Jul 2007 18:54:57 -0000 1.4
@@ -6,16 +6,13 @@
import java.util.List;
import java.lang.StringBuffer;
import org.apache.commons.beanutils.MethodUtils;
-import javax.servlet.http.HttpServletRequest;
/**
- *
* @author Leif Johansson
*/
public class $className
- implements java.io.Serializable, org.andromda.cartridges.jsf2.taglib.RoleAssociated
+ implements java.io.Serializable
{
-
private String label = null;
private String outcome = null;
private String viewId = null;
@@ -26,60 +23,74 @@
private String roles = null;
private String[] _roles = null;
- public NavigationItem() {}
+ public NavigationItem()
+ {}
- public String getLabel() {
+ public String getLabel()
+ {
return label;
}
- public void setLabel(String label) {
+ public void setLabel(String label)
+ {
this.label = label;
}
- public String getOutcome() {
+ public String getOutcome()
+ {
return outcome;
}
- public void setOutcome(String outcome) {
+ public void setOutcome(String outcome)
+ {
this.outcome = outcome;
}
- public String getViewId() {
+ public String getViewId()
+ {
return viewId;
}
- public void setViewId(String viewId) {
+ public void setViewId(String viewId)
+ {
this.viewId = viewId;
}
- public List getChildren() {
+ public List getChildren()
+ {
return children;
}
- public void setChildren(List children) {
+ public void setChildren(List children)
+ {
this.children = children;
}
- public String getIco() {
+ public String getIco()
+ {
return icon;
}
- public void setIco(String icon) {
+ public void setIco(String icon)
+ {
this.icon = icon;
}
- public String getRoles() {
+ public String getRoles()
+ {
return roles;
}
- private void _updateRoles() {
+ private void _updateRoles()
+ {
if (roles != null && roles.length() > 0)
_roles = roles.split(",");
else
_roles = null;
}
- public void setRoles(String roles) {
+ public void setRoles(String roles)
+ {
this.roles = roles;
_updateRoles();
}
@@ -91,37 +102,81 @@
public boolean isRendered()
{
- return org.andromda.cartridges.jsf2.taglib.PermissionChecker.isUserInItemRoles(this);
+ return this.isUserInItemRoles();
+ }
+
+ public boolean isUserInItemRoles()
+ {
+ String[] roles = this.getAssociatedRoles();
+
+ if (roles == null || roles.length == 0)
+ { // no constraints at all
+
+ return true;
+ }
+
+ javax.faces.context.ExternalContext ctx =
+ javax.faces.context.FacesContext.getCurrentInstance().getExternalContext();
+
+ if (ctx.getUserPrincipal() == null)
+ { // not logged in
+
+ return false;
+ }
+
+ for (int i = 0; i < roles.length; i++)
+ {
+ String role = roles[i];
+
+ if (ctx.isUserInRole(role))
+ {
+ return true;
+ }
+ }
+
+ return false;
}
- public String getAction() {
- try {
- return (java.lang.String)MethodUtils.invokeMethod(getControllerBean(),getControllerAction(),null);
- } catch (Exception ex) {
+ public String getAction()
+ {
+ try
+ {
+ return (java.lang.String)MethodUtils.invokeMethod(
+ getControllerBean(),
+ getControllerAction(),
+ null);
+ }
+ catch (Exception ex)
+ {
ex.printStackTrace();
return null;
}
}
- public void setControllerBean(Object controllerBean) {
+ public void setControllerBean(Object controllerBean)
+ {
this.controllerBean = controllerBean;
}
- public Object getControllerBean() {
+ public Object getControllerBean()
+ {
return controllerBean;
}
- public void setControllerAction(String controllerAction) {
+ public void setControllerAction(String controllerAction)
+ {
this.controllerAction = controllerAction;
}
- public String getControllerAction() {
+ public String getControllerAction()
+ {
return this.controllerAction;
}
- public String toString() {
+ public String toString()
+ {
StringBuffer buf = new StringBuffer();
- buf.append("NavigationItem[");
+ buf.append(this.getClass().getName() + "[");
buf.append("label=").append(label);
buf.append(",outcome=").append(outcome);
buf.append(",viewId=").append(viewId);
1.2 +51 -51 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/validator-rules.xml.vsl
Index: validator-rules.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/validator-rules.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- validator-rules.xml.vsl 5 Dec 2006 19:39:00 -0000 1.1
+++ validator-rules.xml.vsl 2 Jul 2007 18:54:59 -0000 1.2
@@ -6,7 +6,7 @@
<global>
<validator name="required"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateRequired"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -70,7 +70,7 @@
</validator>
<validator name="minlength"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateMinLength"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -115,7 +115,7 @@
</validator>
<validator name="maxlength"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateMaxLength"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -160,7 +160,7 @@
</validator>
<validator name="mask"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateMask"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -210,7 +210,7 @@
</validator>
<validator name="byte"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateByte"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -282,7 +282,7 @@
</validator>
<validator name="short"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateShort"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -357,7 +357,7 @@
</validator>
<validator name="integer"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateInteger"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -432,7 +432,7 @@
</validator>
<validator name="long"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateLong"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -506,7 +506,7 @@
</validator>
<validator name="float"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateDouble"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -584,7 +584,7 @@
</validator>
<validator name="equal"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateEqual"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -640,7 +640,7 @@
</validator>
<validator name="date"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateDate"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -795,7 +795,7 @@
</validator>
<validator name="time"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateTime"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -922,7 +922,7 @@
</validator>
<validator name="intRange"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateLongRange"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -973,7 +973,7 @@
</validator>
<validator name="floatRange"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateDoubleRange"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -1023,7 +1023,7 @@
</validator>
<validator name="creditCard"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateCreditCard"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -1102,7 +1102,7 @@
<validator name="email"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateEmail"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
@@ -1196,7 +1196,7 @@
</validator>
<validator name="url"
- classname="org.andromda.cartridges.jsf2.validator.ParameterChecks"
+ classname="org.andromda.cartridges.jsf.validator.ParameterChecks"
method="validateUrl"
methodParams="javax.faces.context.FacesContext,
java.lang.Object,java.util.Map,
1.9 +3 -12 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
Index: web.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- web.xml.vsl 21 Feb 2007 19:41:23 -0000 1.8
+++ web.xml.vsl 2 Jul 2007 18:54:59 -0000 1.9
@@ -33,15 +33,6 @@
<param-value>true</param-value>
</context-param>
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>
- /WEB-INF/tomahawk.taglib.xml;
- /WEB-INF/andromda.taglib.xml;
- <!-- facelets tag-lib merge-point -->
- </param-value>
- </context-param>
-
<!-- Trinidad has its own ViewHandler, which is a "decorating"
view handler - for example, it needs to wrap methods like renderView()
to perform some extra pre- and post-handling. Facelets, on the other
@@ -285,7 +276,7 @@
#end
<servlet>
<servlet-name>AndroMDA JSF Servlet</servlet-name>
- <servlet-class>org.andromda.cartridges.jsf2.JSFServlet</servlet-class>
+ <servlet-class>org.andromda.cartridges.jsf.JSFServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
1.7 +4 -11 cartridges/andromda-jsf2/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- pom.xml 29 Jun 2007 15:17:10 -0000 1.6
+++ pom.xml 2 Jul 2007 18:55:00 -0000 1.7
@@ -15,8 +15,8 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}-components</artifactId>
- <version>${pom.version}</version>
+ <artifactId>andromda-jsf-cartridge-components</artifactId>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -28,25 +28,18 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-cartridge-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.andromda.translationlibraries</groupId>
- <artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2</version>
- </dependency>
- </dependencies>
<configuration>
<artifacts>
<artifact>
<groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}-components</artifactId>
+ <artifactId>andromda-jsf-cartridge-components</artifactId>
<path>resources/WEB-INF/lib</path>
</artifact>
</artifacts>
|
