October 2011 - Wikitty-commits - mailman.cloud.codelutin.com

r1239 - in trunk/wikitty-api: . src/main/java/org/nuiton/wikitty src/main/java/org/nuiton/wikitty/search src/test/java/org/nuiton/wikitty/api src/test/xmi
by sletellier＠users.nuiton.org Oct. 25, 2011

Oct. 25, 2011

Author: sletellier Date: 2011-10-25 10:37:08 +0200 (Tue, 25 Oct 2011) New Revision: 1239 Url: http://nuiton.org/repositories/revision/wikitty/1239 Log: - #1785 Add select method to allow specify wikittyId return field - Reactivate test model generation - Include BusinessEntity in search test Modified: trunk/wikitty-api/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java trunk/wikitty-api/src/test/xmi/wikittytest.zargo Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-10-21 16:21:57 UTC (rev 1238) +++ trunk/wikitty-api/pom.xml 2011-10-25 08:37:08 UTC (rev 1239) @@ -171,7 +171,7 @@ <goal>smart-generate</goal> </goals> </execution> -  + </execution> </executions> </plugin> 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-21 16:21:57 UTC (rev 1238) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-10-25 08:37:08 UTC (rev 1239) @@ -424,18 +424,16 @@ // extension wanted by BusinessEntity (clazz) // is not in wikitty, then wikitty is not good type // for business - result = null; + dto = null; break; } } - // le break au dessus permet de soritr d'une boucle - // met si result est null il faut sortir de la methode et donc - // sortir de la deuxieme boucle - if (result == null) { - break; - } } - result.add(dto); + + // Add only entity in good types + if (dto != null) { + result.add(dto); + } } } timeLog.log(start, "restore<list>"); @@ -587,37 +585,46 @@ BusinessEntityImpl sample = (BusinessEntityImpl) WikittyUtil.newInstance(clazz); - Wikitty wikitty = sample.getWikitty(); - Collection<String> extensions = wikitty.getExtensionNames(); +// Commented for task : #1785 Add select method to allow specify wikittyId return field +// No restriction is added on criteria, now, type verification is make on restore +// +// Check will be done in restore +// +// Wikitty wikitty = sample.getWikitty(); +// Collection<String> extensions = wikitty.getExtensionNames(); - List<Criteria> serviceCriterias = new ArrayList<Criteria>(criterias.size()); - for (Criteria criteria : criterias) { - // on ajoute la condition sur les extensions dans le critere - // du coup, pour ne pas modifier le critere qui vient en parametre - // il faut creer un nouveau critere ... - Criteria serviceCriteria = null; - if (criteria != null) { - // creation de la nouvelle contrainte - Search search = Search.query(criteria); - search = search.exteq(extensions); +// List<Criteria> serviceCriterias = new ArrayList<Criteria>(criterias.size()); +// for (Criteria criteria : criterias) { +// // on ajoute la condition sur les extensions dans le critere +// // du coup, pour ne pas modifier le critere qui vient en parametre +// // il faut creer un nouveau critere ... +// Criteria serviceCriteria = null; +// if (criteria != null) { +// // creation de la nouvelle contrainte +// Search search = Search.query(criteria); +// search = search.exteq(extensions); +// +// // utilisation de cette nouvelle contrainte sur le nouvel objet +// serviceCriteria = criteria.clone(); +// serviceCriteria.setRestriction(search); +// } +// +// // ajout de ce criteria dans la liste de tous les criteres +// serviceCriterias.add(serviceCriteria); +// +// } - // utilisation de cette nouvelle contrainte sur le nouvel objet - serviceCriteria = criteria.clone(); - serviceCriteria.setRestriction(search); - } - - // ajout de ce criteria dans la liste de tous les criteres - serviceCriterias.add(serviceCriteria); - } - List<PagedResult<String>> pagedResult = wikittyService.findAllByCriteria( - securityToken, serviceCriterias); + securityToken, criterias); // TODO poussin 20110318 optimize cast. Try to cast all pagedResult id // in one call to service. Currently each PagedResult.cast do a call result = new ArrayList<PagedResult<E>>(pagedResult.size()); for (PagedResult<String> p : pagedResult) { - result.add((PagedResult<E>)p.cast(this, sample.getClass(), true)); + +// #1785 Add select method to allow specify wikittyId return field +// autoconvert is set to false to keep only entities in good type + result.add((PagedResult<E>)p.cast(this, sample.getClass(), false)); } } timeLog.log(start, "findAllByCriteria<Business>(List)"); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2011-10-21 16:21:57 UTC (rev 1238) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2011-10-25 08:37:08 UTC (rev 1239) @@ -320,6 +320,32 @@ */ public List<String> findByCriteria(String securityToken, List<Criteria> criteria); +// /** +// * Looking for Wikitty that match criteria. More than one criteria can be +// * passed in parametre, for each criteria in parametre there is a PagedResult +// * associated with the same index. +// * +// * @param securityToken security token +// * @param fqFieldName field name for result +// * @param criteria +// * @return +// */ +// public List<PagedResult<String>> findAllByCriteria( +// String securityToken, String fqFieldName, List<Criteria> criteria); +// +// /** +// * First lonely (or first one) wikitty object that match criteria, if no +// * wikitty found or first retrived is not authorized for the user return +// * null. for each criteria in parametre there is a result +// * associated with the same index. +// * +// * @param securityToken security token +// * @param fqFieldName field name for result +// * @param criteria +// * @return wikitty field name value object or null +// */ +// public List<String> findByCriteria(String securityToken, String fqFieldName, List<Criteria> criteria); + /* * Classification * Most of classification purpose is handle by extension mechanisms Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2011-10-21 16:21:57 UTC (rev 1238) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2011-10-25 08:37:08 UTC (rev 1239) @@ -75,6 +75,8 @@ */ protected String name; + protected String select; + /** All restriction on fields. */ protected Restriction restriction; @@ -144,6 +146,10 @@ } } + if (select != null) { + clone.select = select; + } + return clone; } catch (CloneNotSupportedException eee) { throw new WikittyException("Can't clone criteria", eee); @@ -212,6 +218,14 @@ this.name = name; } + public String getSelect() { + return select; + } + + public void setSelect(String select) { + this.select = select; + } + public int getFirstIndex() { return firstIndex; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-10-21 16:21:57 UTC (rev 1238) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-10-25 08:37:08 UTC (rev 1239) @@ -623,9 +623,10 @@ } /** + * Add {@link SubSearch} to allow search on association (like sql join) * - * @param foreignFieldName - * @return + * @param foreignFieldName association fieldName + * @return sub query */ public Search associated(String foreignFieldName) { Search search = new SubSearch(foreignFieldName, this); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java 2011-10-21 16:21:57 UTC (rev 1238) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java 2011-10-25 08:37:08 UTC (rev 1239) @@ -33,8 +33,12 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.CategoryEntity; +import org.nuiton.wikitty.entities.CategoryEntityImpl; import org.nuiton.wikitty.entities.ExtensionFactory; import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.ProductEntity; +import org.nuiton.wikitty.entities.ProductEntityImpl; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; @@ -46,7 +50,9 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; import static org.junit.Assert.assertEquals; @@ -67,6 +73,7 @@ public static final String CATEGORY_NAME = "name"; public static final String VERSION = "3.0"; public static String W_ID =""; + public static String W_ENTITY_ID =""; protected WikittyProxy proxy = new WikittyProxy(getWikittyService()); @@ -118,7 +125,7 @@ product1.setField(EXT_PRODUCT, PRODUCT_NAME, "Paint"); product1.setField(EXT_PRODUCT, PRODUCT_PRICE, 20); product1.setField(EXT_PRODUCT, PRODUCT_CATEGORY, category1.getId()); - List<String> colors1 = new ArrayList<String>(); + Set<String> colors1 = new HashSet<String>(); colors1.add("Blue"); colors1.add("Black"); product1.setField(EXT_PRODUCT, PRODUCT_COLOR, colors1); @@ -130,7 +137,7 @@ product2.setField(EXT_PRODUCT, PRODUCT_NAME, "Screwdriver"); product2.setField(EXT_PRODUCT, PRODUCT_PRICE, 3); product2.setField(EXT_PRODUCT, PRODUCT_CATEGORY, category2.getId()); - List<String> colors2 = new ArrayList<String>(); + Set<String> colors2 = new HashSet<String>(); colors2.add("Red"); colors2.add("Black"); product2.setField(EXT_PRODUCT, PRODUCT_COLOR, colors2); @@ -142,13 +149,57 @@ product3.setField(EXT_PRODUCT, PRODUCT_NAME, "Paint Blue"); product3.setField(EXT_PRODUCT, PRODUCT_PRICE, 22); product3.setField(EXT_PRODUCT, PRODUCT_CATEGORY, category2.getId()); - List<String> colors3 = new ArrayList<String>(); + Set<String> colors3 = new HashSet<String>(); colors3.add("Blue"); product3.setField(EXT_PRODUCT, PRODUCT_COLOR, colors3); proxy.store(product3); W_ID = product3.getId(); + /////////////////////////////////////////////////////////////////////// + // CREATE CATEGORIES ENTITIES // + /////////////////////////////////////////////////////////////////////// + + //Create wikitty category named "Hardware" + CategoryEntity categoryEntity1 = new CategoryEntityImpl(); + categoryEntity1.setName("HardWare"); + proxy.store(categoryEntity1); + + //Create wikitty category named "Wrong category" + CategoryEntity categoryEntity2 = new CategoryEntityImpl(); + categoryEntity2.setName("Wrong category"); + proxy.store(categoryEntity2); + + /////////////////////////////////////////////////////////////////////// + // CREATE PRODUCTS ENTITIES // + /////////////////////////////////////////////////////////////////////// + + //Create product named Paint, price is 20 category is category1 + ProductEntity productEntity1 = new ProductEntityImpl(); + productEntity1.setName("Paint"); + productEntity1.setPrice(20); + productEntity1.setCategoryEntity(categoryEntity1.getWikittyId()); + productEntity1.setColors(colors1); + proxy.store(productEntity1); + + //Create product named Screwdriver, price is 3, category is category2 + ProductEntity productEntity2 = new ProductEntityImpl(); + productEntity2.setName("Screwdriver"); + productEntity2.setPrice(3); + productEntity2.setCategoryEntity(categoryEntity2.getWikittyId()); + productEntity2.setColors(colors2); + proxy.store(productEntity2); + + //Create product named Paint Blue, price is 22, category is category2 + ProductEntity productEntity3 = new ProductEntityImpl(); + productEntity3.setName("Paint Blue"); + productEntity3.setPrice(22); + productEntity3.setCategoryEntity(categoryEntity2.getWikittyId()); + productEntity3.setColors(colors3); + proxy.store(productEntity3); + + W_ENTITY_ID = productEntity3.getWikittyId(); + } protected void assumeNotYetImplementedInMemory() { @@ -212,18 +263,76 @@ } @Test + public void testEntitiesEq() throws Exception { + + Search query = Search.query().eq(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "3"); + + Criteria eqCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, eqCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Screwdriver", resultW.getName()); + Assert.assertEquals(3, resultW.getPrice()); + + + //Test using pattern matching + Search query2 = Search.query().eq(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*dri*"); + + Criteria eqCriteria2 = query2.criteria(); + + PagedResult<ProductEntity> results2 = proxy.findAllByCriteria(ProductEntity.class, eqCriteria2); + + Assert.assertEquals(1, results2.getAll().size()); + + ProductEntity resultW2 = results.getFirst(); + + Assert.assertEquals("Screwdriver", resultW2.getName()); + Assert.assertEquals(3, resultW2.getPrice()); + + //Test using pattern matching + Search query3 = Search.query().eq(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*dri?er"); + + Criteria eqCriteria3 = query3.criteria(); + + PagedResult<ProductEntity> results3 = proxy.findAllByCriteria(ProductEntity.class, eqCriteria3); + + Assert.assertEquals(1, results3.getAll().size()); + + ProductEntity resultW3 = results.getFirst(); + + Assert.assertEquals("Screwdriver", resultW3.getName()); + Assert.assertEquals(3, resultW3.getPrice()); + } + + @Test public void testNeq() throws Exception { - Search query = Search.query().neq("Product.price", "3"); + Search query = Search.query().exteq(EXT_PRODUCT).neq("Product.price", "3"); Criteria neqCriteria = query.criteria(); PagedResult<Wikitty> results = proxy.findAllByCriteria(neqCriteria); - Assert.assertEquals(4, results.getAll().size()); + Assert.assertEquals(2, results.getAll().size()); } @Test + public void testEntitiesNeq() throws Exception { + Search query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY).neq(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "3"); + + Criteria neqCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, neqCriteria); + + Assert.assertEquals(2, results.getAll().size()); + + } + + @Test public void testBw() throws Exception { Search query = Search.query().bw("Product.price", "3", "5"); @@ -243,6 +352,23 @@ } @Test + public void testEntitiesBw() throws Exception { + + Search query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "3", "5"); + + Criteria bwCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Screwdriver", resultW.getName()); + Assert.assertEquals(3, resultW.getPrice()); + } + + @Test public void testLt() throws Exception { Search query = Search.query().lt("Product.price", "20"); @@ -262,7 +388,25 @@ } - @Test + @Test + public void testEntitiesLt() throws Exception { + + Search query = Search.query().lt(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + + Criteria bwCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Screwdriver", resultW.getName()); + Assert.assertEquals(3, resultW.getPrice()); + + } + + @Test public void testLe() throws Exception { Search query = Search.query().le("Product.price", "20"); @@ -274,7 +418,19 @@ Assert.assertEquals(2, results.getAll().size()); } - @Test + @Test + public void testEntitiesLe() throws Exception { + + Search query = Search.query().le(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + + Criteria bwCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + + Assert.assertEquals(2, results.getAll().size()); + } + + @Test public void testGt() throws Exception { Search query = Search.query().gt("Product.price", "20"); @@ -294,7 +450,25 @@ } - @Test + @Test + public void testEntitiesGt() throws Exception { + + Search query = Search.query().gt(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + + Criteria bwCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Paint Blue", resultW.getName()); + Assert.assertEquals(22, resultW.getPrice()); + + } + + @Test public void testGe() throws Exception { Search query = Search.query().ge("Product.price", "20"); @@ -308,6 +482,19 @@ } @Test + public void testEntitiesGe() throws Exception { + + Search query = Search.query().ge(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + + Criteria bwCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + + Assert.assertEquals(2, results.getAll().size()); + + } + + @Test public void testContains() throws Exception { Search query = Search.query().contains("Product.price", "3"); @@ -330,6 +517,26 @@ } @Test + public void testEntitiesContains() throws Exception { + + Search query = Search.query().contains(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "3"); + + Criteria inCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, inCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Screwdriver", resultW.getName()); + Assert.assertEquals(3, resultW.getPrice()); + + //TODO JC-07-04-2011 do a test with multi-valued field + + } + + @Test public void testIn() throws Exception { Search query = Search.query().in("Product.price", "1", "2", "3", "4", "5"); @@ -349,6 +556,23 @@ } @Test + public void testEntitiesIn() throws Exception { + + Search query = Search.query().in(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "1", "2", "3", "4", "5"); + + Criteria inCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, inCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Screwdriver", resultW.getName()); + Assert.assertEquals(3, resultW.getPrice()); + } + + @Test public void testExteq() throws Exception { Search query = Search.query().exteq(EXT_PRODUCT); @@ -360,6 +584,17 @@ } @Test + public void testEntitiesExteq() throws Exception { + Search query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY); + + Criteria exteqCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, exteqCriteria); + + Assert.assertEquals(3, results.getAll().size()); + } + + @Test public void testExtneq() throws Exception { Search query = Search.query().extneq(EXT_PRODUCT); @@ -367,7 +602,7 @@ PagedResult<Wikitty> results = proxy.findAllByCriteria(extneqCriteria); - Assert.assertEquals(2, results.getAll().size()); + Assert.assertEquals(7, results.getAll().size()); } @@ -391,33 +626,77 @@ } @Test + public void testEntitiesIdeq() throws Exception { + Search query = Search.query().ideq(W_ENTITY_ID); + + Criteria ideqCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, ideqCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Paint Blue", resultW.getName()); + Assert.assertEquals(22, resultW.getPrice()); + + } + + @Test public void testIdneq() throws Exception { - Search query = Search.query().idneq(W_ID); + Search query = Search.query().exteq(EXT_PRODUCT).idneq(W_ID); Criteria idneqCriteria = query.criteria(); PagedResult<Wikitty> results = proxy.findAllByCriteria(idneqCriteria); - Assert.assertEquals(4, results.getAll().size()); + Assert.assertEquals(2, results.getAll().size()); } @Test + public void testEntitiesIdneq() throws Exception { + + Search query = Search.query().idneq(W_ENTITY_ID); + + Criteria idneqCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, idneqCriteria); + + Assert.assertEquals(2, results.getAll().size()); + } + + @Test public void testUnlike() throws Exception { // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); - Search query = Search.query().unlike("Product.name", "*dri*"); + Search query = Search.query().exteq(EXT_PRODUCT).unlike("Product.name", "*dri*"); Criteria likeCriteria = query.criteria(); PagedResult<Wikitty> results = proxy.findAllByCriteria(likeCriteria); - Assert.assertEquals(4, results.getAll().size()); + Assert.assertEquals(2, results.getAll().size()); } @Test + public void testEntitiesUnlike() throws Exception { + + // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming + assumeNotYetImplementedInMemory(); + + Search query = Search.query().unlike(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*dri*"); + + Criteria likeCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, likeCriteria); + + Assert.assertEquals(2, results.getAll().size()); + } + + @Test public void testLike() throws Exception { // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming @@ -433,6 +712,21 @@ } @Test + public void testEntitiesLike() throws Exception { + + // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming + assumeNotYetImplementedInMemory(); + + Search query = Search.query().like(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*dri*"); + + Criteria likeCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, likeCriteria); + + Assert.assertEquals(1, results.getAll().size()); + } + + @Test public void testSw() throws Exception { Search query = Search.query().sw("Product.name", "Scre"); @@ -452,18 +746,47 @@ } @Test + public void testEntitiesSw() throws Exception { + Search query = Search.query().sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Scre"); + + Criteria swCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, swCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Screwdriver", resultW.getName()); + Assert.assertEquals(3, resultW.getPrice()); + + } + + @Test public void testNsw() throws Exception { - Search query = Search.query().nsw("Product.name", "Scre"); + Search query = Search.query().exteq(EXT_PRODUCT).nsw("Product.name", "Scre"); Criteria nswCriteria = query.criteria(); PagedResult<Wikitty> results = proxy.findAllByCriteria(nswCriteria); - Assert.assertEquals(4, results.getAll().size()); + Assert.assertEquals(2, results.getAll().size()); } @Test + public void testEntitiesNsw() throws Exception { + + Search query = Search.query().nsw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Scre"); + + Criteria nswCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, nswCriteria); + + Assert.assertEquals(2, results.getAll().size()); + } + + @Test public void testEw() throws Exception { Search query = Search.query().ew("Product.name", "ver"); @@ -484,22 +807,53 @@ } @Test + public void testEntitiesEw() throws Exception { + + Search query = Search.query().ew(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "ver"); + + Criteria ewCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, ewCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Screwdriver", resultW.getName()); + Assert.assertEquals(3, resultW.getPrice()); + + } + + @Test public void testNotew() throws Exception { - Search query = Search.query().notew("Product.name", "ver"); + Search query = Search.query().exteq(EXT_PRODUCT).notew("Product.name", "ver"); Criteria notewCriteria = query.criteria(); PagedResult<Wikitty> results = proxy.findAllByCriteria(notewCriteria); - Assert.assertEquals(4, results.getAll().size()); + Assert.assertEquals(2, results.getAll().size()); } @Test + public void testEntitiesNotew() throws Exception { + + Search query = Search.query().notew(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "ver"); + + Criteria notewCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, notewCriteria); + + Assert.assertEquals(2, results.getAll().size()); + + } + + @Test public void testKeyword() throws Exception { - Search query = Search.query().keyword("Paint"); + Search query = Search.query().exteq(EXT_PRODUCT).keyword("Paint"); Criteria keywordCriteria = query.criteria(); @@ -510,6 +864,19 @@ } @Test + public void testEntitiesKeyword() throws Exception { + + Search query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY).keyword("Paint"); + + Criteria keywordCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, keywordCriteria); + + Assert.assertEquals(2, results.getAll().size()); + + } + + @Test public void testIsNull() throws Exception { Search query = Search.query().isNull("Product.name"); @@ -523,6 +890,19 @@ } @Test + public void testEntitiesIsNull() throws Exception { + + Search query = Search.query().isNull(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME); + + Criteria isNull = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, isNull); + + Assert.assertEquals(0, results.getAll().size()); + + } + + @Test public void testIsNotNull() throws Exception { Search query = Search.query().isNotNull("Product.name"); @@ -536,6 +916,19 @@ } @Test + public void testEntitiesIsNotNull() throws Exception { + + Search query = Search.query().isNotNull(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME); + + Criteria isNotNull = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, isNotNull); + + Assert.assertEquals(3, results.getAll().size()); + + } + + @Test public void testFalse() throws Exception { Search query = Search.query().rFalse(); @@ -549,19 +942,45 @@ } @Test + public void testEntitiesFalse() throws Exception { + + Search query = Search.query().rFalse(); + + Criteria rFalse = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, rFalse); + + Assert.assertEquals(0, results.getAll().size()); + + } + + @Test public void testTrue() throws Exception { - Search query = Search.query().rTrue(); + Search query = Search.query().exteq(EXT_PRODUCT).rTrue(); Criteria rTrue = query.criteria(); PagedResult<Wikitty> results = proxy.findAllByCriteria(rTrue); - Assert.assertEquals(5, results.getAll().size()); + Assert.assertEquals(3, results.getAll().size()); } @Test + public void testEntitiesTrue() throws Exception { + + Search query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY).rTrue(); + + Criteria rTrue = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, rTrue); + + Assert.assertEquals(3, results.getAll().size()); + + } + + @Test public void testAnd() throws Exception { Search query = Search.query().and().bw("Product.price", "15", "25") @@ -576,6 +995,20 @@ } @Test + public void testEntitiesAnd() throws Exception { + + Search query = Search.query().and().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") + .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint"); + + Criteria andCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, andCriteria); + + Assert.assertEquals(2, results.getAll().size()); + + } + + @Test public void testOr() throws Exception { Search query = Search.query(); @@ -591,20 +1024,49 @@ } @Test + public void testEntitiesOr() throws Exception { + + Search query = Search.query(); + + query.or().gt(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20").sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Screw"); + + Criteria bwCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + + Assert.assertEquals(2, results.getAll().size()); + + } + + @Test public void testNot() throws Exception { Search query = Search.query(); - query.not().ge("Product.price", "20"); + query.exteq(EXT_PRODUCT).not().ge("Product.price", "20"); Criteria bwCriteria = query.criteria(); PagedResult<Wikitty> results = proxy.findAllByCriteria(bwCriteria); - Assert.assertEquals(3, results.getAll().size()); + Assert.assertEquals(1, results.getAll().size()); } @Test + public void testEntitiesNot() throws Exception { + + Search query = Search.query(); + + query.exteq(ProductEntity.EXT_PRODUCTENTITY).not().ge(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + + Criteria bwCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + + Assert.assertEquals(1, results.getAll().size()); + } + + @Test public void testAssociated() throws Exception { /* Following request mean is : @@ -628,8 +1090,6 @@ Assert.assertEquals("Paint", resultW.getFieldAsString(EXT_PRODUCT, PRODUCT_NAME)); Assert.assertEquals(20, resultW.getFieldAsInt(EXT_PRODUCT, PRODUCT_PRICE)); - - //Test with an associated search that returns nothing query = Search.query().bw("Product.price", "15", "25") .sw("Product.name", "Paint").associated("Product.category") @@ -642,14 +1102,111 @@ Assert.assertEquals(0, results.getAll().size()); } + @Test + public void testEntitiesAssociated() throws Exception { - /** - * <li> monext.monfield - * <li> *.monfield - * <li> monext.monfield.NUMERIC - * <li> *.monfield.NUMERIC - **/ - @Test + /* Following request mean is : + * Looking for any product which price is between 15 and 25, + * and name starts with 'Paint', + * and with an associated category which name is 'Hardware' + */ + + Search query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") + .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint").associated(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY) + .eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare"); + + Criteria associatedCriteria = query.criteria(); + + PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, associatedCriteria); + + Assert.assertEquals(1, results.getAll().size()); + + ProductEntity resultW = results.getFirst(); + + Assert.assertEquals("Paint", resultW.getName()); + Assert.assertEquals(20, resultW.getPrice()); + + //Test with an associated search that returns nothing + query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") + .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint").associated(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY) + .eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "don't return anything"); + + associatedCriteria = query.criteria(); + + results = proxy.findAllByCriteria(ProductEntity.class, associatedCriteria); + + Assert.assertEquals(0, results.getAll().size()); + } + + @Test + public void testSelect() throws Exception { + + // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming + assumeNotYetImplementedInMemory(); + + //Test with an associated search that returns nothing + Search query = Search.query().bw("Product.price", "15", "25") + .sw("Product.name", "Paint"); + + Criteria selectCriteria = query.criteria(); + + selectCriteria.setSelect("Product.category"); + + PagedResult<Wikitty> results = proxy.findAllByCriteria(selectCriteria); + + Assert.assertEquals(2, results.getAll().size()); + + //Test with an associated search that returns nothing + query = Search.query().bw("Product.price", "15", "25") + .sw("Product.name", "Paint"); + + selectCriteria = query.criteria(); + + selectCriteria.setSelect("Product.name"); + + results = proxy.findAllByCriteria(selectCriteria); + + Assert.assertEquals(0, results.getAll().size()); + } + + @Test + public void testEntitiesSelect() throws Exception { + + // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming + assumeNotYetImplementedInMemory(); + + //Test with an associated search that returns nothing + Search query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") + .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint"); + + Criteria selectCriteria = query.criteria(); + + selectCriteria.setSelect(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY); + + PagedResult<CategoryEntity> results = proxy.findAllByCriteria(CategoryEntity.class, selectCriteria); + + Assert.assertEquals(2, results.getAll().size()); + + //Test with an associated search that returns nothing + query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") + .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint"); + + selectCriteria = query.criteria(); + + selectCriteria.setSelect(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME); + + results = proxy.findAllByCriteria(CategoryEntity.class, selectCriteria); + + Assert.assertEquals(0, results.getAll().size()); + } + + /** + * <li> monext.monfield + * <li> *.monfield + * <li> monext.monfield.NUMERIC + * <li> *.monfield.NUMERIC + **/ + @Test public void testSearchAllEquals() { // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); @@ -661,7 +1218,7 @@ { Criteria criteria = Search.query().eq("*.name", "HardWare").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); - assertEquals(1, pagedResult.size()); + assertEquals(2, pagedResult.size()); } { Criteria criteria = Search.query().eq("Category.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "HardWare").criteria(); @@ -671,8 +1228,40 @@ { Criteria criteria = Search.query().eq("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "HardWare").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); + assertEquals(2, pagedResult.size()); + } + } + + /** + * <li> monext.monfield + * <li> *.monfield + * <li> monext.monfield.NUMERIC + * <li> *.monfield.NUMERIC + **/ + @Test + public void testEntitiesSearchAllEquals() { + // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming + assumeNotYetImplementedInMemory(); + { + Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare").criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); assertEquals(1, pagedResult.size()); } + { + Criteria criteria = Search.query().eq("*.name", "HardWare").criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "HardWare").criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().eq("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "HardWare").criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } } /** @@ -693,7 +1282,7 @@ { Criteria criteria = Search.query().contains("*.colors", "Red").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); - assertEquals(1, pagedResult.size()); + assertEquals(2, pagedResult.size()); } { Criteria criteria = Search.query().contains("Product.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "Red").criteria(); @@ -703,17 +1292,49 @@ { Criteria criteria = Search.query().contains("*.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "Red").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); + assertEquals(2, pagedResult.size()); + } + } + + /** + * <li> monext.monfield + * <li> *.monfield + * <li> monext.monfield.NUMERIC + * <li> *.monfield.NUMERIC + **/ + @Test + public void testEntitiesSearchAllContains() { + // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming + assumeNotYetImplementedInMemory(); + { + Criteria criteria = Search.query().contains(ProductEntity.FQ_FIELD_PRODUCTENTITY_COLORS, "Red").criteria(); + PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); assertEquals(1, pagedResult.size()); } + { + Criteria criteria = Search.query().contains("*.colors", "Red").criteria(); + PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().contains(ProductEntity.FQ_FIELD_PRODUCTENTITY_COLORS + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "Red").criteria(); + PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().contains("*.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "Red").criteria(); + PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } } - /** - * <li> monext.monfield - * <li> *.monfield - * <li> monext.monfield.NUMERIC - * <li> *.monfield.NUMERIC - **/ - @Test + /** + * <li> monext.monfield + * <li> *.monfield + * <li> monext.monfield.NUMERIC + * <li> *.monfield.NUMERIC + **/ + @Test public void testSearchAllLike() { // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); @@ -725,7 +1346,7 @@ { Criteria criteria = Search.query().like("*.name", "*Blue").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); - assertEquals(1, pagedResult.size()); + assertEquals(2, pagedResult.size()); } { Criteria criteria = Search.query().like("Product.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "*Blue").criteria(); @@ -735,11 +1356,43 @@ { Criteria criteria = Search.query().like("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "*Blue").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); + assertEquals(2, pagedResult.size()); + } + } + + /** + * <li> monext.monfield + * <li> *.monfield + * <li> monext.monfield.NUMERIC + * <li> *.monfield.NUMERIC + **/ + @Test + public void testEntitiesSearchAllLike() { + // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming + assumeNotYetImplementedInMemory(); + { + Criteria criteria = Search.query().like(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*Blue").criteria(); + PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); assertEquals(1, pagedResult.size()); } + { + Criteria criteria = Search.query().like("*.name", "*Blue").criteria(); + PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().like(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "*Blue").criteria(); + PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().like("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "*Blue").criteria(); + PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } } - @Test + @Test public void testSearchAllLowerCase() { // FIXME implement it in memory assumeNotYetImplementedInMemory(); @@ -775,13 +1428,49 @@ } } - @Test + @Test + public void testEntitiesSearchAllLowerCase() { + // FIXME implement it in memory + assumeNotYetImplementedInMemory(); + { + Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare").criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "hardware").criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + assertEquals(0, pagedResult.size()); + } + { + Criteria criteria = Search.query().like(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare", Like.SearchAs.ToLowerCase).criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().like(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "hardware", Like.SearchAs.ToLowerCase).criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().like(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare", Like.SearchAs.AsText).criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + { + Criteria criteria = Search.query().like(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "hardware", Like.SearchAs.AsText).criteria(); + PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + assertEquals(1, pagedResult.size()); + } + } + + @Test public void testSearchWithSort() { // FIXME implement it in memory assumeNotYetImplementedInMemory(); { Criteria criteria = Search.query().like("*.name", "*").criteria(); - criteria.setSortAscending(new String[]{"*.name"}); + criteria.setSortAscending("*.name"); try { proxy.findAllByCriteria(criteria); } catch (Exception eee) { @@ -813,8 +1502,7 @@ Collections.sort(expected); { Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, sortableExtName).criteria(); - criteria.setSortAscending(new String[]{ - WikittyUtil.getFQFieldName(sortableExtName, numFieldName)}); + criteria.setSortAscending(WikittyUtil.getFQFieldName(sortableExtName, numFieldName)); PagedResult<Wikitty> result = proxy.findAllByCriteria(criteria); List<Integer> resulted = new ArrayList<Integer>(); @@ -825,7 +1513,6 @@ } } - @Test public void testComplexQueries() throws Exception { //TODO JC-07-04-2011 Write test Modified: trunk/wikitty-api/src/test/xmi/wikittytest.zargo =================================================================== (Binary files differ)

