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

r206 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bbrossaud＠users.nuiton.org July 28, 2010

July 28, 2010

Author: bbrossaud Date: 2010-07-28 11:27:34 +0200 (Wed, 28 Jul 2010) New Revision: 206 Url: http://nuiton.org/repositories/revision/wikitty/206 Log: changed cast method comments in PagedResult Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-07-28 09:12:57 UTC (rev 205) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-07-28 09:27:34 UTC (rev 206) @@ -91,19 +91,11 @@ } /** - * Convert all result to the wanted type and return new PagedResult with - * this new result list. If some result don't have the right extension (clazz) - * this extension is automatically added if autoconvert is true. Else - * an exception is thrown when result without extension is found. + * Convert all result to the wikitty type and return new PagedResult with + * this new result list. * - * When you used autoconvert = false, you have a potentially problem when - * you have modified a BusinessEntity to have new extension and all your - * wikitty object are not uptodate in database. - * - * @param <E> class to cast into - * @param proxy used to retrieve securityToken and WikittyService - * @param autoconvert if autoconvert is false and object don't all needed - * extension, object is not put in the result + * @param securityToken security token + * @param ws wikitty service * @return new PagedResult, this result can have less elements that original * for some reason (security, ...) */ @@ -130,7 +122,7 @@ } /** - * Convert all result to the wanted type and return new PagedResult with + * Convert all result to the wikitty type and return new PagedResult with * this new result list. * * @param securityToken security token

1 0

r205 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bbrossaud＠users.nuiton.org July 28, 2010

July 28, 2010

Author: bbrossaud Date: 2010-07-28 11:12:57 +0200 (Wed, 28 Jul 2010) New Revision: 205 Url: http://nuiton.org/repositories/revision/wikitty/205 Log: addition findAllByCriteria and findByCriteria proxy methods which return wikitty object(s) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-07-21 12:07:42 UTC (rev 204) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-07-28 09:12:57 UTC (rev 205) @@ -310,6 +310,12 @@ return result; } + public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { + PagedResult<String> resultId = wikittyService.findAllByCriteria(securityToken, criteria); + PagedResult<Wikitty> result = resultId.cast(securityToken, wikittyService); + return result; + } + public <E extends BusinessEntity> E findByCriteria(Class<E> clazz, Criteria criteria) { BusinessEntityWikitty sample = (BusinessEntityWikitty)WikittyUtil.newInstance(clazz); @@ -327,6 +333,11 @@ return result; } + public Wikitty findByCriteria(Criteria criteria) { + Wikitty wikitty = wikittyService.findByCriteria(securityToken, criteria); + return wikitty; + } + public void addLabel(String wikittyId, String label) { wikittyService.addLabel(securityToken, wikittyId, label); }

1 0

r204 - in trunk: . wikitty-api wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-solr-impl wikitty-ui-zk
by tchemit＠users.nuiton.org July 21, 2010

July 21, 2010

Author: tchemit Date: 2010-07-21 14:07:42 +0200 (Wed, 21 Jul 2010) New Revision: 204 Url: http://nuiton.org/repositories/revision/wikitty/204 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-solr-impl/pom.xml trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 12:07:40 UTC (rev 203) +++ trunk/pom.xml 2010-07-21 12:07:42 UTC (rev 204) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> <modules> <module>wikitty-generators</module> @@ -192,9 +192,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-2.0</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-2.0</developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-2.0</url> + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-07-21 12:07:40 UTC (rev 203) +++ trunk/wikitty-api/pom.xml 2010-07-21 12:07:42 UTC (rev 204) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-07-21 12:07:40 UTC (rev 203) +++ trunk/wikitty-generators/pom.xml 2010-07-21 12:07:42 UTC (rev 204) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-07-21 12:07:40 UTC (rev 203) +++ trunk/wikitty-hessian-client/pom.xml 2010-07-21 12:07:42 UTC (rev 204) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-07-21 12:07:40 UTC (rev 203) +++ trunk/wikitty-hessian-server/pom.xml 2010-07-21 12:07:42 UTC (rev 204) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 12:07:40 UTC (rev 203) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 12:07:42 UTC (rev 204) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-07-21 12:07:40 UTC (rev 203) +++ trunk/wikitty-solr-impl/pom.xml 2010-07-21 12:07:42 UTC (rev 204) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-07-21 12:07:40 UTC (rev 203) +++ trunk/wikitty-ui-zk/pom.xml 2010-07-21 12:07:42 UTC (rev 204) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent>

