[Nuiton-jpa-commits] [nuiton-jpa] 01/01: fixes #3557: Migrates to git

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-jpa. See http://git.nuiton.org/nuiton-jpa.git commit a8d531c2f3a7c15a8a1f0bc9845c81f40fd2f89e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 26 18:33:56 2014 +0100 fixes #3557: Migrates to git --- .gitignore | 12 ++++ .../java/org/nuiton/jpa/api/AbstractJpaDao.java | 2 - .../java/org/nuiton/jpa/api/AbstractJpaEntity.java | 2 - .../jpa/api/AbstractJpaPersistenceContext.java | 2 - .../nuiton/jpa/api/DefaultJpaEntityIdFactory.java | 2 - .../src/main/java/org/nuiton/jpa/api/JpaDao.java | 2 - .../main/java/org/nuiton/jpa/api/JpaEntities.java | 2 - .../main/java/org/nuiton/jpa/api/JpaEntity.java | 2 - .../org/nuiton/jpa/api/JpaEntityIdFactory.java | 2 - .../nuiton/jpa/api/JpaEntityIdFactoryResolver.java | 2 - .../org/nuiton/jpa/api/JpaEntityVisitable.java | 2 - .../java/org/nuiton/jpa/api/JpaEntityVisitor.java | 2 - .../org/nuiton/jpa/api/JpaPersistenceContext.java | 2 - .../nuiton/jpa/api/SequenceJpaEntityIdFactory.java | 2 - nuiton-jpa-api/src/site/site.xml | 41 +++++++++++ nuiton-jpa-hibernate/pom.xml | 8 +-- .../org/nuiton/jpa/hibernate/HibernateUtil.java | 2 - .../OracleCompliantImprovedNamingStrategy.java | 2 - nuiton-jpa-hibernate/src/site/site.xml | 41 +++++++++++ .../OracleCompliantImprovedNamingStrategyTest.java | 2 - nuiton-jpa-junit/pom.xml | 7 +- .../org/nuiton/jpa/junit/JpaEntityManagerRule.java | 2 - nuiton-jpa-junit/src/site/site.xml | 41 +++++++++++ nuiton-jpa-templates/pom.xml | 3 +- .../src/it/magalie-with-generated-value/pom.xml | 2 - .../magalie-with-generated-value/postbuild.groovy | 2 - .../src/main/xmi/magalie.properties | 2 - nuiton-jpa-templates/src/it/magalie/pom.xml | 2 - .../src/it/magalie/postbuild.groovy | 2 - .../src/it/magalie/src/main/xmi/magalie.properties | 2 - nuiton-jpa-templates/src/it/settings.xml | 2 - .../jpa/templates/AbstractJpaTransformer.java | 2 - .../nuiton/jpa/templates/JpaDaoTransformer.java | 2 - .../nuiton/jpa/templates/JpaEntityTransformer.java | 2 - .../nuiton/jpa/templates/JpaMetaTransformer.java | 2 - .../nuiton/jpa/templates/JpaModelValidator.java | 2 - .../JpaPersistenceContextTransformer.java | 2 - .../jpa/templates/JpaTemplatesGeneratorUtil.java | 2 - .../JpaTemplatesModelPropertiesProvider.java | 2 - .../jpa/templates/JpaTemplatesStereoTypes.java | 2 - .../jpa/templates/JpaTemplatesTagValues.java | 2 - .../org/nuiton/jpa/templates/package-info.java | 2 - pom.xml | 77 ++++++++++++++------ src/site/rst/index.rst | 2 - src/site/site.xml | 81 ++++++---------------- 45 files changed, 218 insertions(+), 165 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9c102da --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +/target +/.idea +/*.ipr +/*.iml +/*.iws +/*~ +/*/.idea +/*/*.ipr +/*/*.iml +/*/*.iws +/*/*~ +/*/target diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaDao.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaDao.java index 97e044a..e6705ef 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaDao.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaDao.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaEntity.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaEntity.java index 7aed46f..5b93a14 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaEntity.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaEntity.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaPersistenceContext.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaPersistenceContext.java index 3c4ca0b..4e34370 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaPersistenceContext.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaPersistenceContext.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdFactory.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdFactory.java index 55648eb..d90de8a 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdFactory.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdFactory.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaDao.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaDao.java index 1729932..453d11a 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaDao.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaDao.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java index 5146f0f..02e22c9 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntity.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntity.java index 28adc82..7e99b0a 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntity.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntity.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactory.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactory.java index 4373599..3cec4f2 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactory.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactory.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactoryResolver.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactoryResolver.java index 60a10ff..4a700c0 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactoryResolver.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactoryResolver.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityVisitable.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityVisitable.java index fb77760..09bcd18 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityVisitable.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityVisitable.java @@ -4,8 +4,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityVisitor.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityVisitor.java index 5f6388f..40440fb 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityVisitor.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityVisitor.java @@ -4,8 +4,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaPersistenceContext.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaPersistenceContext.java index f9c19d5..227450c 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaPersistenceContext.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaPersistenceContext.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/SequenceJpaEntityIdFactory.java b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/SequenceJpaEntityIdFactory.java index 6c69865..b2aff2d 100644 --- a/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/SequenceJpaEntityIdFactory.java +++ b/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/SequenceJpaEntityIdFactory.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.api; /* * #%L * Nuiton Jpa :: API - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-api/src/site/site.xml b/nuiton-jpa-api/src/site/site.xml new file mode 100644 index 0000000..39c0f52 --- /dev/null +++ b/nuiton-jpa-api/src/site/site.xml @@ -0,0 +1,41 @@ +<!-- + #%L + Nuiton Jpa :: API + %% + Copyright (C) 2013 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% + --> + +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu ref="reports"/> + + </body> +</project> diff --git a/nuiton-jpa-hibernate/pom.xml b/nuiton-jpa-hibernate/pom.xml index 8e92786..d4ba98e 100644 --- a/nuiton-jpa-hibernate/pom.xml +++ b/nuiton-jpa-hibernate/pom.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -58,9 +59,4 @@ </dependencies> - <build> - - - </build> - </project> diff --git a/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/HibernateUtil.java b/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/HibernateUtil.java index 605538a..6bac6ed 100644 --- a/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/HibernateUtil.java +++ b/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/HibernateUtil.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.hibernate; /* * #%L * Nuiton Jpa :: Hibernate - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java b/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java index 768338e..d4fa500 100644 --- a/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java +++ b/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.hibernate; /* * #%L * Nuiton Jpa :: Hibernate - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-hibernate/src/site/site.xml b/nuiton-jpa-hibernate/src/site/site.xml new file mode 100644 index 0000000..e9084c4 --- /dev/null +++ b/nuiton-jpa-hibernate/src/site/site.xml @@ -0,0 +1,41 @@ +<!-- + #%L + Nuiton Jpa :: Hibernate + %% + Copyright (C) 2013 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% + --> + +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu ref="reports"/> + + </body> +</project> diff --git a/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java b/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java index 2a5309c..2078bdd 100644 --- a/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java +++ b/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.hibernate; /* * #%L * Nuiton Jpa :: Hibernate - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-junit/pom.xml b/nuiton-jpa-junit/pom.xml index ac2c37b..c2ca985 100644 --- a/nuiton-jpa-junit/pom.xml +++ b/nuiton-jpa-junit/pom.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -41,9 +42,5 @@ </dependencies> - <build> - - - </build> </project> diff --git a/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java b/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java index a4ee23c..90b8f71 100644 --- a/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java +++ b/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.junit; /* * #%L * Nuiton Jpa :: Junit - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-junit/src/site/site.xml b/nuiton-jpa-junit/src/site/site.xml new file mode 100644 index 0000000..a4e9ee5 --- /dev/null +++ b/nuiton-jpa-junit/src/site/site.xml @@ -0,0 +1,41 @@ +<!-- + #%L + Nuiton Jpa :: Junit + %% + Copyright (C) 2013 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% + --> + +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu ref="reports"/> + + </body> +</project> diff --git a/nuiton-jpa-templates/pom.xml b/nuiton-jpa-templates/pom.xml index f25e25a..5ff4178 100644 --- a/nuiton-jpa-templates/pom.xml +++ b/nuiton-jpa-templates/pom.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> diff --git a/nuiton-jpa-templates/src/it/magalie-with-generated-value/pom.xml b/nuiton-jpa-templates/src/it/magalie-with-generated-value/pom.xml index 4678f01..9104a31 100644 --- a/nuiton-jpa-templates/src/it/magalie-with-generated-value/pom.xml +++ b/nuiton-jpa-templates/src/it/magalie-with-generated-value/pom.xml @@ -2,8 +2,6 @@ <!-- #%L Nuiton Jpa :: Temlates - $Id:$ - $HeadURL:$ %% Copyright (C) 2006 - 2010 CodeLutin %% diff --git a/nuiton-jpa-templates/src/it/magalie-with-generated-value/postbuild.groovy b/nuiton-jpa-templates/src/it/magalie-with-generated-value/postbuild.groovy index 32f92a3..865f51e 100644 --- a/nuiton-jpa-templates/src/it/magalie-with-generated-value/postbuild.groovy +++ b/nuiton-jpa-templates/src/it/magalie-with-generated-value/postbuild.groovy @@ -1,8 +1,6 @@ /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi/magalie.properties b/nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi/magalie.properties index 897a80c..3943171 100644 --- a/nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi/magalie.properties +++ b/nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi/magalie.properties @@ -1,8 +1,6 @@ ### # #%L # Nuiton Jpa :: Temlates -# $Id:$ -# $HeadURL:$ # %% # Copyright (C) 2013 CodeLutin # %% diff --git a/nuiton-jpa-templates/src/it/magalie/pom.xml b/nuiton-jpa-templates/src/it/magalie/pom.xml index 4678f01..9104a31 100644 --- a/nuiton-jpa-templates/src/it/magalie/pom.xml +++ b/nuiton-jpa-templates/src/it/magalie/pom.xml @@ -2,8 +2,6 @@ <!-- #%L Nuiton Jpa :: Temlates - $Id:$ - $HeadURL:$ %% Copyright (C) 2006 - 2010 CodeLutin %% diff --git a/nuiton-jpa-templates/src/it/magalie/postbuild.groovy b/nuiton-jpa-templates/src/it/magalie/postbuild.groovy index 32f92a3..865f51e 100644 --- a/nuiton-jpa-templates/src/it/magalie/postbuild.groovy +++ b/nuiton-jpa-templates/src/it/magalie/postbuild.groovy @@ -1,8 +1,6 @@ /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties b/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties index 24eb892..c23d9ff 100644 --- a/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties +++ b/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties @@ -1,8 +1,6 @@ ### # #%L # Nuiton Jpa :: Temlates -# $Id:$ -# $HeadURL:$ # %% # Copyright (C) 2013 CodeLutin # %% diff --git a/nuiton-jpa-templates/src/it/settings.xml b/nuiton-jpa-templates/src/it/settings.xml index 38bcff6..79e56f0 100644 --- a/nuiton-jpa-templates/src/it/settings.xml +++ b/nuiton-jpa-templates/src/it/settings.xml @@ -2,8 +2,6 @@ <!-- #%L Nuiton Jpa :: Temlates - $Id:$ - $HeadURL:$ %% Copyright (C) 2006 - 2010 CodeLutin %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/AbstractJpaTransformer.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/AbstractJpaTransformer.java index f1b46a3..9c21212 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/AbstractJpaTransformer.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/AbstractJpaTransformer.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin, Tony Chemit * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java index 19f9fcd..fee4cd0 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java index 8dcf399..4ff9dbe 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin, Tony Chemit * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaMetaTransformer.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaMetaTransformer.java index d74af69..d12d3cc 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaMetaTransformer.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaMetaTransformer.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaModelValidator.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaModelValidator.java index 56e94b2..c95d13e 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaModelValidator.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaModelValidator.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java index a8277a8..6f442b3 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesGeneratorUtil.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesGeneratorUtil.java index 84c47d5..e18953b 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesGeneratorUtil.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesGeneratorUtil.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin, Tony Chemit * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesModelPropertiesProvider.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesModelPropertiesProvider.java index 88f755b..ff7f6f3 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesModelPropertiesProvider.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesModelPropertiesProvider.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin, Tony Chemit * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesStereoTypes.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesStereoTypes.java index 6ae2493..f2ed8ca 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesStereoTypes.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesStereoTypes.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin, Tony Chemit * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java index 211e620..d8ab0a7 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java @@ -3,8 +3,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin, Tony Chemit * %% diff --git a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/package-info.java b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/package-info.java index a3bc466..71b4f28 100644 --- a/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/package-info.java +++ b/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/package-info.java @@ -11,8 +11,6 @@ package org.nuiton.jpa.templates; /* * #%L * Nuiton Jpa :: Temlates - * $Id:$ - * $HeadURL:$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/pom.xml b/pom.xml index 7f4d994..b24300b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.6-SNAPSHOT</version> + <artifactId>nuitonpom</artifactId> + <version>1.5</version> </parent> <artifactId>nuiton-jpa</artifactId> @@ -14,7 +15,7 @@ <packaging>pom</packaging> <name>Nuiton Jpa</name> - <url>http://maven-site.nuiton.org/nuiton-jpa</url> + <url>http://nuiton-jpa.nuiton.org</url> <description> Help the developer by generating a persistence layer from an UML model using EUGene. @@ -22,13 +23,13 @@ <inceptionYear>2013</inceptionYear> <developers> - + <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit at codelutin dot com</email> + <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> + <organizationUrl>https://www.codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> @@ -40,7 +41,7 @@ <id>bleny</id> <email>bleny at codelutin dot com</email> <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> + <organizationUrl>https://www.codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> @@ -57,23 +58,28 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-jpa/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-jpa/trunk</developerConnection> - <url>http://nuiton.org/projects/nuiton-jpa/repository/show/trunk</url> + <connection>scm:git:http://git.nuiton.org/nuiton-jpa.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/nuiton-jpa.git</developerConnection> + <url>https://gitweb.nuiton.org/nuiton-jpa.git</url> </scm> + <distributionManagement> <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> - <!-- pour un muli module on doit fixer le projectId --> + + <!-- redmine project Id --> <projectId>nuiton-jpa</projectId> + <!-- Documentation in english --> + <locales>en</locales> + <!-- libs version --> - <eugeneVersion>2.8-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.8</eugeneVersion> <processorPluginVersion>1.3</processorPluginVersion> <h2Version>1.4.177</h2Version> <hibernateVersion>4.2.12.Final</hibernateVersion> @@ -84,6 +90,28 @@ <dependencies> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + </dependency> + + <dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> <version>${eugeneVersion}</version> @@ -121,6 +149,20 @@ <version>${h2Version}</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> @@ -175,9 +217,4 @@ </pluginManagement> </build> - <reporting> - <!--TC-20100413 : by default do nothing except documentation --> - <excludeDefaults>true</excludeDefaults> - </reporting> - </project> diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index 5c12a1a..c8aedaa 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -1,8 +1,6 @@ .. - .. * #%L .. * Nuiton Jpa -.. * $Id:$ -.. * $HeadURL:$ .. * %% .. * Copyright (C) 2013 CodeLutin .. * %% diff --git a/src/site/site.xml b/src/site/site.xml index d3b3857..39e8ab6 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,8 +1,6 @@ <!-- #%L Nuiton Jpa - $Id:$ - $HeadURL:$ %% Copyright (C) 2013 CodeLutin %% @@ -22,23 +20,9 @@ #L% --> -<project name="${project.name}"> - - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -50,52 +34,41 @@ <href>http://www.codelutin.com</href> </bannerRight> - <publishDate position="right"/> - <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.nuiton.org/public/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> + <logo href="https://jrst.nuiton.org" name="JRst" img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> - <breadcrumbs> - <item name="${project.name}" href="./index.html"/> - </breadcrumbs> - - <head> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - </head> - <links> - <item name="Nuiton.org" href="http://nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + <item name="Nuiton.org" href="https://forge.nuiton.org"/> + <item name="Code Lutin" href="https://www.codelutin.com"/> + <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> </links> + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + <menu name="Home"> <item name="Home" href="index.html"/> </menu> <menu name="Project"> - <item name="Forge" href="http://nuiton.org/projects/show/nuiton-jpa"/> + <item name="Forge" href="https://forge.nuiton.org/projects/show/nuiton-jpa"/> <item name="Downloads" - href="http://nuiton.org/projects/nuiton-jpa/files"/> - <item name="Trackers" href="http://nuiton.org/projects/nuiton-jpa/issues"/> + href="https://forge.nuiton.org/projects/nuiton-jpa/files"/> + <item name="Trackers" href="https://forge.nuiton.org/projects/nuiton-jpa/issues"/> </menu> <menu name="Links"> <item name="Nuiton-processor" - href="http://maven-site.nuiton.org/processor"/> - <item name="Eugene" href="http://maven-site.nuiton.org/eugene"/> + href="http://processor.nuiton.org"/> + <item name="Eugene" href="http://eugene.nuiton.org"/> <item name="ArgoUML" href="http://argouml.tigris.org/"/> <item name="UML" href="http://www.uml.org/"/> <item name="XMI" href="http://www.omg.org/spec/XMI/"/> @@ -105,19 +78,5 @@ <menu ref="reports"/> - <footer> - - <div id='projectMetas' locale='en' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.