May 2014 - Topia-commits - mailman.cloud.codelutin.com

r3095 - in branches/topia-2.9.x: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by echatellier＠users.nuiton.org 07 May '14

07 May '14

Author: echatellier Date: 2014-05-07 11:01:05 +0200 (Wed, 07 May 2014) New Revision: 3095 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3095 Log: Change version to 2.9-rc-1 Modified: branches/topia-2.9.x/pom.xml branches/topia-2.9.x/topia-persistence/pom.xml branches/topia-2.9.x/topia-service-migration/pom.xml branches/topia-2.9.x/topia-service-replication/pom.xml branches/topia-2.9.x/topia-service-security/pom.xml Modified: branches/topia-2.9.x/pom.xml =================================================================== --- branches/topia-2.9.x/pom.xml 2014-05-04 16:36:47 UTC (rev 3094) +++ branches/topia-2.9.x/pom.xml 2014-05-07 09:01:05 UTC (rev 3095) @@ -33,11 +33,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.5</version> + <version>5.0.6</version> </parent> <artifactId>topia</artifactId> - <version>2.9-SNAPSHOT</version> + <version>2.9-rc-1-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -98,7 +98,7 @@ <distributionManagement> <site> <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <url>${our.site.repository}/${projectId}/2.x</url> </site> </distributionManagement> Modified: branches/topia-2.9.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.9.x/topia-persistence/pom.xml 2014-05-04 16:36:47 UTC (rev 3094) +++ branches/topia-2.9.x/topia-persistence/pom.xml 2014-05-07 09:01:05 UTC (rev 3095) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9-SNAPSHOT</version> + <version>2.9-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.9.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.9.x/topia-service-migration/pom.xml 2014-05-04 16:36:47 UTC (rev 3094) +++ branches/topia-2.9.x/topia-service-migration/pom.xml 2014-05-07 09:01:05 UTC (rev 3095) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9-SNAPSHOT</version> + <version>2.9-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.9.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.9.x/topia-service-replication/pom.xml 2014-05-04 16:36:47 UTC (rev 3094) +++ branches/topia-2.9.x/topia-service-replication/pom.xml 2014-05-07 09:01:05 UTC (rev 3095) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9-SNAPSHOT</version> + <version>2.9-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.9.x/topia-service-security/pom.xml =================================================================== --- branches/topia-2.9.x/topia-service-security/pom.xml 2014-05-04 16:36:47 UTC (rev 3094) +++ branches/topia-2.9.x/topia-service-security/pom.xml 2014-05-07 09:01:05 UTC (rev 3095) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9-SNAPSHOT</version> + <version>2.9-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

Build failed in Jenkins: topia-nightly #31
by admin+ci-nuiton.org＠codelutin.com 04 May '14

04 May '14

