Wikitty-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- 1653 discussions
r1236 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/layers
by sletellier@users.nuiton.org 12 Oct '11
by sletellier@users.nuiton.org 12 Oct '11
12 Oct '11
Author: sletellier
Date: 2011-10-12 18:14:50 +0200 (Wed, 12 Oct 2011)
New Revision: 1236
Url: http://nuiton.org/repositories/revision/wikitty/1236
Log:
- Fix some doc
- Add getIds utility method to extract wikittyId
- Add getFieldValuesFromFQFieldName to extract field value on list of businessEntity
Modified:
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java
trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-10-12 16:11:29 UTC (rev 1235)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-10-12 16:14:50 UTC (rev 1236)
@@ -575,7 +575,7 @@
*
* @param <E> object type
* @param clazz entity class
- * @param criteria criteria
+ * @param criterias criterias
* @return paged result
*/
public <E extends BusinessEntity> List<PagedResult<E>> findAllByCriteria(
@@ -650,7 +650,9 @@
*
* @param <E> object type
* @param clazz entity class
- * @param criteria criteria
+ * @param c1 criteria 1
+ * @param c2 criteria 2
+ * @param otherCriteria otherCriteria
* @return paged result
*/
public <E extends BusinessEntity> PagedResult<E>[] findAllByCriteria(
@@ -910,13 +912,12 @@
*
* Return Wikitty in result, those Wikitties have WikittyTreeNode extension
*
- * @param clazz business class wanted to replace id in TreeNodeResult
* @param wikittyId root
* @param depth profondeur de noeud a recuperer
* @param count vrai si l'on veut le nombre de piece attaches sur le noeud
* (piece des enfants compris)
* @param filter filter pour compter les pieces attachees
- * @return
+ * @return treeNodeResult of wikitty
*
* @since 3.1
*/
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2011-10-12 16:11:29 UTC (rev 1235)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2011-10-12 16:14:50 UTC (rev 1236)
@@ -46,6 +46,7 @@
import java.net.NetworkInterface;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -545,6 +546,7 @@
* @param clazz element class
* @return unmodifiable list
*/
+ @SuppressWarnings({"unchecked"})
static public <E> List<E> toList(Object value, Class<E> clazz) {
try {
List<E> result = (List<E>) value;
@@ -955,7 +957,68 @@
return metaFieldName;
}
+ /*
+ * For BusinessEntities
+ */
+
/**
+ * Extract all id for beans
+ *
+ * @param entities to extract ids
+ * @return ids of entities
+ */
+ public static List<String> getIds(Iterable<? extends BusinessEntity> entities) {
+ List<String> ids = new ArrayList<String>();
+ if (entities != null) {
+ for (BusinessEntity bean : entities) {
+ if (bean != null) {
+ ids.add(bean.getWikittyId());
+ }
+ }
+ }
+ return ids;
+ }
+
+ /**
+ * Extract field value corresponding of fqField in entity
+ *
+ * @param fqField fqField concerned
+ * @param entity entity concerned
+ * @param <E> return type
+ * @return value of field
+ */
+ @SuppressWarnings({"unchecked"})
+ public static <E> E getFieldValueFromFQFieldName(String fqField, BusinessEntity entity) {
+
+ return (E) entity.getField(WikittyUtil.getExtensionNameFromFQFieldName(fqField),
+ WikittyUtil.getFieldNameFromFQFieldName(fqField));
+ }
+
+ /**
+ * Extract all field values corresponding of fqField in entity
+ *
+ * @param fqField fqField concerned
+ * @param entities entities concerned
+ * @param <E> return type
+ * @return value of field
+ */
+ public static <E> List<E> getFieldValuesFromFQFieldName(String fqField, Iterable<? extends BusinessEntity> entities) {
+ List<E> fieldValues = new ArrayList<E>();
+ if (entities != null) {
+ for (BusinessEntity entity : entities) {
+
+ if (entity != null) {
+ // Get field for specified fqField
+ E field = getFieldValueFromFQFieldName(fqField, entity);
+
+ fieldValues.add(field);
+ }
+ }
+ }
+ return fieldValues;
+ }
+
+ /**
* Recherche le meilleur nom a utiliser comme pseudo pour cette machine.
* Un UUID est toujours ajouter en debut, pour potentiellement lancer
* plusieurs application en meme temps sur la meme machine et etre sur que
@@ -1097,7 +1160,6 @@
* @param type Data type to which this value should be converted
* @param value The input value to be converted
* @return The converted value.
- * @throws ConversionException if conversion cannot be performed
* successfully and no default is specified.
*/
@Override
Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java
===================================================================
--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2011-10-12 16:11:29 UTC (rev 1235)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2011-10-12 16:14:50 UTC (rev 1236)
@@ -52,7 +52,7 @@
import org.nuiton.wikitty.entities.WikittyUserImpl;
import org.nuiton.wikitty.WikittyUtil;
-/** test {@link org.nuiton.wikitty.WikittyServiceSecurity}. */
+/** test {@link org.nuiton.wikitty.services.WikittyServiceSecurity}. */
public class WikittyServiceSecurityTest extends AbstractWikittyServiceTest {
// FIXME 20101112 poussin classe a revoir suite au refactoring de la secu
1
0
r1235 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag resources/template/wikitty tld
by sletellier@users.nuiton.org 12 Oct '11
by sletellier@users.nuiton.org 12 Oct '11
12 Oct '11
Author: sletellier
Date: 2011-10-12 18:11:29 +0200 (Wed, 12 Oct 2011)
New Revision: 1235
Url: http://nuiton.org/repositories/revision/wikitty/1235
Log:
- Delete empty templates
- Clean code
- Add tag to get wikitty field value
- Allow to use wikittyId on wikitty-tags
Added:
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-empty.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl
Removed:
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield-close.ftl
Modified:
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java
trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -28,6 +28,7 @@
static public String ALL_EXTENSION_CAR = "*";
static public String FIELD_SEPARATOR = ",";
+ protected String wikittyId;
protected Wikitty wikitty;
protected BusinessEntity businessEntity;
protected WikittyProxy proxy;
@@ -57,9 +58,21 @@
fieldAdded = new HashSet<String>();
}
+ public String getWikittyId() {
+ return wikittyId;
+ }
+
+ public void setWikittyId(String wikittyId) {
+ this.wikittyId = wikittyId;
+ }
+
public Wikitty getWikitty() {
if (wikitty == null) {
- wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty();
+ if (StringUtils.isNotEmpty(wikittyId)) {
+ wikitty = getProxy().restore(wikittyId);
+ } else {
+ wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty();
+ }
}
return wikitty;
}
@@ -145,7 +158,7 @@
* included and excluded, it will not appear in the result
*/
- for (WikittyExtension ext : wikitty.getExtensions()) {
+ for (WikittyExtension ext : getWikitty().getExtensions()) {
String extName = ext.getName();
/*
@@ -237,7 +250,7 @@
// harvest all field of the extension
if ("*".equals(field)) {
- WikittyExtension ext = wikitty.getExtension(extname);
+ WikittyExtension ext = getWikitty().getExtension(extname);
for (String fieldNameIt : ext.getFieldNames()) {
ExtensionFieldStrutsBean temp = constructExtensionFieldFromField(
extname, fieldNameIt);
@@ -356,13 +369,13 @@
break;
case BOOLEAN:
- boolean valueBool = wikitty.getFieldAsBoolean(extName, fieldName);
+ boolean valueBool = getWikitty().getFieldAsBoolean(extName, fieldName);
result.setType("boolean");
result.setValue(valueBool);
break;
default:
- Object valueObject = wikitty.getFieldAsObject(extName, fieldName);
+ Object valueObject = getWikitty().getFieldAsObject(extName, fieldName);
String valueString = StringUtils.EMPTY;
if (valueObject != null) {
@@ -384,5 +397,4 @@
}
return result;
}
-
}
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -9,6 +9,8 @@
public abstract class AbstractWikittyClosingUIBean extends ClosingUIBean {
+ protected static final String EMPTY_TEMPLATE = "ws-empty";
+
public AbstractWikittyClosingUIBean(ValueStack stack,
HttpServletRequest request, HttpServletResponse response) {
super(stack, request, response);
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -3,6 +3,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.WikittyUtil;
import org.nuiton.wikitty.entities.BusinessEntity;
@@ -14,6 +15,7 @@
public abstract class AbstractWikittyComponent extends
AbstractWikittyClosingUIBean {
+ protected String wikittyId;
/**
* Never used directly this attribute use the getter
*/
@@ -66,9 +68,17 @@
return proxy;
}
+ public String getWikittyId() {
+ return wikittyId;
+ }
+
public Wikitty getWikitty() {
if (wikitty == null) {
- wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty();
+ if (StringUtils.isNotEmpty(getWikittyId())) {
+ wikitty = getProxy().restore(getWikittyId());
+ } else {
+ wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty();
+ }
}
return wikitty;
}
@@ -77,6 +87,10 @@
return businessEntity;
}
+ public void setWikittyId(String wikittyId) {
+ this.wikittyId = wikittyId;
+ }
+
public void setWikitty(Wikitty wikitty) {
this.wikitty = wikitty;
}
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -20,7 +20,6 @@
protected WikittyFieldHandler handler;
protected String fqFieldName;
-
protected AbstractWikittyComponentBean(ValueStack stack,
HttpServletRequest request, HttpServletResponse response) {
@@ -38,6 +37,7 @@
return true;
}
+ @Override
public WikittyProxy getProxy() {
if (handler != null) {
return handler.getProxy();
@@ -45,6 +45,7 @@
return super.getProxy();
}
+ @Override
public Wikitty getWikitty() {
if (handler != null) {
return handler.getWikitty();
@@ -53,6 +54,7 @@
return super.getWikitty();
}
+ @Override
public BusinessEntity getBusinessEntity() {
if (handler != null) {
return handler.getBusinessEntity();
@@ -61,14 +63,22 @@
}
@Override
+ public String getWikittyId() {
+ if (handler != null) {
+ return handler.getWikittyId();
+ }
+ return super.getWikittyId();
+ }
+
+ @Override
protected void evaluateExtraParams() {
super.evaluateExtraParams();
- if (handler == null && wikitty == null && businessEntity == null) {
- log.info("Handler not found in the stack and wikitty or businessEntity not declared");
+ if (handler == null && wikitty == null && businessEntity == null && wikittyId == null) {
+ log.info("Handler not found in the stack and wikittyId, wikitty or businessEntity not declared");
throw new TagUseException(
- "Tag must declare Wikitty or businessEntity attribute if used outside ws:form tag");
+ "Tag must declare wikittyId, Wikitty or businessEntity attribute if used outside ws:form tag");
}
if (!fqFieldName.matches(REGEX_WIKITTY_FQFIELDNAME)) {
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -18,9 +18,7 @@
final static private Log log = LogFactory.getLog(BooleanBean.class);
public static final String OPEN_TEMPLATE = "ws-boolean";
- public static final String TEMPLATE = "ws-boolean-close";
-
public BooleanBean(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
super(stack, request, response);
@@ -49,6 +47,6 @@
}
protected String getDefaultTemplate() {
- return TEMPLATE;
+ return EMPTY_TEMPLATE;
}
}
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -18,7 +18,6 @@
final static private Log log = LogFactory.getLog(DateBean.class);
public static final String OPEN_TEMPLATE = "ws-date";
- public static final String TEMPLATE = "ws-date-close";
protected Boolean enableHour = false;
@@ -49,12 +48,14 @@
}
+ @Override
public String getDefaultOpenTemplate() {
return OPEN_TEMPLATE;
}
+ @Override
protected String getDefaultTemplate() {
- return TEMPLATE;
+ return EMPTY_TEMPLATE;
}
public Boolean getEnableHour() {
Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -0,0 +1,52 @@
+package org.nuiton.wikitty.struts.component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.nuiton.util.StringUtil;
+import org.nuiton.wikitty.WikittyUtil;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+@StrutsTag(name = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.FieldTag",
+ description = "")
+public class FieldBean extends AbstractWikittyComponentBean {
+
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ final static private Log log = LogFactory.getLog(FieldBean.class);
+
+ public static final String OPEN_TEMPLATE = "ws-field";
+
+ public FieldBean(ValueStack stack, HttpServletRequest request,
+ HttpServletResponse response) {
+ super(stack, request, response);
+ }
+
+ @Override
+ protected void evaluateExtraParams() {
+ super.evaluateExtraParams();
+
+ // parse extname and field name
+ String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
+ // add parametters to be use by the template
+
+ addParameter(
+ "value",
+ getWikitty().getFieldAsString(fieldsAccess[0],
+ fieldsAccess[1]));
+
+
+ }
+
+ @Override
+ public String getDefaultOpenTemplate() {
+ return OPEN_TEMPLATE;
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return EMPTY_TEMPLATE;
+ }
+}
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -17,7 +17,6 @@
final static private Log log = LogFactory.getLog(HiddenBean.class);
public static final String OPEN_TEMPLATE = "ws-hidden";
- public static final String TEMPLATE = "ws-hidden-close";
public HiddenBean(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -47,6 +46,6 @@
}
protected String getDefaultTemplate() {
- return TEMPLATE;
+ return EMPTY_TEMPLATE;
}
}
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -1,6 +1,5 @@
package org.nuiton.wikitty.struts.component;
-import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -27,7 +26,6 @@
.getLog(SelectAssociationBean.class);
public static final String OPEN_TEMPLATE = "ws-selectassociation";
- public static final String TEMPLATE = "ws-selectassociation-close";
protected String descField;
protected int size;
@@ -112,7 +110,7 @@
}
protected String getDefaultTemplate() {
- return TEMPLATE;
+ return EMPTY_TEMPLATE;
}
}
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -28,7 +28,6 @@
.getLog(SelectBean.class);
public static final String OPEN_TEMPLATE = "ws-select";
- public static final String TEMPLATE = "ws-select-close";
protected Integer size;
protected String descField;
@@ -127,7 +126,7 @@
@Override
protected String getDefaultTemplate() {
- return TEMPLATE;
+ return EMPTY_TEMPLATE;
}
public Integer getSize() {
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -26,7 +26,6 @@
final static private Log log = LogFactory.getLog(SelectCriteriaBean.class);
public static final String OPEN_TEMPLATE = "ws-selectcriteria";
- public static final String TEMPLATE = "ws-selectcriteria-close";
protected Criteria criteria;
protected String descField;
@@ -99,7 +98,7 @@
}
protected String getDefaultTemplate() {
- return TEMPLATE;
+ return EMPTY_TEMPLATE;
}
public Criteria getCriteria() {
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -21,7 +21,6 @@
final static private Log log = LogFactory.getLog(SelectFixedBean.class);
public static final String OPEN_TEMPLATE = "ws-selectfixed";
- public static final String TEMPLATE = "ws-selectfixed-close";
protected String fixvalues;
@@ -57,7 +56,7 @@
}
protected String getDefaultTemplate() {
- return TEMPLATE;
+ return EMPTY_TEMPLATE;
}
public String getFixvalues() {
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -17,7 +17,6 @@
final static private Log log = LogFactory.getLog(TextAreaBean.class);
public static final String OPEN_TEMPLATE = "ws-textarea";
- public static final String TEMPLATE = "ws-textarea-close";
public TextAreaBean(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -43,6 +42,6 @@
}
protected String getDefaultTemplate() {
- return TEMPLATE;
+ return EMPTY_TEMPLATE;
}
}
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -17,7 +17,6 @@
final static private Log log = LogFactory.getLog(TextFieldBean.class);
public static final String OPEN_TEMPLATE = "ws-textfield";
- public static final String TEMPLATE = "ws-textfield-close";
protected Boolean password;
@@ -45,7 +44,7 @@
}
protected String getDefaultTemplate() {
- return TEMPLATE;
+ return EMPTY_TEMPLATE;
}
public Boolean getPassword() {
Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -15,11 +15,20 @@
protected Wikitty wikitty;
protected BusinessEntity businessEntity;
protected WikittyProxy proxy;
+ protected String wikittyId;
public AbstractWikittyTag() {
super();
}
+ public String getWikittyId() {
+ return wikittyId;
+ }
+
+ public void setWikittyId(String wikittyId) {
+ this.wikittyId = wikittyId;
+ }
+
public Wikitty getWikitty() {
return wikitty;
}
@@ -48,7 +57,8 @@
@Override
protected void populateParams() {
super.populateParams();
- AbstractWikittyComponent wikittyComponent = (AbstractWikittyComponent) component;
+ AbstractWikittyComponent wikittyComponent = (AbstractWikittyComponent) component;
+ wikittyComponent.setWikittyId(wikittyId);
wikittyComponent.setWikitty(wikitty);
wikittyComponent.setProxy(proxy);
wikittyComponent.setBusinessEntity(businessEntity);
Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java 2011-10-12 16:11:29 UTC (rev 1235)
@@ -0,0 +1,30 @@
+package org.nuiton.wikitty.struts.tag;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.Component;
+import org.nuiton.wikitty.struts.component.FieldBean;
+import org.nuiton.wikitty.struts.component.SelectAssociationBean;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+public class FieldTag extends AbstractWikittyTagComponent{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1341902299150448705L;
+
+ @Override
+ public Component getBean(ValueStack stack, HttpServletRequest req,
+ HttpServletResponse res) {
+ return new FieldBean(stack, req, res);
+
+ }
+
+ @Override
+ protected void populateParams() {
+ super.populateParams();
+ }
+}
Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl 2011-10-12 16:11:29 UTC (rev 1235)
@@ -0,0 +1,3 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.value}
+</#if>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
===================================================================
--- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-10-12 07:48:56 UTC (rev 1234)
+++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-10-12 16:11:29 UTC (rev 1235)
@@ -21,8 +21,13 @@
<name>name</name>
<rtexprvalue>true</rtexprvalue>
</attribute>
-
<attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<required>false</required>
@@ -87,8 +92,58 @@
</attribute>
</tag>
-
<tag>
+ <description><![CDATA[Tag used to get field value of wikitty]]></description>
+ <name>field</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.FieldTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity target (needed if wikitty not set)]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description>
+ <name>proxy</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The field value showed in list/combobox default wikitty-id]]></description>
+ <name>descField</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the name of the field concerned by the tag]]></description>
+ <name>fqFieldName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
<description><![CDATA[Tag used for wikittyField that are wikitty collection and show them as combobox or list]]></description>
<name>selectAssociation</name>
<tag-class>org.nuiton.wikitty.struts.tag.SelectAssociationTag</tag-class>
@@ -105,6 +160,12 @@
</attribute>
<attribute>
<description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
<name>wikitty</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -178,6 +239,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[Collection of wikitty that will be showed inside the combobox/list (needed if entityValues Not set)]]></description>
<name>wikittyValues</name>
<rtexprvalue>true</rtexprvalue>
@@ -194,9 +261,6 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
-
-
-
<tag>
<description><![CDATA[Tag used to construct a combobox to select /set a wikitty, when the wikitty field is a wikitty]]></description>
<name>selectCriteria</name>
@@ -213,6 +277,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<required>false</required>
@@ -271,6 +341,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
<name>wikitty</name>
<required>false</required>
@@ -318,6 +394,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
<name>wikitty</name>
<required>false</required>
@@ -354,6 +436,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
<name>wikitty</name>
<required>false</required>
@@ -400,6 +488,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
<name>wikitty</name>
<required>false</required>
@@ -447,6 +541,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
<name>wikitty</name>
<required>false</required>
@@ -488,6 +588,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikittyId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
<name>wikitty</name>
<required>false</required>
1
0
Author: sletellier
Date: 2011-10-12 09:48:56 +0200 (Wed, 12 Oct 2011)
New Revision: 1234
Url: http://nuiton.org/repositories/revision/wikitty/1234
Log:
Include wikitty-struts module in build
Modified:
trunk/pom.xml
trunk/wikitty-struts/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-10-11 15:47:04 UTC (rev 1233)
+++ trunk/pom.xml 2011-10-12 07:48:56 UTC (rev 1234)
@@ -27,7 +27,7 @@
<module>wikitty-publication</module>
<module>wp-maven-plugin</module>
<module>wikitty-publication-ui</module>
-
+ <module>wikitty-struts</module>
<module>wikitty-hessian-client</module>
<module>wikitty-hessian-server</module>
<module>wikitty-perf-test</module>
Modified: trunk/wikitty-struts/pom.xml
===================================================================
--- trunk/wikitty-struts/pom.xml 2011-10-11 15:47:04 UTC (rev 1233)
+++ trunk/wikitty-struts/pom.xml 2011-10-12 07:48:56 UTC (rev 1234)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>wikitty</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<!-- ************************************************************* -->
1
0
Author: sletellier
Date: 2011-10-11 17:47:04 +0200 (Tue, 11 Oct 2011)
New Revision: 1233
Url: http://nuiton.org/repositories/revision/wikitty/1233
Log:
Fix tld warn and style
Modified:
trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
===================================================================
--- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-09-22 17:31:03 UTC (rev 1232)
+++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-10-11 15:47:04 UTC (rev 1233)
@@ -1,516 +1,515 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
- <display-name>"wikitty-struts"</display-name>
- <tlib-version>1.3</tlib-version>
- <jsp-version>1.2</jsp-version>
- <short-name>wikitty-struts</short-name>
- <uri>/wikitty-struts</uri>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">
+ <description><![CDATA["To make it easier to access wikitty datas."]]></description>
+ <display-name>"Wikitty Tags"</display-name>
+ <tlib-version>2.2</tlib-version>
+ <short-name>ws</short-name>
+ <uri>/wikitty-struts</uri>
- <tag>
- <name>form</name>
- <tagclass>org.nuiton.wikitty.struts.tag.FormTag</tagclass>
- <description><![CDATA[Tag use to make a form to edit wikitty]]></description>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for the form]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
+ <tag>
+ <description><![CDATA[Tag use to make a form to edit wikitty]]></description>
+ <name>form</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.FormTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for the form]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
- <attribute>
- <description><![CDATA[the wikitty to edit]]></description>
- <name>wikitty</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the businessEntity to edit]]></description>
- <name>businessEntity</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the proxy from whom search for wikitty and other info needed]]></description>
- <name>proxy</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[the url of the form action]]></description>
- <name>action</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[an url store as a hidden field of the form]]></description>
- <name>redirect</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[Field/extention that must appear in the form, if
+ <attribute>
+ <description><![CDATA[the wikitty to edit]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity to edit]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the proxy from whom search for wikitty and other info needed]]></description>
+ <name>proxy</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the url of the form action]]></description>
+ <name>action</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[an url store as a hidden field of the form]]></description>
+ <name>redirect</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[Field/extention that must appear in the form, if
defined other wikitty field will be ignored.
if not defined all wikitty field will be presented.
example: "wikittyPubData.name, wikittyLabel.*"
extentionName.* will include all field of extenstion]]></description>
- <name>include</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[wikitty field/extention that have to be ignore, even
+ <name>include</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[wikitty field/extention that have to be ignore, even
if the field/extension is include if exclude it will
not be include in the form.
]]></description>
- <name>exclude</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[Used to order wikitty field, those which are not ordered
+ <name>exclude</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[Used to order wikitty field, those which are not ordered
will be added at the end.]]></description>
- <name>order</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[Used to know if the ordered fields has to be write before or after the custom field]]></description>
- <name>orderBefore</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
+ <name>order</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[Used to know if the ordered fields has to be write before or after the custom field]]></description>
+ <name>orderBefore</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
- <attribute>
- <description><![CDATA[If a delele button must be added in the form]]></description>
- <name>allowDelete</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
+ <attribute>
+ <description><![CDATA[If a delele button must be added in the form]]></description>
+ <name>allowDelete</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
- </tag>
-
- <tag>
- <name>selectAssociation</name>
- <description><![CDATA[Tag used for wikittyField that are wikitty collection and show them as combobox or list]]></description>
- <tagclass>org.nuiton.wikitty.struts.tag.SelectAssociationTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
- <name>wikitty</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the businessEntity target (needed if wikitty not set)]]></description>
- <name>businessEntity</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description>
- <name>proxy</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[The field value showed in list/combobox default wikitty-id]]></description>
- <name>descField</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the name of the field concerned by the tag]]></description>
- <name>fqFieldName</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[the label of the field]]></description>
- <name>label</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the size the list/combobox]]></description>
- <name>size</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[to enable multiselect]]></description>
- <name>multiple</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>select</name>
- <description><![CDATA[Tag used to show collection of wikitty directly]]></description>
- <tagclass>org.nuiton.wikitty.struts.tag.SelectTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the size of the select]]></description>
- <name>size</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[The field value showed in list/combobox default wikitty-id]]></description>
- <name>descField</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[Collection of wikitty that will be showed inside the combobox/list (needed if entityValues Not set)]]></description>
- <name>wikittyValues</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[Collection of EntityBusiness that will be showed inside the combobox/list (needed if wikittyValues Not set)]]></description>
- <name>entityValues</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the label of the field]]></description>
- <name>label</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- </tag>
-
+ </tag>
+ <tag>
+ <description><![CDATA[Tag used for wikittyField that are wikitty collection and show them as combobox or list]]></description>
+ <name>selectAssociation</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.SelectAssociationTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity target (needed if wikitty not set)]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description>
+ <name>proxy</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The field value showed in list/combobox default wikitty-id]]></description>
+ <name>descField</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the name of the field concerned by the tag]]></description>
+ <name>fqFieldName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the size the list/combobox]]></description>
+ <name>size</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[to enable multiselect]]></description>
+ <name>multiple</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <description><![CDATA[Tag used to show collection of wikitty directly]]></description>
+ <name>select</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.SelectTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the size of the select]]></description>
+ <name>size</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The field value showed in list/combobox default wikitty-id]]></description>
+ <name>descField</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[Collection of wikitty that will be showed inside the combobox/list (needed if entityValues Not set)]]></description>
+ <name>wikittyValues</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[Collection of EntityBusiness that will be showed inside the combobox/list (needed if wikittyValues Not set)]]></description>
+ <name>entityValues</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <tag>
- <name>selectCriteria</name>
- <description><![CDATA[Tag used to construct a combobox to select /set a wikitty, when the wikitty field is a wikitty]]></description>
- <tagclass>org.nuiton.wikitty.struts.tag.SelectCriteriaTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the wikitty to edit]]></description>
- <name>wikitty</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the businessEntity to edit]]></description>
- <name>businessEntity</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description>
- <name>proxy</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[criteria to find wikitty, the matching id will be selected]]></description>
- <name>criteria</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[The field value showed in list/combobox default wikitty-id]]></description>
- <name>descField</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the name of the field that have to be specialize]]></description>
- <name>fqFieldName</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[the label of the field]]></description>
- <name>label</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>selectFixed</name>
- <description><![CDATA[Tag used to create a combobox select on a wikitty field value with value fixed]]></description>
- <tagclass>org.nuiton.wikitty.struts.tag.SelectFixedTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
- <name>wikitty</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
- <name>businessEntity</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[]]></description>
- <name>fixvalues</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[the name of the field that have to be specialize]]></description>
- <name>fqFieldName</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[the label of the field]]></description>
- <name>label</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- </tag>
+ <tag>
+ <description><![CDATA[Tag used to construct a combobox to select /set a wikitty, when the wikitty field is a wikitty]]></description>
+ <name>selectCriteria</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.SelectCriteriaTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty to edit]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity to edit]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description>
+ <name>proxy</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[criteria to find wikitty, the matching id will be selected]]></description>
+ <name>criteria</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The field value showed in list/combobox default wikitty-id]]></description>
+ <name>descField</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the name of the field that have to be specialize]]></description>
+ <name>fqFieldName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <tag>
- <name>hidden</name>
- <description><![CDATA[Tag used to create a hidden field with a wikittyField]]></description>
- <tagclass>org.nuiton.wikitty.struts.tag.HiddenTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
- <name>wikitty</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
- <name>businessEntity</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the name of the field that have to be specialize]]></description>
- <name>fqFieldName</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- </tag>
+ <tag>
+ <description><![CDATA[Tag used to create a combobox select on a wikitty field value with value fixed]]></description>
+ <name>selectFixed</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.SelectFixedTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[]]></description>
+ <name>fixvalues</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the name of the field that have to be specialize]]></description>
+ <name>fqFieldName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <tag>
- <name>textField</name>
- <description><![CDATA[tag to show wikitty field as textfield]]></description>
- <tagclass>org.nuiton.wikitty.struts.tag.TextFieldTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
- <name>wikitty</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
- <name>businessEntity</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the name of the field that have to be specialize]]></description>
- <name>fqFieldName</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[the label of the field]]></description>
- <name>label</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[if the textfiel have to hide the content, flag: true/false, default: false]]></description>
- <name>password</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
+ <tag>
+ <description><![CDATA[Tag used to create a hidden field with a wikittyField]]></description>
+ <name>hidden</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.HiddenTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the name of the field that have to be specialize]]></description>
+ <name>fqFieldName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <tag>
- <name>date</name>
- <description><![CDATA[tag to show wikitty field as textField wih improvement for date --DON'T WORK--]]></description>
- <tagclass>org.nuiton.wikitty.struts.tag.DateTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
- <name>wikitty</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
- <name>businessEntity</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the name of the field that have to be specialize]]></description>
- <name>fqFieldName</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[the label of the field]]></description>
- <name>label</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the label of the field]]></description>
- <name>enableHour</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
+ <tag>
+ <description><![CDATA[tag to show wikitty field as textfield]]></description>
+ <name>textField</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.TextFieldTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the name of the field that have to be specialize]]></description>
+ <name>fqFieldName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[if the textfiel have to hide the content, flag: true/false, default: false]]></description>
+ <name>password</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <tag>
- <name>textArea</name>
- <description><![CDATA[tag to show wikitty field as textarea]]></description>
- <tagclass>org.nuiton.wikitty.struts.tag.TextAreaTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
- <name>wikitty</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
- <name>businessEntity</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the name of the field that have to be specialize]]></description>
- <name>fqFieldName</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[the label of the field]]></description>
- <name>label</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- </tag>
+ <tag>
+ <description><![CDATA[tag to show wikitty field as textField wih improvement for date --DON'T WORK--]]></description>
+ <name>date</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.DateTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the name of the field that have to be specialize]]></description>
+ <name>fqFieldName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>enableHour</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <tag>
- <name>boolean</name>
- <description><![CDATA[tag to show wikitty field as checkbox]]></description>
- <tagclass>org.nuiton.wikitty.struts.tag.BooleanTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <description><![CDATA[id for the field]]></description>
- <name>id</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
- <name>name</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
- <name>wikitty</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
- <name>businessEntity</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- <attribute>
- <description><![CDATA[the name of the field that have to be specialize]]></description>
- <name>fqFieldName</name>
- <rtexprvalue>true</rtexprvalue>
- <required>true</required>
- </attribute>
- <attribute>
- <description><![CDATA[the label of the field]]></description>
- <name>label</name>
- <rtexprvalue>true</rtexprvalue>
- <required>false</required>
- </attribute>
- </tag>
+
+ <tag>
+ <description><![CDATA[tag to show wikitty field as textarea]]></description>
+ <name>textArea</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.TextAreaTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the name of the field that have to be specialize]]></description>
+ <name>fqFieldName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description><![CDATA[tag to show wikitty field as checkbox]]></description>
+ <name>boolean</name>
+ <tag-class>org.nuiton.wikitty.struts.tag.BooleanTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description>
+ <name>wikitty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the businessEntity to edit(needed if wikitty not set)]]></description>
+ <name>businessEntity</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the name of the field that have to be specialize]]></description>
+ <name>fqFieldName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
</taglib>
1
0
Author: maven-release
Date: 2011-09-22 19:31:03 +0200 (Thu, 22 Sep 2011)
New Revision: 1232
Url: http://nuiton.org/repositories/revision/wikitty/1232
Log:
Update mavenpom4redmine to 3.0.4.
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-09-09 16:09:05 UTC (rev 1231)
+++ trunk/pom.xml 2011-09-22 17:31:03 UTC (rev 1232)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmine</artifactId>
- <version>3.0.3</version>
+ <version>3.0.4</version>
</parent>
<!-- ************************************************************* -->
1
0
Author: tchemit
Date: 2011-09-09 18:09:05 +0200 (Fri, 09 Sep 2011)
New Revision: 1231
Url: http://nuiton.org/repositories/revision/wikitty/1231
Log:
use new site deployment configuration
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-09-09 16:07:07 UTC (rev 1230)
+++ trunk/pom.xml 2011-09-09 16:09:05 UTC (rev 1231)
@@ -735,6 +735,13 @@
<url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url>
</scm>
+ <distributionManagement>
+ <site>
+ <id>${platform}</id>
+ <url>${our.site.repository}/${projectId}</url>
+ </site>
+ </distributionManagement>
+
<!-- ************************************************************* -->
<!-- *** Project Information ************************************* -->
<!-- ************************************************************* -->
1
0
Author: tchemit
Date: 2011-09-09 18:07:07 +0200 (Fri, 09 Sep 2011)
New Revision: 1230
Url: http://nuiton.org/repositories/revision/wikitty/1230
Log:
Update mavenpom4redmine to 3.0.3.
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-09-06 09:19:25 UTC (rev 1229)
+++ trunk/pom.xml 2011-09-09 16:07:07 UTC (rev 1230)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmine</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3</version>
</parent>
<!-- ************************************************************* -->
1
0
r1229 - trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui
by mfortun@users.nuiton.org 06 Sep '11
by mfortun@users.nuiton.org 06 Sep '11
06 Sep '11
Author: mfortun
Date: 2011-09-06 11:19:25 +0200 (Tue, 06 Sep 2011)
New Revision: 1229
Url: http://nuiton.org/repositories/revision/wikitty/1229
Log:
correct NPE
Modified:
trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java
Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java
===================================================================
--- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-09-02 14:11:39 UTC (rev 1228)
+++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-09-06 09:19:25 UTC (rev 1229)
@@ -112,7 +112,9 @@
WikittyPublicationSession result = (WikittyPublicationSession) httpSession
.getAttribute(WIKITTY_PUBLICATION_SESSION_KEY
+ WIKITTY_PUBLICATION_SESSION_SEP + contextData);
- if (result == null || !result.getContext().equals(contextData)) {
+ if (result == null
+ || (result.getContext() != null && !result.getContext().equals(
+ contextData))) {
result = new WikittyPublicationSession(contextData);
httpSession.setAttribute(WIKITTY_PUBLICATION_SESSION_KEY
+ WIKITTY_PUBLICATION_SESSION_SEP + contextData, result);
@@ -140,7 +142,9 @@
WikittyPublicationSession result = (WikittyPublicationSession) session
.get(WIKITTY_PUBLICATION_SESSION_KEY
+ WIKITTY_PUBLICATION_SESSION_SEP + contextData);
- if (result == null || !result.getContext().equals(contextData)) {
+ if (result == null
+ || (result.getContext() != null && !result.getContext().equals(
+ contextData))) {
result = new WikittyPublicationSession(contextData);
session.put(WIKITTY_PUBLICATION_SESSION_KEY
+ WIKITTY_PUBLICATION_SESSION_SEP + contextData, result);
1
0
r1228 - trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action
by bpoussin@users.nuiton.org 02 Sep '11
by bpoussin@users.nuiton.org 02 Sep '11
02 Sep '11
Author: bpoussin
Date: 2011-09-02 16:11:39 +0200 (Fri, 02 Sep 2011)
New Revision: 1228
Url: http://nuiton.org/repositories/revision/wikitty/1228
Log:
restore thread class loader after action
Modified:
trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java
Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java
===================================================================
--- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-09-01 17:27:18 UTC (rev 1227)
+++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-09-02 14:11:39 UTC (rev 1228)
@@ -125,10 +125,16 @@
classloader = new WikittyPublicationClassLoader(urls);
// REALLY IMPORTANT put the classloader with the jarloaded
+ // keep class loader
+ ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+ // change class loader for action
Thread.currentThread().setContextClassLoader(classloader);
doAction(this, getMandatoryArguments());
+ // restore class loader
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
+
return SUCCESS;
}
1
0
r1227 - in trunk: wikitty-publication/src/site/doc wikitty-publication-ui/src/main/webapp/WEB-INF/jsp
by mfortun@users.nuiton.org 01 Sep '11
by mfortun@users.nuiton.org 01 Sep '11
01 Sep '11
Author: mfortun
Date: 2011-09-01 19:27:18 +0200 (Thu, 01 Sep 2011)
New Revision: 1227
Url: http://nuiton.org/repositories/revision/wikitty/1227
Log:
replace tab by 4spaces
Modified:
trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp
trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp
trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp
trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp
trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp
trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp
trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst
trunk/wikitty-publication/src/site/doc/Outils_publication.rst
trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst
Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst
===================================================================
--- trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-09-01 17:05:35 UTC (rev 1226)
+++ trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-09-01 17:27:18 UTC (rev 1227)
@@ -107,7 +107,7 @@
Import d'une classe (avec le script engine javascript) :
- * importPackage(org.nuiton.wikitty.entities);
+ * importPackage(org.nuiton.wikitty.entities);
Instanciation:
@@ -118,7 +118,7 @@
* resource.setName(wpContext.getArgument("nom"));
Par défaut il y a un certain nombre d'objets disponible en binding:
-
+
* wpEval, objet qui permet d'évaluer d'autre wikitty
* wpSubContext
* wpPage, string correspondant au mandatoy args
@@ -127,64 +127,64 @@
Interface de wpContext::
- public interface PublicationContext {
+ public interface PublicationContext {
- HttpServletRequest getRequest();
+ HttpServletRequest getRequest();
- HttpServletResponse getResponse();
+ HttpServletResponse getResponse();
- /**
- * the current wikitty proxy
- * @return
- */
- WikittyProxy getWikittyProxy();
+ /**
+ * the current wikitty proxy
+ * @return
+ */
+ WikittyProxy getWikittyProxy();
- /**
- * add context to the url and parameter if necessary
- * @param url
- * @return
- */
- String makeUrl(String url);
+ /**
+ * add context to the url and parameter if necessary
+ * @param url
+ * @return
+ */
+ String makeUrl(String url);
- /**
- * the current wikitty service
- * @return
- */
- WikittyService getWikittyService();
+ /**
+ * the current wikitty service
+ * @return
+ */
+ WikittyService getWikittyService();
- List<String> getMandatoryArguments();
+ List<String> getMandatoryArguments();
- String getArgument(String name);
+ String getArgument(String name);
- /**
- * Get
- * @param name
- * @param defaultValue
- * @return
- */
- String getArgument(String name, String defaultValue);
+ /**
+ * Get
+ * @param name
+ * @param defaultValue
+ * @return
+ */
+ String getArgument(String name, String defaultValue);
- /**
- * return the actual return content tye for the page
- * @return
- */
- String getContentType();
+ /**
+ * return the actual return content tye for the page
+ * @return
+ */
+ String getContentType();
- /**
- * Set the content type for the return page
- * @param contentType
- */
- void setContentType(String contentType);
+ /**
+ * Set the content type for the return page
+ * @param contentType
+ */
+ void setContentType(String contentType);
- String toString();
+ String toString();
- /**
- * the map of the arguments in the context
- * @return
- */
- Map<String,String> getArguments();
+ /**
+ * the map of the arguments in the context
+ * @return
+ */
+ Map<String,String> getArguments();
- }
+ }
Par exemple
@@ -207,19 +207,19 @@
Le projet resourceEntity:
- resourceEntity/
- |-- changelog.txt
- |-- LICENSE.tx
- |-- LICENSE.txt
- |-- pom.xml
- |-- README.txt
- `-- src
- `-- main
- |-- java
- |-- resources
- `-- xmi
- |-- wp-resource.properties
- |-- wp-resource.zargo
+ resourceEntity/
+ |-- changelog.txt
+ |-- LICENSE.tx
+ |-- LICENSE.txt
+ |-- pom.xml
+ |-- README.txt
+ `-- src
+ `-- main
+ |-- java
+ |-- resources
+ `-- xmi
+ |-- wp-resource.properties
+ |-- wp-resource.zargo
ResourceEntity est un mini projet d'utilisation de Wikitty et création d'entity
@@ -229,23 +229,23 @@
Le projet resourceAppli:
- resourceAppli/
- |-- pom.xml
- `-- src
- `-- main
- |-- resources
- | |-- images
- | | `-- wikittypubuml.png
- | `-- jar
- `-- wp
- |-- clearProxy.java
- |-- dummy.htmljs
- |-- Javahtml.htmlja
- |-- JavaView.java
- |-- resources.htmljs
- |-- SelfModify.htmljs
- |-- Test.java
- `-- view.htmljs
+ resourceAppli/
+ |-- pom.xml
+ `-- src
+ `-- main
+ |-- resources
+ | |-- images
+ | | `-- wikittypubuml.png
+ | `-- jar
+ `-- wp
+ |-- clearProxy.java
+ |-- dummy.htmljs
+ |-- Javahtml.htmlja
+ |-- JavaView.java
+ |-- resources.htmljs
+ |-- SelfModify.htmljs
+ |-- Test.java
+ `-- view.htmljs
Ce projet est le "parfait" exemple d'utilisation, l'architecture à été initialisé
avec la commande wp:init. Pour le faire fonctionner, il faut rajouter le jar
Modified: trunk/wikitty-publication/src/site/doc/Outils_publication.rst
===================================================================
--- trunk/wikitty-publication/src/site/doc/Outils_publication.rst 2011-09-01 17:05:35 UTC (rev 1226)
+++ trunk/wikitty-publication/src/site/doc/Outils_publication.rst 2011-09-01 17:27:18 UTC (rev 1227)
@@ -101,31 +101,31 @@
Pom élémentaire
***************
- <?xml version="1.0" encoding="UTF-8"?>
- <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>[groupID]</groupId>
- <artifactId>[artifactId]</artifactId>
- <version>[version]</version>
- <description>[description]</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.nuiton.wikitty</groupId>
- <artifactId>wp-maven-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
- <configuration>
- <applicationName>[applicationName]</applicationName>
- <wikittyServiceUrl>[wikittyServiceUrl]</wikittyServiceUrl>
- <serveurID>[serveurID]</serveurID>
- <uploadUrl>[uploadUrl]</uploadUrl>
- <publicationVersion>[publicationVersion]</publicationVersion>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </project>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>[groupID]</groupId>
+ <artifactId>[artifactId]</artifactId>
+ <version>[version]</version>
+ <description>[description]</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.nuiton.wikitty</groupId>
+ <artifactId>wp-maven-plugin</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ <configuration>
+ <applicationName>[applicationName]</applicationName>
+ <wikittyServiceUrl>[wikittyServiceUrl]</wikittyServiceUrl>
+ <serveurID>[serveurID]</serveurID>
+ <uploadUrl>[uploadUrl]</uploadUrl>
+ <publicationVersion>[publicationVersion]</publicationVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </project>
Les valeurs [groupID], [artifactId], [version], [description] se remplissent
selon l'application développée.
@@ -142,13 +142,13 @@
De plus si l'on déclare des dépendances dans ce pom, de façon "classique" par
exemple:
- <dependencies>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ </dependencies>
Les dépendances seront automatiquement téléchargées et ajoutées dans le dossier
adéquat.
Modified: trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst
===================================================================
--- trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-09-01 17:05:35 UTC (rev 1226)
+++ trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-09-01 17:27:18 UTC (rev 1227)
@@ -65,51 +65,51 @@
Les Options de fitre:
*********************
- * OpeningTemplate: chaine d'ouverture du template
- * WriteString: instruction d'écriture
- * StringDelim: délimiteur de chaine exemple "
- * ConcatChar: caractère de concaténation
- * EndingCar: caractère de fin d'instruction
- * ClosingWriterChar: chaine qui se place avant le caractère de fin et le délimiteur de chaine
- * OpeningWriterChar: chaine qui se place juste après l'instruction d'écriture et avant le délimiteur de chaine
- * ClosingTemplate: chaine de fermeture du template
- * Key: clé du mime type, définition des langages utilisé langageAutourBalise.LangageEntreBalise si le mime type du wikitty pub fini par la clé, ce template sera appliqué. Key sous forme [xxx.yyy]
+ * OpeningTemplate: chaine d'ouverture du template
+ * WriteString: instruction d'écriture
+ * StringDelim: délimiteur de chaine exemple "
+ * ConcatChar: caractère de concaténation
+ * EndingCar: caractère de fin d'instruction
+ * ClosingWriterChar: chaine qui se place avant le caractère de fin et le délimiteur de chaine
+ * OpeningWriterChar: chaine qui se place juste après l'instruction d'écriture et avant le délimiteur de chaine
+ * ClosingTemplate: chaine de fermeture du template
+ * Key: clé du mime type, définition des langages utilisé langageAutourBalise.LangageEntreBalise si le mime type du wikitty pub fini par la clé, ce template sera appliqué. Key sous forme [xxx.yyy]
Un exemple de fonctionnement
****************************
Contenu d'un wikitty pub text::
-
- <html>
- <%var name="bob"%>
- <h1>Hello World <%=name%>!</h1>
- </html>
+
+ <html>
+ <%var name="bob"%>
+ <h1>Hello World <%=name%>!</h1>
+ </html>
Règle de remplacement avec le template::
- wpContext.setContentType("text/[yyy]")[EndingCar]
-
- [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar]
+ wpContext.setContentType("text/[yyy]")[EndingCar]
+
+ [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar]
- [WriteString][OpeningWriterChar][StringDelim]bob[StringDelim][ClosingWriterChar][EndingCar]
+ [WriteString][OpeningWriterChar][StringDelim]bob[StringDelim][ClosingWriterChar][EndingCar]
- [WriteString][OpeningWriterChar][StringDelim]<h1>Hello World [StringDelim]
- [ConcatChar]name[ConcatChar][StringDelim]!</h1>[StringDelim][ClosingWriterChar][EndingCar]
+ [WriteString][OpeningWriterChar][StringDelim]<h1>Hello World [StringDelim]
+ [ConcatChar]name[ConcatChar][StringDelim]!</h1>[StringDelim][ClosingWriterChar][EndingCar]
- [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate]
+ [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate]
ce filtre sera actif quand on le mime type du wikittyPubText sera :
text/[xxx.yyy], après transformation par le filtre le mimetype sera text/[xxx]
Si on avait utilisé le filtre de base::
- wpContext.setContentType("text/html; charset=UTF-8");
-
- var wp_result="<html>";
- var name= bob;
- wp_result+="<h1>Hello World "+name+"!</h1>";
- wp_result+="</html>";
+ wpContext.setContentType("text/html; charset=UTF-8");
+
+ var wp_result="<html>";
+ var name= bob;
+ wp_result+="<h1>Hello World "+name+"!</h1>";
+ wp_result+="</html>";
ce filtre sera actif quand on le mime type du wikittyPubText sera :
Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp
===================================================================
--- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-09-01 17:05:35 UTC (rev 1226)
+++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-09-01 17:27:18 UTC (rev 1227)
@@ -75,11 +75,11 @@
<h1>Edit <%=wikitty.getId()%></h1>
<p>
- <s:set var="localContext"><%=action.getContextData()%></s:set>
- <s:url var="urledit" action="%{#localContext}/view/" />
- <a href="${urledit}">View</a>
- <s:url var="urledit" action="%{#localContext}/edit/" />
- <a href="${urledit}">New Wikitty</a>
+ <s:set var="localContext"><%=action.getContextData()%></s:set>
+ <s:url var="urledit" action="%{#localContext}/view/" />
+ <a href="${urledit}">View</a>
+ <s:url var="urledit" action="%{#localContext}/edit/" />
+ <a href="${urledit}">New Wikitty</a>
</p>
<pre><%=StringEscapeUtils.escapeHtml(String.valueOf(wikitty))%></pre>
@@ -89,8 +89,8 @@
var uiCodeMiror="";
function changeModeBy(select){
- uiCodeMiror.mirror.setOption("mode",select.value);
- uiCodeMiror.reindent();
+ uiCodeMiror.mirror.setOption("mode",select.value);
+ uiCodeMiror.reindent();
}
//-->
@@ -126,7 +126,7 @@
}
%>
- <input type="submit" name="addExtension" value="<%=action.getText("publication.edit.addExtension")%>" />
+ <input type="submit" name="addExtension" value="<%=action.getText("publication.edit.addExtension")%>" />
</fieldset>
<%
Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp
===================================================================
--- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-09-01 17:05:35 UTC (rev 1226)
+++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-09-01 17:27:18 UTC (rev 1227)
@@ -33,6 +33,6 @@
xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
xmlns:jsp="http://java.sun.com/JSP/Page">
- <div id="copyright"> Copyright Code Lutin 2010, AGPLv3 </div>
+ <div id="copyright"> Copyright Code Lutin 2010, AGPLv3 </div>
</div>
Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp
===================================================================
--- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-09-01 17:05:35 UTC (rev 1226)
+++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-09-01 17:27:18 UTC (rev 1227)
@@ -22,8 +22,7 @@
<http://www.gnu.org/licenses/lgpl-3.0.html>.
#L%
--%>
-<%@page
- import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%>
+<%@page import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%>
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@taglib prefix="s" uri="/struts-tags" %>
@@ -46,28 +45,28 @@
}
%>
- <s:url var="urlLogin" action="login" namespace="/%{contextData}" />
+ <s:url var="urlLogin" action="login" namespace="/%{contextData}" />
<s:form action="%{urlLogin}">
- <p>
- <s:set id="publication.login.login">
- <s:text name="publication.login.login" />
- </s:set>
- <s:set id="publication.login.password">
- <s:text name="publication.login.password" />
- </s:set>
- <s:set id="publication.login.submit">
- <s:text name="publication.login.submit" />
- </s:set>
+ <p>
+ <s:set id="publication.login.login">
+ <s:text name="publication.login.login" />
+ </s:set>
+ <s:set id="publication.login.password">
+ <s:text name="publication.login.password" />
+ </s:set>
+ <s:set id="publication.login.submit">
+ <s:text name="publication.login.submit" />
+ </s:set>
- <input type="hidden" name="success" value="<%=successValue%>" /> <input
- type="hidden" name="error" value="<%=errorValue%>" />
- <s:textfield key="login" name="login" labelposition="top"
- labelSeparator=" :" label="%{publication.login.login}" />
- <br /> <br />
- <s:password key="password" name="password" labelposition="top"
- labelSeparator=" :" label="%{publication.login.password}" />
- <br /> <br />
- <s:submit key="publication.login.submit" name="submit"
- value="%{publication.login.submit}" />
- </p>
+ <input type="hidden" name="success" value="<%=successValue%>" /> <input
+ type="hidden" name="error" value="<%=errorValue%>" />
+ <s:textfield key="login" name="login" labelposition="top"
+ labelSeparator=" :" label="%{publication.login.login}" />
+ <br /> <br />
+ <s:password key="password" name="password" labelposition="top"
+ labelSeparator=" :" label="%{publication.login.password}" />
+ <br /> <br />
+ <s:submit key="publication.login.submit" name="submit"
+ value="%{publication.login.submit}" />
+ </p>
</s:form>
\ No newline at end of file
Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp
===================================================================
--- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-09-01 17:05:35 UTC (rev 1226)
+++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-09-01 17:27:18 UTC (rev 1227)
@@ -27,44 +27,44 @@
<%@taglib prefix="s" uri="/struts-tags" %>
<div id="content">
- <div id="formFrame" class="fond">
- <h1>
- <s:text name="Register" />
- </h1>
- <s:url var="urlRegister" action="register" namespace="/%{contextData}" />
-
- <s:form action="%{urlRegister}">
- <s:actionerror />
- <p>
- <s:set id="publication.login.login">
- <s:text name="publication.login.login" />
- </s:set>
- <s:set id="publication.login.password">
- <s:text name="publication.login.password" />
- </s:set>
- <s:set id="publication.login.repeatPassword">
- <s:text name="publication.login.repeatPassword" />
- </s:set>
- <s:set id="publication.register.submit">
- <s:text name="publication.register.submit" />
- </s:set>
+ <div id="formFrame" class="fond">
+ <h1>
+ <s:text name="Register" />
+ </h1>
+ <s:url var="urlRegister" action="register" namespace="/%{contextData}" />
+
+ <s:form action="%{urlRegister}">
+ <s:actionerror />
+ <p>
+ <s:set id="publication.login.login">
+ <s:text name="publication.login.login" />
+ </s:set>
+ <s:set id="publication.login.password">
+ <s:text name="publication.login.password" />
+ </s:set>
+ <s:set id="publication.login.repeatPassword">
+ <s:text name="publication.login.repeatPassword" />
+ </s:set>
+ <s:set id="publication.register.submit">
+ <s:text name="publication.register.submit" />
+ </s:set>
- <s:textfield key="publication.login.login" name="login"
- label="%{publication.login.login}" labelposition="top"
- labelSeparator=" :" />
- <s:password key="publication.login.password" name="password"
- label="%{publication.login.password}" labelposition="top"
- labelSeparator=" :" />
- <s:password key="publication.login.repeatPassword"
- label="%{publication.login.repeatPassword}" name="repeatPassword"
- labelposition="top" labelSeparator=" :" />
- <s:submit key="publication.register.submit" name="submit"
- value="%{publication.register.submit}" />
- </p>
- </s:form>
- <s:a action="login_input" id="loginLink">
- <s:text name="login" />
- </s:a>
- </div>
+ <s:textfield key="publication.login.login" name="login"
+ label="%{publication.login.login}" labelposition="top"
+ labelSeparator=" :" />
+ <s:password key="publication.login.password" name="password"
+ label="%{publication.login.password}" labelposition="top"
+ labelSeparator=" :" />
+ <s:password key="publication.login.repeatPassword"
+ label="%{publication.login.repeatPassword}" name="repeatPassword"
+ labelposition="top" labelSeparator=" :" />
+ <s:submit key="publication.register.submit" name="submit"
+ value="%{publication.register.submit}" />
+ </p>
+ </s:form>
+ <s:a action="login_input" id="loginLink">
+ <s:text name="login" />
+ </s:a>
+ </div>
</div>
\ No newline at end of file
Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp
===================================================================
--- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-09-01 17:05:35 UTC (rev 1226)
+++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-09-01 17:27:18 UTC (rev 1227)
@@ -35,12 +35,12 @@
<%@page import="org.nuiton.wikitty.publication.entities.WikittyPubText"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page
- import="org.nuiton.wikitty.publication.ui.action.PublicationActionView"%>
+ import="org.nuiton.wikitty.publication.ui.action.PublicationActionView"%>
<%@page import="org.nuiton.util.StringUtil"%>
<%@page import="org.nuiton.wikitty.search.Criteria"%>
<%@page import="org.nuiton.wikitty.search.Search"%>
<%@page
- import="org.nuiton.wikitty.publication.ui.WikittyPublicationSession"%>
+ import="org.nuiton.wikitty.publication.ui.WikittyPublicationSession"%>
<%@page import="org.nuiton.wikitty.search.PagedResult"%>
<%@page import="org.nuiton.wikitty.entities.Wikitty"%>
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
@@ -69,108 +69,108 @@
%>
<p>
- <s:set var="contextData"><%=action.getContextData()%></s:set> <s:url
- var="urledit" action="%{#contextData}/edit/" />
- <a href="${urledit}">New wikitty</a>
+ <s:set var="contextData"><%=action.getContextData()%></s:set> <s:url
+ var="urledit" action="%{#contextData}/edit/" />
+ <a href="${urledit}">New wikitty</a>
</p>
<div id="wikittyInfo">
- <img src="/img/indicator.gif"
- alt="Loading..." style="display: none" />
+ <img src="/img/indicator.gif"
+ alt="Loading..." style="display: none" />
</div>
<form action="view.action" method="post">
- <div>
- <textarea title="Search" name="searchRequest"><%=action.getSearchRequest()%></textarea>
- </div>
- <s:textfield label="First" key="first" name="first" />
- <s:textfield label="End" key="end" name="end" />
- <input type="submit" name="search" value="<%=action.getText("publication.view.search")%>" />
-
- <pre> <%=action.getText("publication.view.founds")%>: <%=action.getPagedResult().getNumFound()%></pre>
-
- <br/>
+ <div>
+ <textarea title="Search" name="searchRequest"><%=action.getSearchRequest()%></textarea>
+ </div>
+ <s:textfield label="First" key="first" name="first" />
+ <s:textfield label="End" key="end" name="end" />
+ <input type="submit" name="search" value="<%=action.getText("publication.view.search")%>" />
+
+ <pre> <%=action.getText("publication.view.founds")%>: <%=action.getPagedResult().getNumFound()%></pre>
+
+ <br/>
- <table border="1">
- <tr>
- <td></td>
- <td>Wikitty Id</td>
- <td>Version</td>
- <td>Extensions</td>
- <td>WikittyPub* Name</td>
- </tr>
+ <table border="1">
+ <tr>
+ <td></td>
+ <td>Wikitty Id</td>
+ <td>Version</td>
+ <td>Extensions</td>
+ <td>WikittyPub* Name</td>
+ </tr>
- <%
- int i = 0;
- for (Wikitty w : action.getPagedResult().getAll()) {
- %>
- <tr>
- <td>
-
-
- <s:set var="wid"><%=w.getId()%></s:set>
- <s:url var="urledit" action="%{#contextData}/edit/elt_id:%{#wid}" />
- <a href="${urledit}">Edit</a> <s:url var="urlraw"
- action="%{#contextData}/raw/elt_id:%{#wid}" />
- <s:url var="urlFragment" action="%{#contextData}/wikittyInfo" namespace="/fragment">
-
- </s:url>
-
-
- <sj:a targets="wikittyInfo" href="%{#urlFragment}"> view</sj:a>
-
- <%
- if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)
- || w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) {
- %>
- <a
- href="${urlraw}">Raw</a> <s:url var="urleval"
- action="%{#contextData}/eval/elt_id:%{#wid}" /> <a
- href="${urleval}">Eval</a>
- <%
- }
- %>
+ <%
+ int i = 0;
+ for (Wikitty w : action.getPagedResult().getAll()) {
+ %>
+ <tr>
+ <td>
+
+
+ <s:set var="wid"><%=w.getId()%></s:set>
+ <s:url var="urledit" action="%{#contextData}/edit/elt_id:%{#wid}" />
+ <a href="${urledit}">Edit</a> <s:url var="urlraw"
+ action="%{#contextData}/raw/elt_id:%{#wid}" />
+ <s:url var="urlFragment" action="%{#contextData}/wikittyInfo" namespace="/fragment">
+
+ </s:url>
+
+
+ <sj:a targets="wikittyInfo" href="%{#urlFragment}"> view</sj:a>
+
+ <%
+ if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)
+ || w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) {
+ %>
+ <a
+ href="${urlraw}">Raw</a> <s:url var="urleval"
+ action="%{#contextData}/eval/elt_id:%{#wid}" /> <a
+ href="${urleval}">Eval</a>
+ <%
+ }
+ %>
- </td>
- <td><%=w.getId()%></td>
- <td><%=w.getVersion()%></td>
- <td><%=w.getExtensionNames()%></td>
- <td>
- <%
- String currentWikittyName = StringUtils.EMPTY;
- if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) {
- currentWikittyName = WikittyPubTextHelper
- .getName(w);
- } else if (w
- .hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) {
- currentWikittyName = WikittyPubDataHelper
- .getName(w);
- }
- %>
- <%=currentWikittyName%>
- </td>
- </tr>
- <%
- i++;
- }
- %>
+ </td>
+ <td><%=w.getId()%></td>
+ <td><%=w.getVersion()%></td>
+ <td><%=w.getExtensionNames()%></td>
+ <td>
+ <%
+ String currentWikittyName = StringUtils.EMPTY;
+ if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) {
+ currentWikittyName = WikittyPubTextHelper
+ .getName(w);
+ } else if (w
+ .hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) {
+ currentWikittyName = WikittyPubDataHelper
+ .getName(w);
+ }
+ %>
+ <%=currentWikittyName%>
+ </td>
+ </tr>
+ <%
+ i++;
+ }
+ %>
- </table>
- <input type="submit" name="previous" value="
- <%=action.getText("publication.view.previous")%>" /> <input
- type="submit" name="next" value="<%=action.getText("publication.view.next")%>" />
+ </table>
+ <input type="submit" name="previous" value="
+ <%=action.getText("publication.view.previous")%>" /> <input
+ type="submit" name="next" value="<%=action.getText("publication.view.next")%>" />
</form>
-
-
\ No newline at end of file
+
+
\ No newline at end of file
Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp
===================================================================
--- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-09-01 17:05:35 UTC (rev 1226)
+++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-09-01 17:27:18 UTC (rev 1227)
@@ -24,8 +24,7 @@
--%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="org.nuiton.wikitty.entities.Wikitty"%>
-<%@page
- import="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"%>
+<%@page import="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"%>
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@taglib prefix="s" uri="/struts-tags" %>
1
0