1 0

r203 - in tags: . wikitty-2.0
by tchemit＠users.nuiton.org July 21, 2010

July 21, 2010

Author: tchemit Date: 2010-07-21 14:07:40 +0200 (Wed, 21 Jul 2010) New Revision: 203 Url: http://nuiton.org/repositories/revision/wikitty/203 Log: [maven-release-plugin] copy for tag wikitty-2.0 Added: tags/wikitty-2.0/ Property changes on: tags/wikitty-2.0 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r202 - in trunk: . wikitty-api wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-solr-impl wikitty-ui-zk
by tchemit＠users.nuiton.org July 21, 2010

July 21, 2010

Author: tchemit Date: 2010-07-21 14:07:38 +0200 (Wed, 21 Jul 2010) New Revision: 202 Url: http://nuiton.org/repositories/revision/wikitty/202 Log: [maven-release-plugin] prepare release wikitty-2.0 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-solr-impl/pom.xml trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 11:47:19 UTC (rev 201) +++ trunk/pom.xml 2010-07-21 12:07:38 UTC (rev 202) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> <modules> <module>wikitty-generators</module> @@ -194,9 +192,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-2.0</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-2.0</developerConnection> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-2.0</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-07-21 11:47:19 UTC (rev 201) +++ trunk/wikitty-api/pom.xml 2010-07-21 12:07:38 UTC (rev 202) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-07-21 11:47:19 UTC (rev 201) +++ trunk/wikitty-generators/pom.xml 2010-07-21 12:07:38 UTC (rev 202) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-07-21 11:47:19 UTC (rev 201) +++ trunk/wikitty-hessian-client/pom.xml 2010-07-21 12:07:38 UTC (rev 202) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-07-21 11:47:19 UTC (rev 201) +++ trunk/wikitty-hessian-server/pom.xml 2010-07-21 12:07:38 UTC (rev 202) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 11:47:19 UTC (rev 201) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 12:07:38 UTC (rev 202) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-07-21 11:47:19 UTC (rev 201) +++ trunk/wikitty-solr-impl/pom.xml 2010-07-21 12:07:38 UTC (rev 202) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent>  Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-07-21 11:47:19 UTC (rev 201) +++ trunk/wikitty-ui-zk/pom.xml 2010-07-21 12:07:38 UTC (rev 202) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent>

1 0

r201 - in trunk: wikitty-api/src wikitty-api/src/license wikitty-generators/src wikitty-generators/src/license wikitty-hessian-client/src wikitty-hessian-client/src/license wikitty-hessian-server/src wikitty-hessian-server/src/license wikitty-jdbc-impl/src wikitty-jdbc-impl/src/license wikitty-solr-impl/src wikitty-solr-impl/src/license wikitty-ui-zk/src wikitty-ui-zk/src/license
by tchemit＠users.nuiton.org July 21, 2010

July 21, 2010