See <http://ci.nuiton.org/jenkins/job/topia-nightly/31/changes> Changes: [bleny] fixes #3181 introduce topia-service-flyway [bleny] fixes #3181 ------------------------------------------ [...truncated 2537 lines...] [INFO] Installing <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-migra…> to /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/topia/topia-service-migration/3.0-SNAPSHOT/topia-service-migration-3.0-SNAPSHOT-javadoc.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-migra…> to /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/topia/topia-service-migration/3.0-SNAPSHOT/topia-service-migration-3.0-SNAPSHOT.jar.asc [INFO] Installing <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-migra…> to /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/topia/topia-service-migration/3.0-SNAPSHOT/topia-service-migration-3.0-SNAPSHOT.pom.asc [INFO] Installing <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-migra…> to /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/topia/topia-service-migration/3.0-SNAPSHOT/topia-service-migration-3.0-SNAPSHOT-third-party.properties.asc [INFO] Installing <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-migra…> to /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/topia/topia-service-migration/3.0-SNAPSHOT/topia-service-migration-3.0-SNAPSHOT-sources.jar.asc [INFO] Installing <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-migra…> to /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/topia/topia-service-migration/3.0-SNAPSHOT/topia-service-migration-3.0-SNAPSHOT-javadoc.jar.asc [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building ToPIA :: Flyway integration service 3.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ topia-service-flyway --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ topia-service-flyway --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository http://maven.nuiton.org/central-releases [INFO] 42 dependencies to check. [INFO] 42 artifact(s) resolved by repository http://repo1.maven.org/maven2/ in 151.798ms [INFO] All dependencies are safe. [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ topia-service-flyway --- [INFO] Exporting server [redmine-forge.nuiton.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ topia-service-flyway --- [INFO] Will create or update license file [lgpl_v3] to <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ topia-service-flyway --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/antlr/a… [INFO] Downloading: http://repo.maven.apache.org/maven2/antlr/antlr/2.7.7/antlr-2.7.7-third-par… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/guava/guava/16.0.1/guava-16.… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/googlecode/flyway/flyway-core/2.3/f… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/h2d… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/h2database/h2/1.3.176/h2-1.3.176-th… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/net/sf/… [INFO] Downloading: http://repo.maven.apache.org/maven2/net/sf/ehcache/ehcache-core/2.4.3/ehcac… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.3.2/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/hibernate-core/4.3.5.Fina… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/hibernate-ehcache/4.3.5.F… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/common/hibernate-commons-… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/javax/persistence/hiberna… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jav… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/javassist/javassist/3.18.1-GA/javas… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jbo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/jboss/jandex/1.1.0.Final/jandex-1.1… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jbo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/jboss/logging/jboss-logging/3.1.3.G… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jbo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/jboss/logging/jboss-logging-annotat… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jbo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/jboss/spec/javax/transaction/jboss-… [INFO] Detects third party descriptor /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties [INFO] Load missing file /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties [INFO] Detects third party descriptor <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-junit/src/lic…> [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-junit/src/lic…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] Regenerate missing license file <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ topia-service-flyway --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.6:update-file-header (update-file-header) @ topia-service-flyway --- [WARNING] The extension xsl is already accepted for comment style xml [INFO] Will search files to update from root <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] Will search files to update from root <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] - adding license header on file <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] - adding license header on file <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] - adding license header on file <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] - adding license header on file <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] Scan 4 files header done in 3.109ms. [INFO] * add header on 4 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ topia-service-flyway --- [INFO] Compiling 4 source files to <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…>: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> uses unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ topia-service-flyway --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.8.1:generate-changes (jredmine-generate-changes) @ topia-service-flyway --- [INFO] Skipping goal (runOnce flag is on, and was already executed). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ topia-service-flyway --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ topia-service-flyway --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ topia-service-flyway --- [INFO] No sources to compile [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ topia-service-flyway --- [INFO] No tests to run. [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ topia-service-flyway --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ topia-service-flyway >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ topia-service-flyway --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository http://maven.nuiton.org/central-releases [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ topia-service-flyway --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ topia-service-flyway <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ topia-service-flyway --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ topia-service-flyway --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-service-flywa…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ topia-service-flyway --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ topia-service-flyway --- [INFO] Loaded <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/target/collect-arti…> [INFO] Copying topia-service-flyway-3.0-SNAPSHOT.jar to <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/target/collect/org.…> [INFO] Copying THIRD-PARTY.properties to <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/target/collect/org.…> [INFO] Copying topia-service-flyway-3.0-SNAPSHOT-sources.jar to <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/target/collect/org.…> [INFO] Copying topia-service-flyway-3.0-SNAPSHOT-javadoc.jar to <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/target/collect/org.…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ topia-service-flyway --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ topia-service-flyway --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ topia-service-flyway --- [INFO] Used declared dependencies found: [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] com.google.guava:guava:jar:16.0.1:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] com.googlecode.flyway:flyway-core:jar:2.3:compile [WARNING] Unused declared dependencies found: [WARNING] org.nuiton:nuiton-utils:jar:3.0-rc-2:compile [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] ToPIA ............................................. SUCCESS [ 19.392 s] [INFO] ToPIA :: Persistence .............................. SUCCESS [ 17.201 s] [INFO] ToPIA :: JUnit .................................... SUCCESS [ 3.891 s] [INFO] ToPIA :: Templates ................................ SUCCESS [ 7.767 s] [INFO] ToPIA :: IT ....................................... SUCCESS [01:10 min] [INFO] ToPIA :: Service Replication ...................... SUCCESS [ 34.677 s] [INFO] ToPIA :: Service Migration ........................ SUCCESS [ 3.937 s] [INFO] ToPIA :: Flyway integration service ............... FAILURE [ 6.616 s] [INFO] ToPIA :: Service Csv .............................. SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 02:47 min [INFO] Finished at: 2014-05-01T00:47:46+01:00 [INFO] Final Memory: 115M/711M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-dependency-plugin:2.8:analyze-only (analyze) on project topia-service-flyway: Dependency problems found -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-dependency-plugin:2.8:analyze-only (analyze) on project topia-service-flyway: Dependency problems found at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.maven.plugin.MojoExecutionException: Dependency problems found at org.apache.maven.plugin.dependency.analyze.AbstractAnalyzeMojo.execute(AbstractAnalyzeMojo.java:188) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :topia-service-flyway Sending e-mails to: topia-commits(a)list.nuiton.org leny(a)codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 3