1 0

r1238 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component
by sletellier＠users.nuiton.org Oct. 21, 2011

Oct. 21, 2011

Author: sletellier Date: 2011-10-21 18:21:57 +0200 (Fri, 21 Oct 2011) New Revision: 1238 Url: http://nuiton.org/repositories/revision/wikitty/1238 Log: Fix select association taglib Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 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 16:15:51 UTC (rev 1237) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-10-21 16:21:57 UTC (rev 1238) @@ -63,7 +63,9 @@ WikittyFieldHandler.FIELD_SEPARATOR); // iterate wikitty for result construction - for (Wikitty wiki : getWikitty().getFieldAsList(ext, fieldName, Wikitty.class)){ + for (String id : getWikitty().getFieldAsList(ext, fieldName, String.class)){ + Wikitty wiki = proxy.restore(id); + Option temp = new Option(); temp.setValeur(wiki.getId()); String desc = wiki.getId();

1 0

r1237 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by sletellier＠users.nuiton.org Oct. 12, 2011

Oct. 12, 2011

Author: sletellier Date: 2011-10-12 18:15:51 +0200 (Wed, 12 Oct 2011) New Revision: 1237 Url: http://nuiton.org/repositories/revision/wikitty/1237 Log: Fix doc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 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:14:50 UTC (rev 1236) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2011-10-12 16:15:51 UTC (rev 1237) @@ -995,7 +995,7 @@ } /** - * Extract all field values corresponding of fqField in entity + * Extract all field values corresponding of fqField in list of entities * * @param fqField fqField concerned * @param entities entities concerned

1 0

r1236 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/layers
by sletellier＠users.nuiton.org Oct. 12, 2011

Oct. 12, 2011

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 Oct. 12, 2011

Oct. 12, 2011

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

r1234 - in trunk: . wikitty-struts
by sletellier＠users.nuiton.org Oct. 12, 2011

Oct. 12, 2011

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

r1233 - trunk/wikitty-struts/src/main/tld
by sletellier＠users.nuiton.org Oct. 11, 2011

Oct. 11, 2011

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