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

Jenkins build is back to normal : wikitty-nightly #2
by admin+ci-nuiton.org＠codelutin.com 19 Feb '14

19 Feb '14

See <http://ci.nuiton.org/jenkins/job/wikitty-nightly/2/>

1 0

Jenkins build became unstable: wikitty #2
by admin+ci-nuiton.org＠codelutin.com 14 Feb '14

14 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/wikitty/2/>

1 6

r1586 - in trunk: wikitty-dto wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr
by tchemit＠users.nuiton.org 14 Feb '14

14 Feb '14

Author: tchemit Date: 2014-02-14 14:52:55 +0100 (Fri, 14 Feb 2014) New Revision: 1586 Url: http://nuiton.org/projects/wikitty/repository/revisions/1586 Log: optimize dependencies Modified: trunk/wikitty-dto/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2014-02-14 10:58:36 UTC (rev 1585) +++ trunk/wikitty-dto/pom.xml 2014-02-14 13:52:55 UTC (rev 1586) @@ -35,6 +35,11 @@ <artifactId>nuiton-utils</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> +  <dependency> <groupId>junit</groupId> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2014-02-14 10:58:36 UTC (rev 1585) +++ trunk/wikitty-hessian-client/pom.xml 2014-02-14 13:52:55 UTC (rev 1586) @@ -37,7 +37,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-config</artifactId> </dependency> <dependency> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2014-02-14 10:58:36 UTC (rev 1585) +++ trunk/wikitty-hessian-server/pom.xml 2014-02-14 13:52:55 UTC (rev 1586) @@ -33,21 +33,7 @@ <scope>compile</scope> </dependency> -  - - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> </dependency> @@ -75,7 +61,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-config</artifactId> </dependency> <dependency> Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2014-02-14 10:58:36 UTC (rev 1585) +++ trunk/wikitty-jdbc/pom.xml 2014-02-14 13:52:55 UTC (rev 1586) @@ -75,7 +75,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-config</artifactId> </dependency> <dependency> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2014-02-14 10:58:36 UTC (rev 1585) +++ trunk/wikitty-perf-test/pom.xml 2014-02-14 13:52:55 UTC (rev 1586) @@ -62,7 +62,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-config</artifactId> </dependency> </dependencies> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2014-02-14 10:58:36 UTC (rev 1585) +++ trunk/wikitty-solr/pom.xml 2014-02-14 13:52:55 UTC (rev 1586) @@ -37,6 +37,11 @@ <artifactId>nuiton-utils</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> +  <dependency> <groupId>org.apache.solr</groupId>

1 0

Jenkins build became unstable: wikitty #629
by admin+hudson＠codelutin.com 14 Feb '14

14 Feb '14

See <http://ci.nuiton.org/jenkins/job/wikitty/629/changes>

1 1

Jenkins build became unstable: wikitty » Wikitty :: api #629
by admin+hudson＠codelutin.com 14 Feb '14

14 Feb '14

See <http://ci.nuiton.org/jenkins/job/wikitty/org.nuiton.wikitty$wikitty-api/629…>

1 1

r1585 - trunk/wikitty-api/src/it/generation
by ymartel＠users.nuiton.org 14 Feb '14

14 Feb '14

Author: ymartel Date: 2014-02-14 11:58:36 +0100 (Fri, 14 Feb 2014) New Revision: 1585 Url: http://nuiton.org/projects/wikitty/repository/revisions/1585 Log: fix pom in wikitty-api its Modified: trunk/wikitty-api/src/it/generation/pom.xml Modified: trunk/wikitty-api/src/it/generation/pom.xml =================================================================== --- trunk/wikitty-api/src/it/generation/pom.xml 2014-02-14 10:15:55 UTC (rev 1584) +++ trunk/wikitty-api/src/it/generation/pom.xml 2014-02-14 10:58:36 UTC (rev 1585) @@ -53,8 +53,6 @@ <properties> - <eugeneVersion>2.4.2</eugeneVersion> -  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -69,8 +67,8 @@ <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugeneVersion}</version> + <artifactId>eugene-maven-plugin</artifactId> + <version>@eugeneVersion@</version> <configuration> <fullPackagePath>org.nuiton.wikitty.test</fullPackagePath> <defaultPackage>org.nuiton.wikitty.test</defaultPackage>

1 0

Jenkins build became unstable: wikitty » Wikitty :: api #4
by admin+ci-nuiton.org＠codelutin.com 14 Feb '14

14 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/wikitty/org.nuiton.wikitty$wikitty-api/…>

1 1

r1584 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty
by ymartel＠users.nuiton.org 14 Feb '14

14 Feb '14