Build failed in Jenkins: topia-nightly » ToPIA :: Flyway integration service #31
by admin+ci-nuiton.org＠codelutin.com 04 May '14

04 May '14

See <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> Changes: [bleny] fixes #3181 introduce topia-service-flyway ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building ToPIA :: Flyway integration service 3.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ topia-service-flyway --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ topia-service-flyway --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository http://maven.nuiton.org/central-releases [INFO] 42 dependencies to check. [INFO] 42 artifact(s) resolved by repository http://repo1.maven.org/maven2/ in 151.798ms [INFO] All dependencies are safe. [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ topia-service-flyway --- [INFO] Exporting server [redmine-forge.nuiton.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ topia-service-flyway --- [INFO] Will create or update license file [lgpl_v3] to <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ topia-service-flyway --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/antlr/a… [INFO] Downloading: http://repo.maven.apache.org/maven2/antlr/antlr/2.7.7/antlr-2.7.7-third-par… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/guava/guava/16.0.1/guava-16.… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/googlecode/flyway/flyway-core/2.3/f… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/h2d… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/h2database/h2/1.3.176/h2-1.3.176-th… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/net/sf/… [INFO] Downloading: http://repo.maven.apache.org/maven2/net/sf/ehcache/ehcache-core/2.4.3/ehcac… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.3.2/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/hibernate-core/4.3.5.Fina… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/hibernate-ehcache/4.3.5.F… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/common/hibernate-commons-… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/javax/persistence/hiberna… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jav… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/javassist/javassist/3.18.1-GA/javas… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jbo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/jboss/jandex/1.1.0.Final/jandex-1.1… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jbo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/jboss/logging/jboss-logging/3.1.3.G… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jbo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/jboss/logging/jboss-logging-annotat… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jbo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/jboss/spec/javax/transaction/jboss-… [INFO] Detects third party descriptor /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties [INFO] Load missing file /var/local/forge/data/nuiton.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties [INFO] Detects third party descriptor /var/local/forge/data/nuiton.org/jenkins/workspace/topia-nightly/trunk/topia-junit/src/license/THIRD-PARTY.properties [INFO] Load missing file /var/local/forge/data/nuiton.org/jenkins/workspace/topia-nightly/trunk/topia-junit/src/license/THIRD-PARTY.properties [INFO] Missing file <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] Regenerate missing license file <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ topia-service-flyway --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.6:update-file-header (update-file-header) @ topia-service-flyway --- [WARNING] The extension xsl is already accepted for comment style xml [INFO] Will search files to update from root <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] Will search files to update from root <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] - adding license header on file <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] - adding license header on file <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] - adding license header on file <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] - adding license header on file <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] Scan 4 files header done in 3.109ms. [INFO] * add header on 4 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ topia-service-flyway --- [INFO] Compiling 4 source files to <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…>: <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> uses unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ topia-service-flyway --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.8.1:generate-changes (jredmine-generate-changes) @ topia-service-flyway --- [INFO] Skipping goal (runOnce flag is on, and was already executed). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ topia-service-flyway --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ topia-service-flyway --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ topia-service-flyway --- [INFO] No sources to compile [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ topia-service-flyway --- [INFO] No tests to run. [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ topia-service-flyway --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ topia-service-flyway >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ topia-service-flyway --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository http://maven.nuiton.org/central-releases [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ topia-service-flyway --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ topia-service-flyway <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ topia-service-flyway --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ topia-service-flyway --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/topia-nightly/org.nuiton.topia$topia-servi…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ topia-service-flyway --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ topia-service-flyway --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ topia-service-flyway --- [INFO] Loaded /var/local/forge/data/nuiton.org/jenkins/workspace/topia-nightly/trunk/target/collect-artifacts.txt [INFO] Copying topia-service-flyway-3.0-SNAPSHOT.jar to /var/local/forge/data/nuiton.org/jenkins/workspace/topia-nightly/trunk/target/collect/org.nuiton.topia--topia-service-flyway/topia-service-flyway-3.0-SNAPSHOT.jar [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/nuiton.org/jenkins/workspace/topia-nightly/trunk/target/collect/org.nuiton.topia--topia-service-flyway/THIRD-PARTY.properties [INFO] Copying topia-service-flyway-3.0-SNAPSHOT-sources.jar to /var/local/forge/data/nuiton.org/jenkins/workspace/topia-nightly/trunk/target/collect/org.nuiton.topia--topia-service-flyway/topia-service-flyway-3.0-SNAPSHOT-sources.jar [INFO] Copying topia-service-flyway-3.0-SNAPSHOT-javadoc.jar to /var/local/forge/data/nuiton.org/jenkins/workspace/topia-nightly/trunk/target/collect/org.nuiton.topia--topia-service-flyway/topia-service-flyway-3.0-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ topia-service-flyway --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ topia-service-flyway --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ topia-service-flyway --- [INFO] Used declared dependencies found: [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] com.google.guava:guava:jar:16.0.1:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] com.googlecode.flyway:flyway-core:jar:2.3:compile [WARNING] Unused declared dependencies found: [WARNING] org.nuiton:nuiton-utils:jar:3.0-rc-2:compile [JENKINS] Archiving disabled