Author: tchemit Date: 2010-07-21 13:47:19 +0200 (Wed, 21 Jul 2010) New Revision: 201 Url: http://nuiton.org/repositories/revision/wikitty/201 Log: consolidate third parties Added: trunk/wikitty-api/src/license/ trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-generators/src/license/ trunk/wikitty-generators/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-client/src/license/ trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-server/src/license/ trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties trunk/wikitty-jdbc-impl/src/license/ trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties trunk/wikitty-solr-impl/src/license/ trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties trunk/wikitty-ui-zk/src/license/ trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties Added: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2010-07-21 11:47:19 UTC (rev 201) @@ -0,0 +1,27 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache Software License, version 1.1 +# - BSD License +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Public Domain +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jul 21 13:25:36 CEST 2010 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +org.springframework--spring-aop--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-asm--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-beans--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-context--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-core--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-expression--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-test--3.0.1.RELEASE=The Apache Software License, Version 2.0 Property changes on: trunk/wikitty-api/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-generators/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-generators/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2010-07-21 11:47:19 UTC (rev 201) @@ -0,0 +1,17 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - LGPL +# - Lesser General Public License (LGPL) v 3.0 +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jul 21 12:36:22 CEST 2010 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0=The Apache Software License, Version 2.0 Property changes on: trunk/wikitty-generators/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2010-07-21 11:47:19 UTC (rev 201) @@ -0,0 +1,20 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache Software License, version 1.1 +# - BSD License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Public Domain +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jul 21 13:43:43 CEST 2010 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 Property changes on: trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2010-07-21 11:47:19 UTC (rev 201) @@ -0,0 +1,27 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache License +# - Apache Software License, version 1.1 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 +# - LGPL 2.1 / The Apache Software License - Version 2.0 +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - Public Domain +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jul 21 13:45:24 CEST 2010 +com.experlog--xapool--1.5.0=Lesser General Public License (LGPL) v 3.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 Property changes on: trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties 2010-07-21 11:47:19 UTC (rev 201) @@ -0,0 +1,36 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache License +# - Apache License Version 2.0 +# - Apache Software License - Version 2.0 +# - Apache Software License, version 1.1 +# - BSD License +# - Common Public License Version 1.0 +# - Eclipse Public License - Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - Public Domain +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jul 21 13:35:33 CEST 2010 +com.experlog--xapool--1.5.0=Lesser General Public License (LGPL) v 3.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +org.springframework--spring-aop--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-asm--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-beans--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-context--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-core--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-expression--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-test--3.0.1.RELEASE=The Apache Software License, Version 2.0 +woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 Property changes on: trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties 2010-07-21 11:47:19 UTC (rev 201) @@ -0,0 +1,31 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache License +# - Apache Software License, version 1.1 +# - BSD License +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - Public Domain +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jul 21 13:31:58 CEST 2010 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=Common Development and Distribution License (CDDL) v1.0 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +org.springframework--spring-aop--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-asm--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-beans--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-context--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-core--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-expression--3.0.1.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-test--3.0.1.RELEASE=The Apache Software License, Version 2.0 +woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 Property changes on: trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties 2010-07-21 11:47:19 UTC (rev 201) @@ -0,0 +1,35 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache License +# - Apache Software License, version 1.1 +# - BSD License +# - Bouncy Castle License +# - Common Public License Version 1.0 +# - GNU General Public License, Version 2.0 +# - GNU Lesser General Public Licence +# - GNU Lesser General Public License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - Mozilla Public License +# - Public Domain +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jul 21 13:38:35 CEST 2010 +bouncycastle--bcmail-jdk14--136=http://www.bouncycastle.org/licence.html +com.experlog--xapool--1.5.0=Lesser General Public License (LGPL) v 3.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +eclipse--jdtcore--3.1.0=Eclipse Public License 1.0 (EPL) +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 +xml-apis--xml-apis--1.3.02=The Apache Software License, Version 2.0 Property changes on: trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r200 - trunk/wikitty-hessian-server
by tchemit＠users.nuiton.org July 21, 2010

July 21, 2010

Author: tchemit Date: 2010-07-21 13:46:58 +0200 (Wed, 21 Jul 2010) New Revision: 200 Url: http://nuiton.org/repositories/revision/wikitty/200 Log: remove multistorage module from default build Modified: trunk/wikitty-hessian-server/pom.xml Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-07-21 11:46:41 UTC (rev 199) +++ trunk/wikitty-hessian-server/pom.xml 2010-07-21 11:46:58 UTC (rev 200) @@ -32,12 +32,12 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - <dependency> +  <dependency> <groupId>${project.groupId}</groupId> <artifactId>wikitty-solr-impl</artifactId>