Author: ymartel Date: 2014-02-14 11:15:55 +0100 (Fri, 14 Feb 2014) New Revision: 1584 Url: http://nuiton.org/projects/wikitty/repository/revisions/1584 Log: fixes #3083 : during bean copy, force wikittyVersion copy in last Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2014-02-07 12:03:00 UTC (rev 1583) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2014-02-14 10:15:55 UTC (rev 1584) @@ -1744,8 +1744,14 @@ PropertyDescriptor[] origDescriptors = bu.getPropertyUtils().getPropertyDescriptors(source); + PropertyDescriptor versionDescriptor = null; for (int i = 0; i < origDescriptors.length; i++) { String name = origDescriptors[i].getName(); + if ("wikittyVersion".equals(name)) { + versionDescriptor = origDescriptors[i]; + continue; + } + if (log.isDebugEnabled()) { log.debug("work on prop :" + name); } @@ -1757,8 +1763,8 @@ } if (bu.getPropertyUtils().isReadable(source, name) && bu.getPropertyUtils().isWriteable(dest, name)) { - if (log.isDebugEnabled()) { - log.debug("prop is copiable:" + name); + if (log.isInfoEnabled()) { + log.info("prop is copiable:" + name); } try { Object value = @@ -1769,6 +1775,17 @@ } } } + + //XXX ymartel 2014/02/14 : how to make it cleaner ? Must force the wikittyVersion be the last to set (to avoid all upgrade caused by fields modification) + if (versionDescriptor != null) { + String name = versionDescriptor.getName(); + try { + Object value = bu.getPropertyUtils().getSimpleProperty(source, name); + bu.copyProperty(dest, name, value); + } catch (NoSuchMethodException e) { + // Should not happen + } + } } static public byte[] crypt(String algo, String password, byte[] value) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2014-02-07 12:03:00 UTC (rev 1583) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2014-02-14 10:15:55 UTC (rev 1584) @@ -683,9 +683,9 @@ @Test public void testCopyBean() throws Exception { - WikittyLabel source = new WikittyLabelImpl(); - source.addLabels("toto"); - WikittyLabel dest = new WikittyLabelImpl(); + WikittyLabel source = new WikittyLabelImpl(); // version 0.1 (init) + source.addLabels("toto"); // changes : new version is 0.2 + WikittyLabel dest = new WikittyLabelImpl(); // version 0.1 (init) WikittyUtil.copyBean(source, dest);

1 0

r1583 - in trunk/wikitty-api/src/test/java/org/nuiton/wikitty: . entities
by tchemit＠users.nuiton.org 07 Feb '14

07 Feb '14

Author: tchemit Date: 2014-02-07 13:03:00 +0100 (Fri, 07 Feb 2014) New Revision: 1583 Url: http://nuiton.org/projects/wikitty/repository/revisions/1583 Log: remove ignore on tests to break the build Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2014-02-07 12:00:24 UTC (rev 1582) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2014-02-07 12:03:00 UTC (rev 1583) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.config.ApplicationConfig; import org.nuiton.wikitty.entities.BusinessEntity; @@ -682,8 +681,6 @@ Assert.assertEquals(dto.getLabels(), l.getLabels()); } - //FIXME-tchemit-2014-02è07 - @Ignore @Test public void testCopyBean() throws Exception { WikittyLabel source = new WikittyLabelImpl(); @@ -697,8 +694,6 @@ Assert.assertEquals(source.getLabels(), dest.getLabels()); } - //FIXME-tchemit-2014-02è07 - @Ignore @Test public void testCopyFrom() throws Exception { { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java 2014-02-07 12:00:24 UTC (rev 1582) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java 2014-02-07 12:03:00 UTC (rev 1583) @@ -27,7 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; /** @@ -43,8 +42,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(BusinessEntityImplTest.class); - //FIXME-tchemit-2014-02è07 - @Ignore @Test public void testCopyFrom() throws Exception { WikittyLabel source = new WikittyLabelImpl();

1 0

r1582 - in trunk: . wikitty-api wikitty-api/src/license wikitty-dto wikitty-dto/src/license wikitty-generators wikitty-generators/src/license wikitty-hessian-client wikitty-hessian-client/src/license wikitty-hessian-server wikitty-hessian-server/src/license wikitty-jdbc wikitty-jdbc/src/license wikitty-perf-test wikitty-perf-test/src/license wikitty-solr wikitty-solr/src/license wikitty-struts wikitty-struts/src/license
by tchemit＠users.nuiton.org 07 Feb '14

07 Feb '14