1 3

r3094 - trunk/topia-templates/src/main/java/org/nuiton/topia/templates
by tchemit＠users.nuiton.org 04 May '14

04 May '14

Author: tchemit Date: 2014-05-04 18:36:47 +0200 (Sun, 04 May 2014) New Revision: 3094 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3094 Log: fixes #3188: Add containsXXX method on entities Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-05-04 10:38:04 UTC (rev 3093) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-05-04 16:36:47 UTC (rev 3094) @@ -775,6 +775,9 @@ // isXXXEmpty addMultipleIsEmptyOperations(attribute); + + // containsXXX + addMultipleContainsOperation(attribute); } } @@ -1499,6 +1502,33 @@ ); } + protected void addMultipleContainsOperation(ObjectModelAttribute attribute) { + + String attrName = getPropertyName(attribute); + String attrType = getPropertyType(attribute); + + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'contains' operation for property : " + attrName); + } + + String methodName = getJavaBeanMethodName("contains", attrName); + + ObjectModelOperation isEmptyInterfaceOperation = + addOperation(outputInterface, methodName, + boolean.class, ObjectModelJavaModifier.PACKAGE); + addParameter(isEmptyInterfaceOperation, attrType, attrName); + + // Implementation + ObjectModelOperation isEmptyOperationImpl = createImplOperation(isEmptyInterfaceOperation); + + setOperationBody(isEmptyOperationImpl, "" +/*{ + boolean contains = this.<%=attrName%> !=null && this.<%=attrName%>.contains(<%=attrName%>); + return contains; + }*/ + ); + } + // ------------------------------------------------------------------------- // Generate util operations // -------------------------------------------------------------------------

1 0

r3093 - in trunk: src/site src/site/rst src/site/rst/user topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support topia-service-flyway topia-service-flyway/src/main/java/org/nuiton/topia/flyway topia-templates/src/main/java/org/nuiton/topia/templates topia-templates/src/test/java/org/nuiton/topia/templates
by tchemit＠users.nuiton.org 04 May '14

04 May '14