1 0

r199 - trunk
by tchemit＠users.nuiton.org July 21, 2010

July 21, 2010

Author: tchemit Date: 2010-07-21 13:46:41 +0200 (Wed, 21 Jul 2010) New Revision: 199 Url: http://nuiton.org/repositories/revision/wikitty/199 Log: remove multistorage module from default build Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 10:31:41 UTC (rev 198) +++ trunk/pom.xml 2010-07-21 11:46:41 UTC (rev 199) @@ -24,7 +24,6 @@ <module>wikitty-api</module> <module>wikitty-solr-impl</module> <module>wikitty-jdbc-impl</module> - <module>wikitty-multistorage-impl</module> <module>wikitty-ui-zk</module> <module>wikitty-hessian-client</module> @@ -263,6 +262,7 @@ <module>wikitty-hbase-impl</module> <module>wikitty-jpa-impl</module> <module>wikitty-jms-impl</module> + <module>wikitty-multistorage-impl</module> </modules> </profile> </profiles>

1 0

r198 - in trunk: . wikitty-api wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-multistorage-impl wikitty-solr-impl wikitty-ui-zk
by tchemit＠users.nuiton.org July 21, 2010

July 21, 2010

Author: tchemit Date: 2010-07-21 12:31:41 +0200 (Wed, 21 Jul 2010) New Revision: 198 Url: http://nuiton.org/repositories/revision/wikitty/198 Log: use dependencies manager + use sibling dependencies Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-multistorage-impl/ trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-solr-impl/pom.xml trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -24,6 +24,7 @@ <module>wikitty-api</module> <module>wikitty-solr-impl</module> <module>wikitty-jdbc-impl</module> + <module>wikitty-multistorage-impl</module> <module>wikitty-ui-zk</module> <module>wikitty-hessian-client</module> @@ -103,6 +104,91 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <version>1.4.0</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.3</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>jasperreports</groupId> + <artifactId>jasperreports</artifactId> + <version>3.5.3</version> + </dependency> + + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + </dependency> + + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>2.1</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossjta</artifactId> + <version>4.9.0.GA</version> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + </dependency> + +  + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.9.0.GA</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.experlog</groupId> + <artifactId>xapool</artifactId> + <version>1.5.0</version> + </dependency> + + + <dependency> + <groupId>org.zkoss.zk</groupId> + <artifactId>zk</artifactId> + <version>${zk.version}</version> + </dependency> + + <dependency> + <groupId>org.zkoss.zk</groupId> + <artifactId>zkplus</artifactId> + <version>${zk.version}</version> + </dependency> + + <dependency> + <groupId>org.zkoss.zk</groupId> + <artifactId>zul</artifactId> + <version>${zk.version}</version> + </dependency> + + </dependencies> </dependencyManagement> @@ -137,6 +223,7 @@ <spring.version>3.0.1.RELEASE</spring.version> <jetty.version>6.1.22</jetty.version> + <zk.version>5.0.2</zk.version> </properties>  @@ -157,6 +244,13 @@ </dependency> </dependencies> </plugin> + +  + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>1.0.3</version> + </plugin> </plugins> </pluginManagement> @@ -169,7 +263,6 @@ <module>wikitty-hbase-impl</module> <module>wikitty-jpa-impl</module> <module>wikitty-jms-impl</module> - <module>wikitty-multistorage-impl</module> </modules> </profile> </profiles> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-api/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -68,43 +68,34 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> - <version>1.1.4c</version> </dependency> <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>2.1</version> - <scope>compile</scope> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> - <scope>compile</scope> - </dependency> -  <dependency> <groupId>jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> - <version>4.9.0.GA</version> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> - <version>1.1</version> </dependency>  <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> - <version>2.9.0.GA</version> - <scope>compile</scope> </dependency> </dependencies> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-generators/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -47,7 +47,6 @@ <plugin> <groupId>org.nuiton.processor</groupId> <artifactId>maven-processor-plugin</artifactId> - <version>1.0.3</version> <executions> <execution> <phase>generate-sources</phase> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-hessian-client/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -1,43 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> -  -  -  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-hessian-client</artifactId> +  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-hessian-client</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - <version>3.1.5</version> - <scope>compile</scope> - </dependency> - </dependencies> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>Wikitty :: hessian client</name> + <name>Wikitty :: hessian client</name> - <description>Wikitty hessian client</description> - <inceptionYear>2010</inceptionYear> + <description>Wikitty hessian client</description> + <inceptionYear>2010</inceptionYear> </project> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-hessian-server/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -19,7 +19,7 @@ <dependencies> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> <scope>compile</scope> @@ -33,13 +33,13 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-multistorage-impl</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-solr-impl</artifactId> <version>${project.version}</version> <scope>compile</scope> @@ -47,8 +47,6 @@ <dependency> <groupId>com.caucho</groupId> <artifactId>hessian</artifactId> - <version>3.1.5</version> - <scope>compile</scope> </dependency> </dependencies> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -68,7 +68,6 @@ <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> - <version>1.1.4c</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -86,7 +85,6 @@ <dependency> <groupId>com.experlog</groupId> <artifactId>xapool</artifactId> - <version>1.5.0</version> </dependency> </dependencies> Property changes on: trunk/wikitty-multistorage-impl ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project *.ipr *.iml *.iws + *.ipr *.iws .classpath .project target .settings *.ipr *.iws *.iml Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -1,99 +1,102 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-multistorage-impl</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-multistorage-impl</artifactId> - <dependencies> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-solr-impl</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${project.version}</version> + </dependency> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-jms-impl</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> +  +  + </dependencies> -  -  -  +  +  +  - <name>Wikitty :: wikitty-multistorage-impl</name> - <description>manage multi storage</description> - <inceptionYear>2010</inceptionYear> + <name>Wikitty :: wikitty-multistorage-impl</name> + <description>manage multi storage</description> + <inceptionYear>2010</inceptionYear> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> -  - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> - </properties> + <properties> +  + <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> + </properties> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </testResource> - </testResources> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </testResource> + </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <solr.data.dir>${project.build.directory}/solr</solr.data.dir> - </systemPropertyVariables> - </configuration> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <solr.data.dir>${project.build.directory}/solr</solr.data.dir> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-solr-impl/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -31,13 +31,10 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> - <version>1.4.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-ui-zk/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -20,13 +20,13 @@ <dependencies> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-jdbc-impl</artifactId> <version>${project.version}</version> </dependency> @@ -60,20 +60,17 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> - <version>3.5.3</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> <scope>provided</scope> </dependency> @@ -92,19 +89,16 @@ <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zk</artifactId> - <version>5.0.2</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zkplus</artifactId> - <version>5.0.2</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zul</artifactId> - <version>5.0.2</version> </dependency> </dependencies>

1 0

r197 - in trunk: . wikitty-ui-zk
by tchemit＠users.nuiton.org July 21, 2010

July 21, 2010

Author: tchemit Date: 2010-07-21 12:15:51 +0200 (Wed, 21 Jul 2010) New Revision: 197 Url: http://nuiton.org/repositories/revision/wikitty/197 Log: clean poms Modified: trunk/pom.xml trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 10:12:27 UTC (rev 196) +++ trunk/pom.xml 2010-07-21 10:15:51 UTC (rev 197) @@ -173,30 +173,5 @@ </modules> </profile> </profiles> -  - + </project> Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-07-21 10:12:27 UTC (rev 196) +++ trunk/wikitty-ui-zk/pom.xml 2010-07-21 10:15:51 UTC (rev 197) @@ -124,23 +124,6 @@ <packaging>war</packaging> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> - -  -  -  - </project>

1 0