Author: tchemit Date: 2014-02-07 13:00:24 +0100 (Fri, 07 Feb 2014) New Revision: 1582 Url: http://nuiton.org/projects/wikitty/repository/revisions/1582 Log: fix licenses + third parties Modified: trunk/LICENSE.txt trunk/wikitty-api/LICENSE.txt trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-dto/LICENSE.txt trunk/wikitty-dto/src/license/THIRD-PARTY.properties trunk/wikitty-generators/LICENSE.txt trunk/wikitty-generators/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-client/LICENSE.txt trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-server/LICENSE.txt trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties trunk/wikitty-jdbc/LICENSE.txt trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties trunk/wikitty-perf-test/LICENSE.txt trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties trunk/wikitty-solr/LICENSE.txt trunk/wikitty-solr/src/license/THIRD-PARTY.properties trunk/wikitty-struts/LICENSE.txt trunk/wikitty-struts/src/license/THIRD-PARTY.properties Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-api/LICENSE.txt =================================================================== --- trunk/wikitty-api/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-api/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2014-02-07 12:00:24 UTC (rev 1582) @@ -6,11 +6,13 @@ # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Lesser General Public License, version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - New BSD License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -19,8 +21,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Aug 30 13:58:45 CEST 2011 +#Fri Feb 07 12:43:30 CET 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-dto/LICENSE.txt =================================================================== --- trunk/wikitty-dto/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-dto/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-dto/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2014-02-07 12:00:24 UTC (rev 1582) @@ -6,11 +6,13 @@ # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Lesser General Public License, version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - New BSD License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -19,8 +21,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Aug 30 13:59:05 CEST 2011 +#Fri Feb 07 12:54:14 CET 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-generators/LICENSE.txt =================================================================== --- trunk/wikitty-generators/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-generators/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-generators/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2014-02-07 12:00:24 UTC (rev 1582) @@ -1,6 +1,7 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache License Version 2.0 # - Apache Software License, Version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -16,9 +17,5 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jan 06 18:10:34 CET 2012 -commons-digester--commons-digester--2.0=Apache Software License, Version 2.0 +#Fri Feb 07 12:43:03 CET 2014 commons-primitives--commons-primitives--1.0=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 Modified: trunk/wikitty-hessian-client/LICENSE.txt =================================================================== --- trunk/wikitty-hessian-client/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-hessian-client/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2014-02-07 12:00:24 UTC (rev 1582) @@ -5,6 +5,7 @@ # - BSD License # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - GNU Lesser General Public License, version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -19,8 +20,9 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:39:48 CEST 2011 +#Fri Feb 07 12:54:49 CET 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-hessian-server/LICENSE.txt =================================================================== --- trunk/wikitty-hessian-server/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-hessian-server/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2014-02-07 12:00:24 UTC (rev 1582) @@ -8,11 +8,13 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 +# - GNU Lesser General Public License, version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - New BSD License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -23,9 +25,10 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:39:50 CEST 2011 +#Fri Feb 07 12:54:56 CET 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. 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 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-jdbc/LICENSE.txt =================================================================== --- trunk/wikitty-jdbc/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-jdbc/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2014-02-07 12:00:24 UTC (rev 1582) @@ -1,7 +1,6 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License # - Apache Software License, version 1.1 # - BSD License # - BSD style @@ -23,10 +22,11 @@ # Please fill the missing licenses for dependencies : # # -#Mon Apr 15 16:19:41 CEST 2013 +#Fri Feb 07 12:54:40 CET 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. 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 org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-perf-test/LICENSE.txt =================================================================== --- trunk/wikitty-perf-test/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-perf-test/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties 2014-02-07 12:00:24 UTC (rev 1582) @@ -7,11 +7,13 @@ # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Lesser General Public License, version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - New BSD License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -21,8 +23,9 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:39:53 CEST 2011 +#Fri Feb 07 12:54:56 CET 2014 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-solr/LICENSE.txt =================================================================== --- trunk/wikitty-solr/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-solr/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2014-02-07 12:00:24 UTC (rev 1582) @@ -1,7 +1,6 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License # - Apache Software License, version 1.1 # - BSD License # - BSD style @@ -22,10 +21,11 @@ # Please fill the missing licenses for dependencies : # # -#Mon Apr 15 16:18:37 CEST 2013 +#Fri Feb 07 12:54:38 CET 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. 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 org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-struts/LICENSE.txt =================================================================== --- trunk/wikitty-struts/LICENSE.txt 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-struts/LICENSE.txt 2014-02-07 12:00:24 UTC (rev 1582) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/wikitty-struts/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-struts/src/license/THIRD-PARTY.properties 2014-02-07 11:31:04 UTC (rev 1581) +++ trunk/wikitty-struts/src/license/THIRD-PARTY.properties 2014-02-07 12:00:24 UTC (rev 1582) @@ -7,6 +7,7 @@ # - BSD style # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - GNU Lesser General Public License, version 2.1 # - INRIA, France Telecom # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -21,7 +22,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 09 12:51:28 CET 2012 +#Fri Feb 07 12:54:48 CET 2014 asm--asm--3.1=INRIA, France Telecom asm--asm-commons--3.1=INRIA, France Telecom commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 @@ -30,4 +31,5 @@ javax.servlet--servlet-api--2.5=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.servlet.jsp--jsp-api--2.1=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1

1 0