Author: tchemit Date: 2014-05-04 12:38:04 +0200 (Sun, 04 May 2014) New Revision: 3093 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3093 Log: add license headers optimize dependencies migrates some url Modified: trunk/src/site/rst/index.rst trunk/src/site/rst/user/ModelGeneration.rst.vm trunk/src/site/rst/user/howto.rst.vm trunk/src/site/rst/user/tagvalues.rst trunk/src/site/site_fr.xml trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MyFirstTopiaService.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MyFirstTopiaServiceImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MySecondTopiaService.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MySecondTopiaServiceImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/TopiaServiceSupportImplTest.java trunk/topia-service-flyway/pom.xml trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayJdbcMigration.java trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayMigrationInfoProvider.java trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayService.java trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaModelPropertiesProvider.java trunk/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaStereoTypesTest.java trunk/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaTagValuesTest.java Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/src/site/rst/index.rst 2014-05-04 10:38:04 UTC (rev 3093) @@ -115,7 +115,7 @@ .. _service pour la sécurité: ../topia-service-security .. _service pour la gestion des mises à jour: ../topia-service-migration .. _service de réplication: ../topia-service-replication -.. _Eugene: http://maven-site.nuiton.org/eugene/ +.. _Eugene: http://doc.nuiton.org/eugene/ .. _ArgoUML: http://argouml.tigris.org/ Modified: trunk/src/site/rst/user/ModelGeneration.rst.vm =================================================================== --- trunk/src/site/rst/user/ModelGeneration.rst.vm 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/src/site/rst/user/ModelGeneration.rst.vm 2014-05-04 10:38:04 UTC (rev 3093) @@ -86,7 +86,7 @@ </plugin> Pour plus d'information à propos d'Eugene, merci de consulter le site : -http://maven-site.nuiton.org/eugene/ +http://doc.nuiton.org/eugene/ Dépendances du projet ===================== Modified: trunk/src/site/rst/user/howto.rst.vm =================================================================== --- trunk/src/site/rst/user/howto.rst.vm 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/src/site/rst/user/howto.rst.vm 2014-05-04 10:38:04 UTC (rev 3093) @@ -153,4 +153,4 @@ -.. _Eugene: http://maven-site.nuiton.org/eugene/ +.. _Eugene: http://doc.nuiton.org/eugene/ Modified: trunk/src/site/rst/user/tagvalues.rst =================================================================== --- trunk/src/site/rst/user/tagvalues.rst 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/src/site/rst/user/tagvalues.rst 2014-05-04 10:38:04 UTC (rev 3093) @@ -78,4 +78,4 @@ Eugene contains also his tag values. See `eugene documentation`_ for more détails. -.. _eugene documentation: http://maven-site.nuiton.org/eugene/ +.. _eugene documentation: http://doc.nuiton.org/eugene/ Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/src/site/site_fr.xml 2014-05-04 10:38:04 UTC (rev 3093) @@ -89,7 +89,7 @@ </head> <breadcrumbs> - <item href="http://maven-site.nuiton.org/topia" name="${project.name}"/> + <item href="http://doc.nuiton.org/topia" name="${project.name}"/> </breadcrumbs> <menu name="Documentation" inherit="top"> Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MyFirstTopiaService.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MyFirstTopiaService.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MyFirstTopiaService.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence.internal.support; +/* + * #%L + * ToPIA :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaService; public interface MyFirstTopiaService extends TopiaService { Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MyFirstTopiaServiceImpl.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MyFirstTopiaServiceImpl.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MyFirstTopiaServiceImpl.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence.internal.support; +/* + * #%L + * ToPIA :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaApplicationContext; Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MySecondTopiaService.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MySecondTopiaService.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MySecondTopiaService.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence.internal.support; +/* + * #%L + * ToPIA :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaService; public interface MySecondTopiaService extends TopiaService { Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MySecondTopiaServiceImpl.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MySecondTopiaServiceImpl.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/MySecondTopiaServiceImpl.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence.internal.support; +/* + * #%L + * ToPIA :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaApplicationContext; Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/TopiaServiceSupportImplTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/TopiaServiceSupportImplTest.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/TopiaServiceSupportImplTest.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence.internal.support; +/* + * #%L + * ToPIA :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableMap; import org.junit.Assert; import org.junit.Before; Modified: trunk/topia-service-flyway/pom.xml =================================================================== --- trunk/topia-service-flyway/pom.xml 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-service-flyway/pom.xml 2014-05-04 10:38:04 UTC (rev 3093) @@ -31,11 +31,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Modified: trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayJdbcMigration.java =================================================================== --- trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayJdbcMigration.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayJdbcMigration.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.flyway; +/* + * #%L + * ToPIA :: Flyway integration service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.googlecode.flyway.core.api.migration.jdbc.JdbcMigration; /** Modified: trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayMigrationInfoProvider.java =================================================================== --- trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayMigrationInfoProvider.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayMigrationInfoProvider.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.flyway; +/* + * #%L + * ToPIA :: Flyway integration service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.googlecode.flyway.core.api.migration.MigrationInfoProvider; /** Modified: trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayService.java =================================================================== --- trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayService.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayService.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.flyway; +/* + * #%L + * ToPIA :: Flyway integration service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaService; /** Modified: trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java =================================================================== --- trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.flyway; +/* + * #%L + * ToPIA :: Flyway integration service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableSet; import com.googlecode.flyway.core.Flyway; import com.googlecode.flyway.core.util.Location; Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaModelPropertiesProvider.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaModelPropertiesProvider.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaModelPropertiesProvider.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,6 +1,30 @@ package org.nuiton.topia.templates; +/* + * #%L + * ToPIA :: Templates + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.nuiton.eugene.ModelPropertiesUtil; /** Modified: trunk/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaStereoTypesTest.java =================================================================== --- trunk/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaStereoTypesTest.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaStereoTypesTest.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.templates; +/* + * #%L + * ToPIA :: Templates + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.junit.Assert; import org.junit.Before; import org.nuiton.eugene.models.stereotype.MismatchStereotypeTargetException; Modified: trunk/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaTagValuesTest.java =================================================================== --- trunk/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaTagValuesTest.java 2014-05-01 14:12:03 UTC (rev 3092) +++ trunk/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaTagValuesTest.java 2014-05-04 10:38:04 UTC (rev 3093) @@ -1,5 +1,29 @@ package org.nuiton.topia.templates; +/* + * #%L + * ToPIA :: Templates + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.junit.Assert; import org.junit.Before; import org.nuiton.eugene.models.tagvalue.MismatchTagValueTargetException;

1 0

r3092 - trunk/topia-templates/src/main/java/org/nuiton/topia/templates
by tchemit＠users.nuiton.org 01 May '14

01 May '14

Author: tchemit Date: 2014-05-01 16:12:03 +0200 (Thu, 01 May 2014) New Revision: 3092 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3092 Log: fixes #3187: Bad hibernate collection type in mapping for an ordered and unique attribute Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2014-05-01 13:15:46 UTC (rev 3091) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2014-05-01 14:12:03 UTC (rev 3092) @@ -562,10 +562,10 @@ */ public static String getNMultiplicityHibernateType( ObjectModelAttribute attr) { - if (EugeneStereoTypes.hasUniqueStereotype(attr)) { + if (JavaGeneratorUtil.isOrdered(attr)) { + return "list"; + } else if (EugeneStereoTypes.hasUniqueStereotype(attr)) { return "set"; - } else if (JavaGeneratorUtil.isOrdered(attr)) { - return "list"; } //attr.isOrdered() - On génère le ordered en bag return "bag";

1 0

r3091 - trunk/topia-templates/src/main/java/org/nuiton/topia/templates
by tchemit＠users.nuiton.org 01 May '14

01 May '14

Author: tchemit Date: 2014-05-01 15:15:46 +0200 (Thu, 01 May 2014) New Revision: 3091 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3091 Log: fixes #3186 generates more methods on ordered (but not unique) entity attributes Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-05-01 12:21:24 UTC (rev 3090) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-05-01 13:15:46 UTC (rev 3091) @@ -28,6 +28,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.EugeneStereoTypes; import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; @@ -718,9 +719,19 @@ collectionImpl = TopiaGeneratorUtil.getSimpleName(collectionImpl); + boolean ordered = TopiaGeneratorUtil.isOrdered(attribute); + boolean unique = EugeneStereoTypes.hasUniqueStereotype(attribute); + boolean entity = TopiaGeneratorUtil.isEntity(attribute, model); + // addXXX addMultipleAddOperation(attribute, collectionImpl); + if (ordered && !unique) { + + // addXXX(index) + addMultipleAddAtIndexOperation(attribute, collectionImpl); + } + // addAllXXX addMultipleAddAllOperation(attribute, collectionInterface); @@ -730,20 +741,27 @@ // removeXXX addMultipleRemoveOperation(attribute); + if (ordered && !unique) { + + // removeXXX(index) + addMultipleRemoveAtIndexOperation(attribute); + } + // clearXXX addMultipleClearOperation(attribute, collectionInterface, collectionImpl); // getXXX addMultipleGetOperation(attribute, collectionInterface); - if (TopiaGeneratorUtil.isOrdered(attribute)) { + if (ordered) { // getXXX(index) addMultipleGetByIndexOperation(attribute); } - if (TopiaGeneratorUtil.isEntity(attribute, model)) { + if (entity) { + // getXXXByTopiaId addMultipleGetByTopiaIdOperation(attribute); @@ -909,6 +927,79 @@ setOperationBody(implOperation, body.toString()); } + protected void addMultipleAddAtIndexOperation(ObjectModelAttribute attribute, + String collectionImpl) { + + String attrName = getPropertyName(attribute); + String attrType = getPropertyType(attribute); + ObjectModelAttribute reverse = attribute.getReverseAttribute(); + + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'add' operation for property : " + attrName + + " [" + attrType + "]"); + } + + String constantName = getConstantName(attrName); + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, getJavaBeanMethodName("add", attrName), + void.class, ObjectModelJavaModifier.PACKAGE); + addParameter(interfaceOperation, int.class, "index"); + ObjectModelParameter param = + addParameter(interfaceOperation, attrType, attrName); + + // Implementation + ObjectModelOperation implOperation = createImplOperation(interfaceOperation); + + attrType = TopiaGeneratorUtil.getSimpleName(attrType); + + StringBuilder body = new StringBuilder(); + + body.append("" +/*{ + fireOnPreWrite(<%=constantName%>, null, <%=attrName%>); + if (this.<%=attrName%> == null) { + this.<%=attrName%> = new <%=collectionImpl%><<%=attrType%>>(); + } +}*/ + ); + + if (reverse != null && (reverse.isNavigable() || + hasUnidirectionalRelationOnAbstractType(attribute, model))) { + String getterName = getJavaBeanMethodName("get", reverse.getName()); + String setterName = getJavaBeanMethodName("set", reverse.getName()); + + // TODO brendan 15/04/14 remove FQN + String reverseAttrType = JavaGeneratorUtil.getAttributeImplementationType(reverse, true); + + if (!TopiaGeneratorUtil.isNMultiplicity(reverse)) { + body.append("" +/*{ + <%=attrName%>.<%=setterName%>(this); +}*/ + ); + // Don't manage reverse attribute add if attribute has associationClass + } else if (!attribute.hasAssociationClass()) { + body.append("" +/*{ + if (<%=attrName%>.<%=getterName%>() == null) { + <%=attrName%>.<%=setterName%>(new <%=reverseAttrType%>()); + } + <%=attrName%>.<%=getterName%>().add(index, this); +}*/ + ); + } + } + body.append("" +/*{ + this.<%=attrName%>.add(index, <%=attrName%>); + fireOnPostWrite(<%=constantName%>, index, null, <%=attrName%>); + }*/ + ); + setOperationBody(implOperation, body.toString()); + } + protected void addMultipleAddAllOperation(ObjectModelAttribute attribute, String collectionInterface) { @@ -1043,6 +1134,71 @@ setOperationBody(implOperation, body.toString()); } + protected void addMultipleRemoveAtIndexOperation(ObjectModelAttribute attribute) { + + String attrName = getPropertyName(attribute); + String attrType = getPropertyType(attribute); + ObjectModelAttribute reverse = attribute.getReverseAttribute(); + String constantName = getConstantName(attrName); + + if (log.isDebugEnabled()) { + log.debug("Generate 'remove' operation for property : " + attrName + + " [" + attrType + "]"); + } + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, getJavaBeanMethodName("remove", attrName), + void.class, ObjectModelJavaModifier.PACKAGE); + addParameter(interfaceOperation, int.class, "index"); + + // Implementation + ObjectModelOperation implOperation = createImplOperation(interfaceOperation); + + attrType = TopiaGeneratorUtil.getSimpleName(attrType); + + StringBuilder body = new StringBuilder(); + + body.append("" +/*{ + fireOnPreWrite(<%=constantName%>, <%=attrName%>, null); + if (this.<%=attrName%> == null) { + throw new IllegalArgumentException("List does not contain given element"); + } + <%=attrType%> oldValue = this.<%=attrName%>.remove(index); + if (oldValue == null) { + throw new IllegalArgumentException("List does not contain given element"); + } +}*/ + ); + + if (reverse != null && (reverse.isNavigable() || + hasUnidirectionalRelationOnAbstractType(attribute, model))) { + String getterName = getJavaBeanMethodName("get", reverse.getName()); + String setterName = getJavaBeanMethodName("set", reverse.getName()); + if (!TopiaGeneratorUtil.isNMultiplicity(reverse)) { + body.append("" +/*{ + <%=attrName%>.<%=setterName%>(null); +}*/ + ); + // Don't manage reverse attribute remove if attribute has associationClass + } else if (!attribute.hasAssociationClass()) { + body.append("" +/*{ + <%=attrName%>.<%=getterName%>().remove(this); +}*/ + ); + } + } + body.append("" +/*{ + fireOnPostWrite(<%=constantName%>, index, oldValue, null); + }*/ + ); + setOperationBody(implOperation, body.toString()); + } + protected void addMultipleClearOperation(ObjectModelAttribute attribute, String collectionInterface, String collectionImpl) {

1 0

r3090 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/persistence/util topia-templates/src/main/java/org/nuiton/topia/templates
by tchemit＠users.nuiton.org 01 May '14

01 May '14

Author: tchemit Date: 2014-05-01 14:21:24 +0200 (Thu, 01 May 2014) New Revision: 3090 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3090 Log: fixes #3184: Fix generation of entity.getXXX(index) for ordered but not unique attribute Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2014-04-30 13:56:22 UTC (rev 3089) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2014-05-01 12:21:24 UTC (rev 3090) @@ -25,6 +25,7 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; @@ -127,6 +128,23 @@ } /** + * Get entity at {@code index} position in the collection is not null. + * + * @param entities collection of entities (can be null) + * @param index position to get + * @param <E> type of entity + * @return the entity at the given index, or {@code null} if entities are null + * @throws IndexOutOfBoundsException if index is out of bounds + * @since 3.0 + */ + public static <E extends TopiaEntity> E getEntityByIndex(Collection<E> entities, int index) throws IndexOutOfBoundsException { + if (entities != null) { + return Iterables.get(entities, index); + } + return null; + } + + /** * Teste si une entité possède un topiaId. * * @param paramName le nom du paramètre à afficher en casd'erreur Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-04-30 13:56:22 UTC (rev 3089) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-05-01 12:21:24 UTC (rev 3090) @@ -736,6 +736,12 @@ // getXXX addMultipleGetOperation(attribute, collectionInterface); + if (TopiaGeneratorUtil.isOrdered(attribute)) { + + // getXXX(index) + addMultipleGetByIndexOperation(attribute); + } + if (TopiaGeneratorUtil.isEntity(attribute, model)) { // getXXXByTopiaId @@ -746,12 +752,6 @@ } - if (TopiaGeneratorUtil.isOrdered(attribute)) { - - // getXXX(index) - addMultipleGetByIndexOperation(attribute); - } - // sizeXXX addMultipleSizeOperation(attribute); @@ -1151,7 +1151,7 @@ addOperation(outputInterface, getJavaBeanMethodName("get", attrName), attrType, ObjectModelJavaModifier.PACKAGE); ObjectModelParameter param = - addParameter(interfaceOperation, Integer.class, "index"); + addParameter(interfaceOperation, int.class, "index"); // Implementation ObjectModelOperation implOperation = @@ -1161,7 +1161,7 @@ setOperationBody(implOperation, "" /*{ - return <%=attrName%>.get(index); + return TopiaEntityHelper.getEntityByIndex(<%=attrName%>, index); }*/ ); }

1 0