Topia-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- 4806 discussions
Author: tchemit
Date: 2009-05-17 21:07:42 +0000 (Sun, 17 May 2009)
New Revision: 1466
Modified:
topia/trunk/pom.xml
Log:
ready for first release
Modified: topia/trunk/pom.xml
===================================================================
--- topia/trunk/pom.xml 2009-05-17 16:00:52 UTC (rev 1465)
+++ topia/trunk/pom.xml 2009-05-17 21:07:42 UTC (rev 1466)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom</artifactId>
- <version>1.0.0-alpha-1-SNAPSHOT</version>
+ <version>1.0.0-alpha-2</version>
</parent>
<artifactId>topia</artifactId>
@@ -171,12 +171,13 @@
<properties>
<!-- libs version -->
- <generator.version>1.0.0-alpha-1-SNAPSHOT</generator.version>
+ <generator.version>1.0.0-alpha-1</generator.version>
<xmlrpc.version>3.1</xmlrpc.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<topia.version>${project.version}</topia.version>
+ <!-- pour un projet multi-module on fixe l'ur sans artifactId) -->
<maven.issueManagement.url>http://www.nuiton.org/projects/topia/issues</maven.issueManagement.url>
</properties>
@@ -190,7 +191,7 @@
<plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-process-plugin</artifactId>
- <version>1.0.0-alpha-1-SNAPSHOT</version>
+ <version>1.0.0-alpha-1</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -246,13 +247,12 @@
<connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk</connection>
<developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/topia/topia/trunk</developerConnection>
<url>http://www.nuiton.org/repositories/browse/topia/trunk</url>
-
<!-- a utiliser quand on sera sur nuiton -->
<!-- ne fonctionnera pas pour les multi-modules a cause de l'expansion de l'artifactId
il faudra alors remttre ces trois valeurs sur le pom parent du multi-module -->
<!--connection>scm:svn:http://svn.nuiton.org/svn/${project.artifactId}/trunk</connection>
<developerConnection>scm:svn:http://svn.nuiton.org/svn/${project.artifactId}/trunk</developerConnection>
- <url>http://svn.nuiton.org/svn/${project.artifactId}/trunk</url-->
+ <url>http://www.nuiton.org/repositories/browse/topia/trunk</url-->
</scm>
</project>
1
0
r1465 - in topia/trunk: . src/site topia-persistence topia-persistence/src/site topia-soa topia-soa/src/site topia-ui topia-ui/src/site
by tchemit＠users.labs.libre-entreprise.org 17 May '09
by tchemit＠users.labs.libre-entreprise.org 17 May '09
17 May '09
Author: tchemit
Date: 2009-05-17 16:00:52 +0000 (Sun, 17 May 2009)
New Revision: 1465
Modified:
topia/trunk/pom.xml
topia/trunk/src/site/site.xml
topia/trunk/topia-persistence/pom.xml
topia/trunk/topia-persistence/src/site/site.xml
topia/trunk/topia-soa/pom.xml
topia/trunk/topia-soa/src/site/site.xml
topia/trunk/topia-ui/pom.xml
topia/trunk/topia-ui/src/site/site.xml
Log:
premier jet d'un pom parent compatible central
Modified: topia/trunk/pom.xml
===================================================================
--- topia/trunk/pom.xml 2009-05-17 02:50:35 UTC (rev 1464)
+++ topia/trunk/pom.xml 2009-05-17 16:00:52 UTC (rev 1465)
@@ -9,11 +9,11 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
<artifactId>topia</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0-alpha-1-SNAPSHOT</version>
<modules>
<module>topia-persistence</module>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0-alpha-1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -160,6 +160,7 @@
<name>ToPIA - Tools for Portable and Independent Architecture</name>
<description>Framework de persistance et de distribution d'application.</description>
<inceptionYear>2004</inceptionYear>
+ <url>http://www.nuiton.org/embedded/${project.artifactId}</url>
<!-- ************************************************************* -->
<!-- *** Build Settings ****************************************** -->
@@ -170,15 +171,13 @@
<properties>
<!-- libs version -->
- <generator.version>1.0.0-SNAPSHOT</generator.version>
+ <generator.version>1.0.0-alpha-1-SNAPSHOT</generator.version>
<xmlrpc.version>3.1</xmlrpc.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<topia.version>${project.version}</topia.version>
- <!-- a supprimer des qu'on pourra deployer les sites sur nuiton -->
- <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/topia/htdocs/nuiton</site.deploy.url>
-
+ <maven.issueManagement.url>http://www.nuiton.org/projects/topia/issues</maven.issueManagement.url>
</properties>
<build>
@@ -191,7 +190,7 @@
<plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-process-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -222,7 +221,7 @@
</configuration>
</plugin>
- <plugin>
+ <!--plugin>
<artifactId>maven-site-plugin</artifactId>
<dependencies>
<dependency>
@@ -231,7 +230,7 @@
<version>1.0.1</version>
</dependency>
</dependencies>
- </plugin>
+ </plugin-->
</plugins>
</pluginManagement>
@@ -242,21 +241,18 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
- <!--Nuiton Repository : pourra etre supprimer lorsqu'on sera sur central -->
- <repositories>
- <repository>
- <id>nuiton-repository</id>
- <name>NuitonRepository</name>
- <url>http://lutinbuilder.labs.libre-entreprise.org/maven2-nuiton</url>
- <snapshots>
- <enabled>true</enabled>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- </repository>
- </repositories>
+ <!-- Source control management. -->
+ <scm>
+ <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk</connection>
+ <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/topia/topia/trunk</developerConnection>
+ <url>http://www.nuiton.org/repositories/browse/topia/trunk</url>
+
+ <!-- a utiliser quand on sera sur nuiton -->
+ <!-- ne fonctionnera pas pour les multi-modules a cause de l'expansion de l'artifactId
+ il faudra alors remttre ces trois valeurs sur le pom parent du multi-module -->
+ <!--connection>scm:svn:http://svn.nuiton.org/svn/${project.artifactId}/trunk</connection>
+ <developerConnection>scm:svn:http://svn.nuiton.org/svn/${project.artifactId}/trunk</developerConnection>
+ <url>http://svn.nuiton.org/svn/${project.artifactId}/trunk</url-->
+ </scm>
</project>
Modified: topia/trunk/src/site/site.xml
===================================================================
--- topia/trunk/src/site/site.xml 2009-05-17 02:50:35 UTC (rev 1464)
+++ topia/trunk/src/site/site.xml 2009-05-17 16:00:52 UTC (rev 1465)
@@ -4,9 +4,9 @@
<publishDate format="dd/MM/yyyy"/>
<skin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-lutin-skin</artifactId>
- <version>0.2.3</version>
+ <groupId>org.nuiton</groupId>
+ <artifactId>maven-nuiton-skin</artifactId>
+ <version>1.0.0-alpha-1</version>
</skin>
<bannerLeft>
@@ -20,18 +20,18 @@
</bannerRight>
<poweredBy>
- <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/>
- <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/>
+ <logo href="http://maven.apache.org" name="Maven" img="http://jrst.labs.libre-entreprise.org/jrst/images/logos/maven-feather.png"/>
+ <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="http://jrst.labs.libre-entreprise.org/jrst/images/jrst-logo.png"/>
<logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText"
- img="images/restructuredtext-logo.png"/>
+ img="http://jrst.labs.libre-entreprise.org/jrst/images/restructuredtext-logo.png"/>
</poweredBy>
<body>
<links>
<item name="ToPIA Service" href="../topia-service"/>
- <item name="Labs" href="http://labs.libre-entreprise.org/"/>
+ <!--item name="Labs" href="http://labs.libre-entreprise.org/"/>
<item name="Nuiton" href="http://www.nuiton.org"/>
- <item name="Code Lutin" href="http://www.codelutin.com/"/>
+ <item name="Code Lutin" href="http://www.codelutin.com/"/-->
</links>
<menu ref="modules"/>
Modified: topia/trunk/topia-persistence/pom.xml
===================================================================
--- topia/trunk/topia-persistence/pom.xml 2009-05-17 02:50:35 UTC (rev 1464)
+++ topia/trunk/topia-persistence/pom.xml 2009-05-17 16:00:52 UTC (rev 1465)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>topia</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0-alpha-1-SNAPSHOT</version>
</parent>
<groupId>org.nuiton.topia</groupId>
@@ -78,7 +78,7 @@
<packaging>jar</packaging>
<properties>
- <helper.scmModuleLevel>1</helper.scmModuleLevel>
+
</properties>
<build>
Modified: topia/trunk/topia-persistence/src/site/site.xml
===================================================================
--- topia/trunk/topia-persistence/src/site/site.xml 2009-05-17 02:50:35 UTC (rev 1464)
+++ topia/trunk/topia-persistence/src/site/site.xml 2009-05-17 16:00:52 UTC (rev 1465)
@@ -4,9 +4,9 @@
<publishDate format="dd/MM/yyyy"/>
<skin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-lutin-skin</artifactId>
- <version>0.2.3</version>
+ <groupId>org.nuiton</groupId>
+ <artifactId>maven-nuiton-skin</artifactId>
+ <version>1.0.0-alpha-1</version>
</skin>
<bannerLeft>
@@ -19,20 +19,20 @@
<href>${project.organization.url}</href>
</bannerRight>
- <poweredBy>
+ <!--poweredBy>
<logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/>
<logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/>
<logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText"
img="images/restructuredtext-logo.png"/>
- </poweredBy>
+ </poweredBy-->
<body>
- <links>
+ <!--links>
<item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/>
<item name="Labs" href="http://labs.libre-entreprise.org/"/>
<item name="Nuiton" href="http://www.nuiton.org"/>
<item name="Code Lutin" href="http://www.codelutin.com/"/>
- </links>
+ </links-->
<menu ref="parent"/>
Modified: topia/trunk/topia-soa/pom.xml
===================================================================
--- topia/trunk/topia-soa/pom.xml 2009-05-17 02:50:35 UTC (rev 1464)
+++ topia/trunk/topia-soa/pom.xml 2009-05-17 16:00:52 UTC (rev 1465)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>topia</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0-alpha-1-SNAPSHOT</version>
</parent>
<groupId>org.nuiton.topia</groupId>
@@ -92,7 +92,7 @@
<packaging>jar</packaging>
<properties>
- <helper.scmModuleLevel>1</helper.scmModuleLevel>
+
</properties>
<build>
Modified: topia/trunk/topia-soa/src/site/site.xml
===================================================================
--- topia/trunk/topia-soa/src/site/site.xml 2009-05-17 02:50:35 UTC (rev 1464)
+++ topia/trunk/topia-soa/src/site/site.xml 2009-05-17 16:00:52 UTC (rev 1465)
@@ -4,9 +4,9 @@
<publishDate format="dd/MM/yyyy"/>
<skin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-lutin-skin</artifactId>
- <version>0.2.3</version>
+ <groupId>org.nuiton</groupId>
+ <artifactId>maven-nuiton-skin</artifactId>
+ <version>1.0.0-alpha-1</version>
</skin>
<bannerLeft>
@@ -19,20 +19,20 @@
<href>${project.organization.url}</href>
</bannerRight>
- <poweredBy>
+ <!--poweredBy>
<logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/>
<logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/>
<logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText"
img="images/restructuredtext-logo.png"/>
- </poweredBy>
+ </poweredBy-->
<body>
- <links>
+ <!--links>
<item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/>
<item name="Labs" href="http://labs.libre-entreprise.org/"/>
<item name="Nuiton" href="http://www.nuiton.org"/>
<item name="Code Lutin" href="http://www.codelutin.com/"/>
- </links>
+ </links-->
<menu ref="parent"/>
Modified: topia/trunk/topia-ui/pom.xml
===================================================================
--- topia/trunk/topia-ui/pom.xml 2009-05-17 02:50:35 UTC (rev 1464)
+++ topia/trunk/topia-ui/pom.xml 2009-05-17 16:00:52 UTC (rev 1465)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>topia</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0-alpha-1-SNAPSHOT</version>
</parent>
<groupId>org.nuiton.topia</groupId>
@@ -66,7 +66,7 @@
<packaging>jar</packaging>
<properties>
- <helper.scmModuleLevel>1</helper.scmModuleLevel>
+
</properties>
<build>
Modified: topia/trunk/topia-ui/src/site/site.xml
===================================================================
--- topia/trunk/topia-ui/src/site/site.xml 2009-05-17 02:50:35 UTC (rev 1464)
+++ topia/trunk/topia-ui/src/site/site.xml 2009-05-17 16:00:52 UTC (rev 1465)
@@ -4,9 +4,9 @@
<publishDate format="dd/MM/yyyy"/>
<skin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-lutin-skin</artifactId>
- <version>0.2.3</version>
+ <groupId>org.nuiton</groupId>
+ <artifactId>maven-nuiton-skin</artifactId>
+ <version>1.0.0-alpha-1</version>
</skin>
<bannerLeft>
@@ -19,20 +19,20 @@
<href>${project.organization.url}</href>
</bannerRight>
- <poweredBy>
+ <!--poweredBy>
<logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/>
<logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/>
<logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText"
img="images/restructuredtext-logo.png"/>
- </poweredBy>
+ </poweredBy-->
<body>
- <links>
+ <!--links>
<item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/>
<item name="Labs" href="http://labs.libre-entreprise.org/"/>
<item name="Nuiton" href="http://www.nuiton.org"/>
<item name="Code Lutin" href="http://www.codelutin.com/"/>
- </links>
+ </links-->
<menu ref="parent"/>
1
0
Author: tchemit
Date: 2009-05-17 02:50:35 +0000 (Sun, 17 May 2009)
New Revision: 1464
Modified:
topia/trunk/pom.xml
Log:
l'url de depot ne peut pas etre calcule, car si on a pas mavenpom en local, ...
Modified: topia/trunk/pom.xml
===================================================================
--- topia/trunk/pom.xml 2009-05-17 02:49:49 UTC (rev 1463)
+++ topia/trunk/pom.xml 2009-05-17 02:50:35 UTC (rev 1464)
@@ -200,7 +200,7 @@
</goals>
</execution>
</executions>
- <configuration>
+ <configuration>
<includes>**/*.java</includes>
<filters>
org.nuiton.processor.filters.GeneratorTemplatesFilter,
@@ -223,7 +223,7 @@
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
+ <artifactId>maven-site-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.codelutin</groupId>
@@ -247,7 +247,7 @@
<repository>
<id>nuiton-repository</id>
<name>NuitonRepository</name>
- <url>${repository.home.url}</url>
+ <url>http://lutinbuilder.labs.libre-entreprise.org/maven2-nuiton</url>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
1
0
Author: tchemit
Date: 2009-05-17 02:49:49 +0000 (Sun, 17 May 2009)
New Revision: 1463
Modified:
topia-service/trunk/pom.xml
Log:
l'url de depot ne peut pas etre calcule, car si on a pas mavenpom en local, ...
Modified: topia-service/trunk/pom.xml
===================================================================
--- topia-service/trunk/pom.xml 2009-05-16 08:09:02 UTC (rev 1462)
+++ topia-service/trunk/pom.xml 2009-05-17 02:49:49 UTC (rev 1463)
@@ -191,7 +191,7 @@
<repository>
<id>nuiton-repository</id>
<name>NuitonRepository</name>
- <url>${repository.home.url}</url>
+ <url>http://lutinbuilder.labs.libre-entreprise.org/maven2-nuiton</url>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
1
0
16 May '09
Author: tchemit
Date: 2009-05-16 08:09:02 +0000 (Sat, 16 May 2009)
New Revision: 1462
Modified:
topia-service/trunk/src/site/rst/Migration.rst
Log:
fix refs
Modified: topia-service/trunk/src/site/rst/Migration.rst
===================================================================
--- topia-service/trunk/src/site/rst/Migration.rst 2009-05-16 08:08:22 UTC (rev 1461)
+++ topia-service/trunk/src/site/rst/Migration.rst 2009-05-16 08:09:02 UTC (rev 1462)
@@ -93,7 +93,7 @@
::
- topia.service.migration.callbackhandlers=org.codelutin.test.SwingCallbackHandler
+ topia.service.migration.callbackhandlers=org.nuiton.test.SwingCallbackHandler
Configuration du service
@@ -103,7 +103,7 @@
::
- topia.service.migration=org.codelutin.topia.security.TopiaSecurityServiceImpl
+ topia.service.migration=org.nuiton.topia.security.TopiaSecurityServiceImpl
Utilisation
1
0
Author: tchemit
Date: 2009-05-16 08:08:22 +0000 (Sat, 16 May 2009)
New Revision: 1461
Modified:
topia/trunk/pom.xml
Log:
fix temp site deploy url + little improvments
Modified: topia/trunk/pom.xml
===================================================================
--- topia/trunk/pom.xml 2009-05-16 07:57:36 UTC (rev 1460)
+++ topia/trunk/pom.xml 2009-05-16 08:08:22 UTC (rev 1461)
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
- <version>${nuitonutil.version}</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -171,15 +171,13 @@
<!-- libs version -->
<generator.version>1.0.0-SNAPSHOT</generator.version>
- <processor.version>1.0.0-SNAPSHOT</processor.version>
- <nuitonutil.version>1.1.0-SNAPSHOT</nuitonutil.version>
<xmlrpc.version>3.1</xmlrpc.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<topia.version>${project.version}</topia.version>
<!-- a supprimer des qu'on pourra deployer les sites sur nuiton -->
- <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/topia/htdocs</site.deploy.url>
+ <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/topia/htdocs/nuiton</site.deploy.url>
</properties>
@@ -193,7 +191,7 @@
<plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-process-plugin</artifactId>
- <version>${processor.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
1
0
r1460 - in topia-service/trunk/src/main: . assembly
by tchemit＠users.labs.libre-entreprise.org 16 May '09
by tchemit＠users.labs.libre-entreprise.org 16 May '09
16 May '09
Author: tchemit
Date: 2009-05-16 07:57:36 +0000 (Sat, 16 May 2009)
New Revision: 1460
Added:
topia-service/trunk/src/main/assembly/
topia-service/trunk/src/main/assembly/deps.xml
topia-service/trunk/src/main/assembly/full.xml
Log:
migrate to nuiton : add assembly
Added: topia-service/trunk/src/main/assembly/deps.xml
===================================================================
--- topia-service/trunk/src/main/assembly/deps.xml (rev 0)
+++ topia-service/trunk/src/main/assembly/deps.xml 2009-05-16 07:57:36 UTC (rev 1460)
@@ -0,0 +1,45 @@
+<assembly>
+ <id>deps</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <!-- This don't support SNAPSHOT -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ <exclude>${artifact.groupId}:${artifact.artifactId}</exclude>
+ </excludes>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*-sources.jar</exclude>
+ <exclude>*-javadoc.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>target/classes</directory>
+ <includes>
+ <include>THIRD-PARTY.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: topia-service/trunk/src/main/assembly/full.xml
===================================================================
--- topia-service/trunk/src/main/assembly/full.xml (rev 0)
+++ topia-service/trunk/src/main/assembly/full.xml 2009-05-16 07:57:36 UTC (rev 1460)
@@ -0,0 +1,47 @@
+<assembly>
+ <id>full</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <!-- This don't support SNAPSHOT -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>${artifact.groupId}:${artifact.artifactId}</exclude>
+ </excludes>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*-sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>target/classes</directory>
+ <includes>
+ <include>THIRD-PARTY.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ <!--useDefaultExcludes>true</useDefaultExcludes-->
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
1
0
16 May '09
Author: tchemit
Date: 2009-05-16 07:56:47 +0000 (Sat, 16 May 2009)
New Revision: 1459
Added:
topia-service/trunk/src/main/java/org/nuiton/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/history/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/history/entities/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/user/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/entities/
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/entities/PersonImpl.hbm.xml
topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/entities/PetImpl.hbm.xml
topia-service/trunk/src/test/java/org/nuiton/
Removed:
topia-service/trunk/src/main/java/org/codelutin/
topia-service/trunk/src/test/java/org/codelutin/
Modified:
topia-service/trunk/pom.xml
topia-service/trunk/src/main/java/org/nuiton/topia/history/NoHistory.java
topia-service/trunk/src/main/java/org/nuiton/topia/history/TopiaHistoryListener.java
topia-service/trunk/src/main/java/org/nuiton/topia/history/TopiaHistoryService.java
topia-service/trunk/src/main/java/org/nuiton/topia/history/TopiaHistoryServiceImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/history/entities/HistoryImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/index/IndexEntry.java
topia-service/trunk/src/main/java/org/nuiton/topia/index/LuceneIndexer.java
topia-service/trunk/src/main/java/org/nuiton/topia/index/NotIndexable.java
topia-service/trunk/src/main/java/org/nuiton/topia/index/TopiaIndexImplementor.java
topia-service/trunk/src/main/java/org/nuiton/topia/index/TopiaIndexService.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/DatabaseManager.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/MigrationService.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/MigrationServiceImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/TopiaMigrationServiceImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/callback/MigrationCallbackHandler.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/ExceptionAttributeUndefined.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/MapAdapter.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/MapAdapterAdmin.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/MapAdapterImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/ProxyClass.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/ProxyClassMapped.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/SimpleProxyClass.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/SimpleProxyClassMapped.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/Version.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/BaseException.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/ConfigurationAdapter.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/ConfigurationHelper.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/DependenciesHelper.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/NullMigrationClass.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/ObjectNotFound.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/Transformer.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/AbstractMigration.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/FinderMigration.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/MapHelper.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/Migration.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/MigrationClass.java
topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/MigrationNull.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/TopiaSecurityService.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/user/TopiaGroupImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaCallbackHandler.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaConfiguration.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaPermission.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaPolicy.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaPrincipal.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/NoSecurityLoad.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/PropertyReadListener.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/PropertyVetoable.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/PropertyWriteListener.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/util/TopiaSecurityCaching.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java
topia-service/trunk/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/TaasService.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/TaasUtil.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/event/TaasAccessEntity.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoable.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoableRequestPermission.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasCallbackHandler.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasConfiguration.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasPrincipalWrapper.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinder.java
topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinderImpl.java
topia-service/trunk/src/main/xmi/TopiaService.zargo
topia-service/trunk/src/site/site.xml
topia-service/trunk/src/test/java/org/nuiton/topia/TestUtils.java
topia-service/trunk/src/test/java/org/nuiton/topia/history/HistoryTest.java
topia-service/trunk/src/test/java/org/nuiton/topia/index/IndexTest.java
topia-service/trunk/src/test/java/org/nuiton/topia/migration/common/VersionTest.java
topia-service/trunk/src/test/java/org/nuiton/topia/migration/kernel/ConfigurationAdapterTest.java
topia-service/trunk/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java
topia-service/trunk/src/test/resources/log4j.properties
Log:
migrate to nuiton : beware security is now in version 1 since package has changed...
Modified: topia-service/trunk/pom.xml
===================================================================
--- topia-service/trunk/pom.xml 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/pom.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -7,9 +7,9 @@
<!-- *** POM Relationships *************************************** -->
<!-- ************************************************************* -->
<parent>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinproject</artifactId>
- <version>3.5.4</version>
+ <groupId>org.nuiton</groupId>
+ <artifactId>mavenpom</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>topia-service</artifactId>
@@ -19,16 +19,16 @@
<!--Compile-->
<dependency>
- <groupId>org.codelutin.topia</groupId>
+ <groupId>org.nuiton.topia</groupId>
<artifactId>topia-persistence</artifactId>
<version>${topia.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinutil</artifactId>
- <version>${lutinutil.version}</version>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -54,6 +54,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.6</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<!-- ************************************************************* -->
@@ -73,17 +80,13 @@
<packaging>jar</packaging>
<properties>
- <!-- id du projet du labs -->
- <labs.id>21</labs.id>
- <!-- nom du projet sur le labs -->
- <labs.project>topia</labs.project>
+ <!-- a supprimer des qu'on pourra deployer les sites sur nuiton -->
+ <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/topia/htdocs/nuiton</site.deploy.url>
- <!-- libs versions -->
- <topia.version>2.1.6</topia.version>
- <generator.version>0.64</generator.version>
- <lutinutil.version>1.0.6</lutinutil.version>
+ <topia.version>2.2.0-SNAPSHOT</topia.version>
+
</properties>
<build>
@@ -91,9 +94,9 @@
<plugins>
<plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-generator-plugin</artifactId>
- <version>${generator.version}</version>
+ <groupId>org.nuiton</groupId>
+ <artifactId>maven-eugene-plugin</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -103,11 +106,11 @@
<srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest>
<srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest>
<includes>**/*.objectmodel</includes>
- <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates>
+ <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates>
<destDirGen>${maven.gen.dir}/java</destDirGen>
- <defaultPackage>org.codelutin.topia</defaultPackage>
- <fullPackagePath>org.codelutin.topia</fullPackagePath>
- <extractedPackages>org.codelutin.topia.tass</extractedPackages>
+ <defaultPackage>org.nuiton.topia</defaultPackage>
+ <fullPackagePath>org.nuiton.topia</fullPackagePath>
+ <extractedPackages>org.nuiton.topia.tass</extractedPackages>
<copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir>
<copyVersionFiles>**/*.hbm.xml</copyVersionFiles>
<copyOverwrite>true</copyOverwrite>
@@ -122,7 +125,7 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codelutin.topia</groupId>
+ <groupId>org.nuiton.topia</groupId>
<artifactId>topia-persistence</artifactId>
<version>${topia.version}</version>
<scope>runtime</scope>
@@ -152,7 +155,20 @@
<pluginManagement>
<plugins>
+
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/deps.xml</descriptor>
+ <descriptor>src/main/assembly/full.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </plugin>
+
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<dependencies>
<dependency>
@@ -169,18 +185,13 @@
<!-- ************************************************************* -->
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
- <scm>
- <url>${maven.scm.url}</url>
- <connection>${maven.scm.connection}</connection>
- <developerConnection>${maven.scm.developerConnection}</developerConnection>
- </scm>
-
- <!--Code Lutin Repository-->
+
+ <!--Nuiton Repository : pourra etre supprimer lorsqu'on sera sur central -->
<repositories>
<repository>
- <id>codelutin-repository</id>
- <name>CodeLutinRepository</name>
- <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url>
+ <id>nuiton-repository</id>
+ <name>NuitonRepository</name>
+ <url>${repository.home.url}</url>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
@@ -204,22 +215,20 @@
<build>
<plugins>
- <!-- always add license and third-party files to classpath -->
+ <!-- launch in a release the assembly automaticly -->
<plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-license-switcher-plugin</artifactId>
- <version>0.8</version>
+ <artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>attach-licenses</id>
+ <id>attach-assembly</id>
+ <phase>verify</phase>
<goals>
- <goal>license</goal>
- <goal>third-party</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
-
+
</plugins>
</build>
Copied: topia-service/trunk/src/main/java/org/nuiton (from rev 1458, topia-service/trunk/src/main/java/org/codelutin)
Property changes on: topia-service/trunk/src/main/java/org/nuiton
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/history/NoHistory.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/history/NoHistory.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/history/NoHistory.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* by : $Author$
*/
-package org.codelutin.topia.history;
+package org.nuiton.topia.history;
/**
* Permet préciser qu'une entité ne doit pas apparaitre dans l'historique
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/history/TopiaHistoryListener.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryListener.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/history/TopiaHistoryListener.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,21 +27,21 @@
* by : $Author$
*/
-package org.codelutin.topia.history;
+package org.nuiton.topia.history;
import java.util.Date;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.TopiaServiceDAOHelper;
-import org.codelutin.topia.event.TopiaEntityEvent;
-import org.codelutin.topia.event.TopiaEntityListener;
-import org.codelutin.topia.history.entities.History;
-import org.codelutin.topia.history.entities.HistoryDAO;
-import org.codelutin.topia.persistence.TopiaEntity;
-import org.codelutin.topia.security.util.TopiaSecurityUtil;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.TopiaServiceDAOHelper;
+import org.nuiton.topia.event.TopiaEntityEvent;
+import org.nuiton.topia.event.TopiaEntityListener;
+import org.nuiton.topia.history.entities.History;
+import org.nuiton.topia.history.entities.HistoryDAO;
+import org.nuiton.topia.persistence.TopiaEntity;
+import org.nuiton.topia.security.util.TopiaSecurityUtil;
/**
@@ -71,7 +71,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntityListener#entityCreated(org.codelutin.topia.event.TopiaEntityEvent)
+ * @see org.nuiton.topia.event.TopiaEntityListener#entityCreated(org.nuiton.topia.event.TopiaEntityEvent)
*/
public void create(TopiaEntityEvent e) {
if (historyCreate) {
@@ -81,7 +81,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntityListener#entityDeleted(org.codelutin.topia.event.TopiaEntityEvent)
+ * @see org.nuiton.topia.event.TopiaEntityListener#entityDeleted(org.nuiton.topia.event.TopiaEntityEvent)
*/
public void delete(TopiaEntityEvent e) {
if (historyDelete) {
@@ -91,7 +91,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntityListener#entityUpdated(org.codelutin.topia.event.TopiaEntityEvent)
+ * @see org.nuiton.topia.event.TopiaEntityListener#entityUpdated(org.nuiton.topia.event.TopiaEntityEvent)
*/
public void update(TopiaEntityEvent e) {
if (historyUpdate) {
@@ -101,7 +101,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntityLoadListener#entityLoaded(org.codelutin.topia.event.TopiaEntityLoadEvent)
+ * @see org.nuiton.topia.event.TopiaEntityLoadListener#entityLoaded(org.nuiton.topia.event.TopiaEntityLoadEvent)
*/
public void load(TopiaEntityEvent e) {
if (historyLoad) {
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/history/TopiaHistoryService.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryService.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/history/TopiaHistoryService.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,13 +27,13 @@
* by : $Author$
*/
-package org.codelutin.topia.history;
+package org.nuiton.topia.history;
import java.io.Writer;
import java.util.Date;
import java.util.List;
-import org.codelutin.topia.framework.TopiaService;
+import org.nuiton.topia.framework.TopiaService;
/**
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/history/TopiaHistoryServiceImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryServiceImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/history/TopiaHistoryServiceImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* by : $Author$
*/
-package org.codelutin.topia.history;
+package org.nuiton.topia.history;
import java.io.BufferedWriter;
import java.io.File;
@@ -44,12 +44,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.event.TopiaTransactionEvent;
-import org.codelutin.topia.event.TopiaTransactionVetoable;
-import org.codelutin.topia.framework.TopiaContextImplementor;
-import org.codelutin.topia.history.entities.HistoryImpl;
-import org.codelutin.topia.security.util.TopiaSecurityUtil;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.event.TopiaTransactionEvent;
+import org.nuiton.topia.event.TopiaTransactionVetoable;
+import org.nuiton.topia.framework.TopiaContextImplementor;
+import org.nuiton.topia.history.entities.HistoryImpl;
+import org.nuiton.topia.security.util.TopiaSecurityUtil;
import org.hibernate.Criteria;
import org.hibernate.FlushMode;
import org.hibernate.ScrollableResults;
@@ -61,7 +61,7 @@
/**
* Pour active l'historisation des actions utilisateur il faut mettre dans le
* fichier de propriete la cle suivante:
- * <li> topia.history=org.codelutin.topia.history.TopiaHistoryServiceImpl
+ * <li> topia.history=org.nuiton.topia.history.TopiaHistoryServiceImpl
* <p>
* puis par defaut toutes les actions sont historis�es, mais on peut choisir
* dans desactiver certaines:
@@ -133,28 +133,28 @@
protected ScheduledThreadPoolExecutor task = null;
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#getServiceName()
+ * @see org.nuiton.topia.framework.TopiaService#getServiceName()
*/
public String getServiceName() {
return TopiaHistoryService.SERVICE_NAME;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#getPersistenceClasses()
+ * @see org.nuiton.topia.framework.TopiaService#getPersistenceClasses()
*/
public Class [] getPersistenceClasses() {
return new Class[]{HistoryImpl.class};
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#init(org.codelutin.topia.framework.TopiaContextImplementor)
+ * @see org.nuiton.topia.framework.TopiaService#init(org.nuiton.topia.framework.TopiaContextImplementor)
*/
public boolean preInit(TopiaContextImplementor context) {
return true;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#init(org.codelutin.topia.framework.TopiaContextImplementor)
+ * @see org.nuiton.topia.framework.TopiaService#init(org.nuiton.topia.framework.TopiaContextImplementor)
*/
public boolean postInit(TopiaContextImplementor context) {
this.context = context;
@@ -206,7 +206,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.security.entities.authorization.History#clear(java.util.Date)
+ * @see org.nuiton.topia.security.entities.authorization.History#clear(java.util.Date)
*/
public void clear(Date toDate) throws Exception {
TopiaContext tx = context.beginTransaction();
@@ -216,7 +216,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.security.entities.authorization.History#keep(int)
+ * @see org.nuiton.topia.security.entities.authorization.History#keep(int)
*/
public void keep(int number) throws Exception {
// TODO Auto-generated method stub
@@ -224,7 +224,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.security.entities.authorization.History#store(java.util.Date, java.io.Writer)
+ * @see org.nuiton.topia.security.entities.authorization.History#store(java.util.Date, java.io.Writer)
*/
public void store(Date toDate, Writer out) throws Exception {
if (out != null) {
@@ -251,7 +251,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.TopiaHistoryService#findLastAction(java.lang.String, int, int)
+ * @see org.nuiton.topia.TopiaHistoryService#findLastAction(java.lang.String, int, int)
*/
public List<String> findLastAction(int limit, String user, String type, Integer ... actions) throws Exception {
TopiaContextImplementor tx = (TopiaContextImplementor)context.beginTransaction();
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/history/entities/HistoryImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/history/entities/HistoryImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/history/entities/HistoryImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,11 +27,11 @@
* by : $Author$
*/
-package org.codelutin.topia.history.entities;
+package org.nuiton.topia.history.entities;
-import org.codelutin.topia.history.NoHistory;
-import org.codelutin.topia.persistence.TopiaId;
-import org.codelutin.topia.security.util.TopiaSecurityUtil;
+import org.nuiton.topia.history.NoHistory;
+import org.nuiton.topia.persistence.TopiaId;
+import org.nuiton.topia.security.util.TopiaSecurityUtil;
/**
* @author poussin
@@ -42,16 +42,18 @@
private static final long serialVersionUID = 1L;
/* (non-Javadoc)
- * @see org.codelutin.topia.security.entities.authorization.History#setAction(java.lang.String)
+ * @see org.nuiton.topia.security.entities.authorization.History#setAction(java.lang.String)
*/
+ @Override
public void setAction(String action) {
int val = TopiaSecurityUtil.actionsString2Int(action);
setAction(val);
}
/* (non-Javadoc)
- * @see org.codelutin.topia.security.entities.authorization.History#setTypeAndTarget(java.lang.String)
+ * @see org.nuiton.topia.security.entities.authorization.History#setTypeAndTarget(java.lang.String)
*/
+ @Override
public void setTypeAndTarget(String target) {
String type = TopiaId.getClassNameAsString(target);
setType(type);
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/index/IndexEntry.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/index/IndexEntry.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/index/IndexEntry.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* by : $Author$
*/
-package org.codelutin.topia.index;
+package org.nuiton.topia.index;
/**
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/index/LuceneIndexer.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/index/LuceneIndexer.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/index/LuceneIndexer.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* by : $Author$
*/
-package org.codelutin.topia.index;
+package org.nuiton.topia.index;
import java.io.File;
import java.io.IOException;
@@ -53,24 +53,24 @@
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Searcher;
-import org.codelutin.topia.TopiaNotFoundException;
-import org.codelutin.topia.framework.TopiaContextImplementor;
-import org.codelutin.topia.persistence.TopiaId;
+import org.nuiton.topia.TopiaNotFoundException;
+import org.nuiton.topia.framework.TopiaContextImplementor;
+import org.nuiton.topia.persistence.TopiaId;
import org.hibernate.HibernateException;
import org.hibernate.metadata.ClassMetadata;
/**
* To use this indexer you must have two properties defined in config file:
- * <li>topia.index.engin=org.codelutin.topia.framework.LuceneIndexer
+ * <li>topia.index.engin=org.nuiton.topia.framework.LuceneIndexer
* <li>topia.index.lucene.directory=[/path/to/index/directory]
*
* Pour l'utilisation:
* <pre>
* SortedSet<IndexEntry> result = context.getIndexEngin().search("quelque chose")
- * SortedSet<IndexEntry> result = context.getIndexEngin().search("class:org.codelutin.chorem.entities.Person name:poussin")
+ * SortedSet<IndexEntry> result = context.getIndexEngin().search("class:org.nuiton.chorem.entities.Person name:poussin")
* // ou equivalent avec une map
* Map m = new HashMap();
- * m.put("class", "org.codelutin.chorem.entities.Person");
+ * m.put("class", "org.nuiton.chorem.entities.Person");
* m.put("name", "poussin");
* SortedSet<IndexEntry> result = context.getIndexEngin().search(m);
* </pre>
@@ -97,19 +97,22 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#getServiceName()
+ * @see org.nuiton.topia.framework.TopiaService#getServiceName()
*/
+ @Override
public String getServiceName() {
return TopiaIndexService.SERVICE_NAME;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#getPersistenceClasses()
+ * @see org.nuiton.topia.framework.TopiaService#getPersistenceClasses()
*/
- public Class [] getPersistenceClasses() {
+ @Override
+ public Class<?> [] getPersistenceClasses() {
return null;
}
+ @Override
public void recordForIndexation(Object id, Object [] fields) {
if (id == null) {
log.warn("Id must not be null, this object will be not indexed");
@@ -120,12 +123,14 @@
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#init(org.codelutin.topia.framework.TopiaContextImplementor)
+ * @see org.nuiton.topia.framework.TopiaService#init(org.nuiton.topia.framework.TopiaContextImplementor)
*/
+ @Override
public boolean preInit(TopiaContextImplementor context) {
return true;
}
+ @Override
public boolean postInit(TopiaContextImplementor context) {
this.context = context;
Properties prop = context.getConfig();
@@ -136,10 +141,12 @@
return true;
}
+ @Override
public void clearLastRecordedIndexation() {
indexationMap.clear();
}
+ @Override
public void doIndexation() {
try {
boolean create = false;
@@ -297,13 +304,14 @@
/**
* @param query Map that contains field name as key and query in value for
* this field
- * @return
+ * @return ?
*/
+ @Override
public SortedSet<IndexEntry> search(Map query) {
SortedSet<IndexEntry> result = null;
// construction de la requete lucene
String queryText = "";
- Iterator keys = query.keySet().iterator();
+ Iterator<?> keys = query.keySet().iterator();
while (keys.hasNext()) {
String key = (String) keys.next();
String value = (String) query.get(key);
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/index/NotIndexable.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/index/NotIndexable.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/index/NotIndexable.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* by : $Author$
*/
-package org.codelutin.topia.index;
+package org.nuiton.topia.index;
/**
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/index/TopiaIndexImplementor.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/index/TopiaIndexImplementor.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/index/TopiaIndexImplementor.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* by : $Author$
*/
-package org.codelutin.topia.index;
+package org.nuiton.topia.index;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/index/TopiaIndexService.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/index/TopiaIndexService.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/index/TopiaIndexService.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,12 +27,12 @@
* by : $Author$
*/
-package org.codelutin.topia.index;
+package org.nuiton.topia.index;
import java.util.Map;
import java.util.SortedSet;
-import org.codelutin.topia.framework.TopiaService;
+import org.nuiton.topia.framework.TopiaService;
/**
@@ -45,10 +45,10 @@
* Usage example:
* <pre>
* SortedSet<IndexEntry> result = context.getIndexEngin().search("quelque chose")
- * SortedSet<IndexEntry> result = context.getIndexEngin().search("class:org.codelutin.chorem.entities.Person name:poussin")
+ * SortedSet<IndexEntry> result = context.getIndexEngin().search("class:org.nuiton.chorem.entities.Person name:poussin")
* // or with map
* Map m = new HashMap();
- * m.put("class", "org.codelutin.chorem.entities.Person");
+ * m.put("class", "org.nuiton.chorem.entities.Person");
* m.put("name", "poussin");
* SortedSet<IndexEntry> result = context.getIndexEngin().search(m);
* </pre>
@@ -63,7 +63,7 @@
/**
* Permet de faire une recherche, par exemple:
*
- * class:org.codelutin.chorem.entities.Person name:poussin
+ * class:org.nuiton.chorem.entities.Person name:poussin
*
* @param queryText
* @return une list triée, le premier élement a le plus gros score
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/DatabaseManager.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/DatabaseManager.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/DatabaseManager.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration;
+package org.nuiton.topia.migration;
import java.sql.Connection;
import java.sql.SQLException;
@@ -25,8 +25,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.migration.common.Version;
-import org.codelutin.topia.migration.mappings.TMSVersion;
+import org.nuiton.topia.migration.common.Version;
+import org.nuiton.topia.migration.mappings.TMSVersion;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -108,9 +108,8 @@
}
/**
- * retourne une {@link Connection}, charge a l'appelant de la fermer par la
+ * @return une {@link Connection}, charge a l'appelant de la fermer par la
* suite
- * @return
*/
public Connection getConnection() {
Connection result = sessionFactory.openStatelessSession().connection();
@@ -121,6 +120,7 @@
/**
* Retourne la version de la base
* @return la version present en base, ou <tt>null</tt> si la version ne peut pas etre determinee
+ * @throws MigrationServiceException si un pb
*/
public Version getDataBaseVersion() throws MigrationServiceException {
Version version = null;
@@ -183,9 +183,9 @@
// DONE : voir si les relation *<->* sont listees par l'iterateur
// -> ok, normalement c bon, c gere
- Iterator<Table> i = oldConfiguration.getTableMappings();
+ Iterator<?> i = oldConfiguration.getTableMappings();
while(i.hasNext()) {
- Table table = i.next();
+ Table table = (Table) i.next();
String tableName = table.getName();
String suffix = getTableSuffixForVersion(vdbVersion);
@@ -225,7 +225,8 @@
* Renome les table dans la configuration hibernate
*
* @param oldConfiguration
- * @param vdbVersion
+ * @param vdbVersion
+ * @return la nouvelle configuration
*/
public Configuration setRenamedTableSchema(Configuration oldConfiguration, Version vdbVersion) {
@@ -237,16 +238,16 @@
// bug: sans cette ligne, les tables many-to-many ne sont pas list�es
oldConfiguration.buildMappings();
- Iterator i = oldConfiguration.getTableMappings();
+ Iterator<?> i = oldConfiguration.getTableMappings();
while(i.hasNext()) {
Table table = (Table)i.next();
if(table.isPhysicalTable()) { // hibernate utilse ca
// rename constraints FK
- Iterator<ForeignKey> fKeys = table.getForeignKeyIterator();
+ Iterator<?> fKeys = table.getForeignKeyIterator();
while(fKeys.hasNext()) {
- ForeignKey fKey = fKeys.next();
+ ForeignKey fKey = (ForeignKey) fKeys.next();
if(logger.isTraceEnabled()) {
logger.trace("Changing constraints name : " + fKey.getName() + " to " + fKey.getName() + vdbVersion.getValidName());
@@ -333,8 +334,9 @@
// supprime les versions existants
// au pire, on pourrait remplacer la premiere
// execute query
- List<TMSVersion> lVersion = (List<TMSVersion>)session.createCriteria(TMSVersion.class).list();
- for(TMSVersion v : lVersion) {
+ List<?> lVersion = session.createCriteria(TMSVersion.class).list();
+ for(Object o : lVersion) {
+ TMSVersion v = (TMSVersion) o;
logger.debug("Deleting version " + v.getVersion());
session.delete(v);
@@ -394,10 +396,10 @@
try {
- Iterator<Table> tables = configuration.getTableMappings();
+ Iterator<?> tables = configuration.getTableMappings();
if(tables.hasNext()) {
- Table testTable = tables.next();
+ Table testTable = (Table) tables.next();
Connection connection = connectionProvider.getConnection();
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/MigrationService.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/MigrationService.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/MigrationService.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,9 +15,9 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration;
+package org.nuiton.topia.migration;
-import org.codelutin.topia.migration.callback.MigrationCallbackHandler;
+import org.nuiton.topia.migration.callback.MigrationCallbackHandler;
import org.hibernate.cfg.Configuration;
/**
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/MigrationServiceException.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration;
+package org.nuiton.topia.migration;
/**
* TopiaMigrationServiceException.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/MigrationServiceImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/MigrationServiceImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/MigrationServiceImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration;
+package org.nuiton.topia.migration;
import java.io.File;
import java.net.URL;
@@ -32,13 +32,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.migration.callback.MigrationCallbackHandler;
-import org.codelutin.topia.migration.callback.MigrationCallbackHandler.MigrationChoice;
-import org.codelutin.topia.migration.common.Version;
-import org.codelutin.topia.migration.kernel.ConfigurationAdapter;
-import org.codelutin.topia.migration.kernel.ConfigurationHelper;
-import org.codelutin.topia.migration.kernel.Transformer;
-import org.codelutin.util.Resource;
+import org.nuiton.topia.migration.callback.MigrationCallbackHandler;
+import org.nuiton.topia.migration.callback.MigrationCallbackHandler.MigrationChoice;
+import org.nuiton.topia.migration.common.Version;
+import org.nuiton.topia.migration.kernel.ConfigurationAdapter;
+import org.nuiton.topia.migration.kernel.ConfigurationHelper;
+import org.nuiton.topia.migration.kernel.Transformer;
+import org.nuiton.util.Resource;
import org.hibernate.cfg.Configuration;
/**
@@ -102,56 +102,56 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.TopiaMigrationService#getConfigurationFile()
+ * @see org.nuiton.topia.migration.TopiaMigrationService#getConfigurationFile()
*/
public String getConfigurationFile() {
return currentHibernateConfigurationFile;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.TopiaMigrationService#setConfigurationFile(java.lang.String)
+ * @see org.nuiton.topia.migration.TopiaMigrationService#setConfigurationFile(java.lang.String)
*/
public void setConfigurationFile(String hibernateConfigurationFile) {
this.currentHibernateConfigurationFile = hibernateConfigurationFile;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.TopiaMigrationService#getConfiguration()
+ * @see org.nuiton.topia.migration.TopiaMigrationService#getConfiguration()
*/
public Configuration getConfiguration() {
return currentApplicationConfiguration;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.TopiaMigrationService#setConfiguration(org.hibernate.cfg.Configuration)
+ * @see org.nuiton.topia.migration.TopiaMigrationService#setConfiguration(org.hibernate.cfg.Configuration)
*/
public void setConfiguration(Configuration configuration) {
this.currentApplicationConfiguration = configuration;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.TopiaMigrationService#getMappingsDirectory()
+ * @see org.nuiton.topia.migration.TopiaMigrationService#getMappingsDirectory()
*/
public String getMappingsDirectory() {
return mappingsDirectory;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.TopiaMigrationService#setMappingsDirectory(java.lang.String)
+ * @see org.nuiton.topia.migration.TopiaMigrationService#setMappingsDirectory(java.lang.String)
*/
public void setMappingsDirectory(String mappingsDirectory) {
this.mappingsDirectory = mappingsDirectory;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.TopiaMigrationService#setApplicationVersion(java.lang.String)
+ * @see org.nuiton.topia.migration.TopiaMigrationService#setApplicationVersion(java.lang.String)
*/
public void setApplicationVersion(String version) {
currentApplicationVersion = new Version(version);
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.TopiaMigrationService#addMigrationCallbackHandler(org.codelutin.topia.migration.callback.MigrationCallbackHandler)
+ * @see org.nuiton.topia.migration.TopiaMigrationService#addMigrationCallbackHandler(org.nuiton.topia.migration.callback.MigrationCallbackHandler)
*/
public void addMigrationCallbackHandler(
MigrationCallbackHandler callbackHandler) {
@@ -206,7 +206,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.TopiaMigrationService#migrateSchema()
+ * @see org.nuiton.topia.migration.TopiaMigrationService#migrateSchema()
*/
public boolean migrateSchema() throws MigrationServiceException {
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/TopiaMigrationService.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,11 +15,11 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration;
+package org.nuiton.topia.migration;
-import org.codelutin.topia.event.TopiaContextListener;
-import org.codelutin.topia.event.TopiaTransactionVetoable;
-import org.codelutin.topia.framework.TopiaService;
+import org.nuiton.topia.event.TopiaContextListener;
+import org.nuiton.topia.event.TopiaTransactionVetoable;
+import org.nuiton.topia.framework.TopiaService;
/**
* TopiaMigrationService.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/TopiaMigrationServiceImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/TopiaMigrationServiceImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,19 +15,19 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration;
+package org.nuiton.topia.migration;
import java.io.File;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaRuntimeException;
-import org.codelutin.topia.event.TopiaContextEvent;
-import org.codelutin.topia.event.TopiaTransactionEvent;
-import org.codelutin.topia.framework.TopiaContextImplementor;
-import org.codelutin.topia.migration.callback.MigrationCallbackHandler;
-import org.codelutin.topia.migration.common.Version;
+import org.nuiton.topia.TopiaRuntimeException;
+import org.nuiton.topia.event.TopiaContextEvent;
+import org.nuiton.topia.event.TopiaTransactionEvent;
+import org.nuiton.topia.framework.TopiaContextImplementor;
+import org.nuiton.topia.migration.callback.MigrationCallbackHandler;
+import org.nuiton.topia.migration.common.Version;
import org.hibernate.cfg.Configuration;
/**
@@ -75,21 +75,21 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#getPersistenceClasses()
+ * @see org.nuiton.topia.framework.TopiaService#getPersistenceClasses()
*/
public Class [] getPersistenceClasses() {
return null;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#getServiceName()
+ * @see org.nuiton.topia.framework.TopiaService#getServiceName()
*/
public String getServiceName() {
return TopiaMigrationService.SERVICE_NAME;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#preInit(org.codelutin.topia.framework.TopiaContextImplementor)
+ * @see org.nuiton.topia.framework.TopiaService#preInit(org.nuiton.topia.framework.TopiaContextImplementor)
*/
public boolean preInit(TopiaContextImplementor context) {
Properties config = context.getConfig();
@@ -231,14 +231,14 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#postInit(org.codelutin.topia.framework.TopiaContextImplementor)
+ * @see org.nuiton.topia.framework.TopiaService#postInit(org.nuiton.topia.framework.TopiaContextImplementor)
*/
public boolean postInit(TopiaContextImplementor context) {
return true;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaContextListener#postCreateSchema(org.codelutin.topia.event.TopiaContextEvent)
+ * @see org.nuiton.topia.event.TopiaContextListener#postCreateSchema(org.nuiton.topia.event.TopiaContextEvent)
*/
public void postCreateSchema(TopiaContextEvent event) {
@@ -253,35 +253,35 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaContextListener#postUpdateSchema(org.codelutin.topia.event.TopiaContextEvent)
+ * @see org.nuiton.topia.event.TopiaContextListener#postUpdateSchema(org.nuiton.topia.event.TopiaContextEvent)
*/
public void postUpdateSchema(TopiaContextEvent event) {
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaContextListener#preCreateSchema(org.codelutin.topia.event.TopiaContextEvent)
+ * @see org.nuiton.topia.event.TopiaContextListener#preCreateSchema(org.nuiton.topia.event.TopiaContextEvent)
*/
public void preCreateSchema(TopiaContextEvent event) {
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaContextListener#preUpdateSchema(org.codelutin.topia.event.TopiaContextEvent)
+ * @see org.nuiton.topia.event.TopiaContextListener#preUpdateSchema(org.nuiton.topia.event.TopiaContextEvent)
*/
public void preUpdateSchema(TopiaContextEvent event) {
}
/*
- * @see org.codelutin.topia.event.TopiaContextListener#preRestoreSchema(org.codelutin.topia.event.TopiaContextEvent)
+ * @see org.nuiton.topia.event.TopiaContextListener#preRestoreSchema(org.nuiton.topia.event.TopiaContextEvent)
*/
public void preRestoreSchema(TopiaContextEvent event) {
}
/*
- * @see org.codelutin.topia.event.TopiaContextListener#postRestoreSchema(org.codelutin.topia.event.TopiaContextEvent)
+ * @see org.nuiton.topia.event.TopiaContextListener#postRestoreSchema(org.nuiton.topia.event.TopiaContextEvent)
*/
public void postRestoreSchema(TopiaContextEvent event) {
@@ -298,7 +298,7 @@
}
/*
- * @see org.codelutin.topia.event.TopiaTransactionVetoable#beginTransaction(org.codelutin.topia.event.TopiaTransactionEvent)
+ * @see org.nuiton.topia.event.TopiaTransactionVetoable#beginTransaction(org.nuiton.topia.event.TopiaTransactionEvent)
*/
public void beginTransaction(TopiaTransactionEvent event) {
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/callback/MigrationCallbackHandler.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/callback/MigrationCallbackHandler.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/callback/MigrationCallbackHandler.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,9 +15,9 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.callback;
+package org.nuiton.topia.migration.callback;
-import org.codelutin.topia.migration.DatabaseManager;
+import org.nuiton.topia.migration.DatabaseManager;
/**
* MigrationCallBackHandler
@@ -45,7 +45,7 @@
/**
* Ask for migration
*
- * @param un objet permettant d'ouvrir des connexions sur la base
+ * @param dbManager objet permettant d'ouvrir des connexions sur la base
* @param databaseVersion database version
* @param applicationVersion application version
* @return migration aggrement
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/ExceptionAttributeUndefined.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/common/ExceptionAttributeUndefined.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/ExceptionAttributeUndefined.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
/**
* ExceptionAttributeUndefined.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/MapAdapter.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/common/MapAdapter.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/MapAdapter.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
import java.io.Serializable;
import java.util.Map;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/MapAdapterAdmin.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/common/MapAdapterAdmin.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/MapAdapterAdmin.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
import java.io.Serializable;
import java.util.Map;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/MapAdapterImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/common/MapAdapterImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/MapAdapterImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
import java.io.Serializable;
import java.util.HashMap;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/ProxyClass.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/common/ProxyClass.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/ProxyClass.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
/**
* ProxyClass.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/ProxyClassMapped.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/common/ProxyClassMapped.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/ProxyClassMapped.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,11 +15,11 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
import java.io.Serializable;
-import org.codelutin.topia.migration.transformation.Migration;
+import org.nuiton.topia.migration.transformation.Migration;
/**
* ProxyClassMapped.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/SimpleProxyClass.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/common/SimpleProxyClass.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/SimpleProxyClass.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
import java.util.StringTokenizer;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/SimpleProxyClassMapped.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/common/SimpleProxyClassMapped.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/SimpleProxyClassMapped.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -14,11 +14,11 @@
* 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>. ##%*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
import java.io.Serializable;
-import org.codelutin.topia.migration.transformation.Migration;
+import org.nuiton.topia.migration.transformation.Migration;
/**
* SimpleProxyClassMapped.java
@@ -64,14 +64,14 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.common.ProxyClassMapped#getIdAttribute()
+ * @see org.nuiton.topia.migration.common.ProxyClassMapped#getIdAttribute()
*/
public Serializable getIdAttribute() {
return nameIdAttribute;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.common.ProxyClassMapped#getProxyClass()
+ * @see org.nuiton.topia.migration.common.ProxyClassMapped#getProxyClass()
*/
public ProxyClass getProxyClass() {
return pc;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/Version.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/common/Version.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/common/Version.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
import java.util.StringTokenizer;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/BaseException.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/BaseException.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/BaseException.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.kernel;
+package org.nuiton.topia.migration.kernel;
/**
* BaseException.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/ConfigurationAdapter.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationAdapter.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/ConfigurationAdapter.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.kernel;
+package org.nuiton.topia.migration.kernel;
import java.io.Serializable;
import java.util.Collection;
@@ -28,13 +28,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.migration.common.MapAdapterAdmin;
-import org.codelutin.topia.migration.common.MapAdapterImpl;
-import org.codelutin.topia.migration.common.ProxyClass;
-import org.codelutin.topia.migration.common.ProxyClassMapped;
-import org.codelutin.topia.migration.common.SimpleProxyClass;
-import org.codelutin.topia.migration.common.SimpleProxyClassMapped;
-import org.codelutin.topia.migration.common.Version;
+import org.nuiton.topia.migration.common.MapAdapterAdmin;
+import org.nuiton.topia.migration.common.MapAdapterImpl;
+import org.nuiton.topia.migration.common.ProxyClass;
+import org.nuiton.topia.migration.common.ProxyClassMapped;
+import org.nuiton.topia.migration.common.SimpleProxyClass;
+import org.nuiton.topia.migration.common.SimpleProxyClassMapped;
+import org.nuiton.topia.migration.common.Version;
import org.hibernate.EntityMode;
import org.hibernate.LazyInitializationException;
import org.hibernate.Session;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/ConfigurationHelper.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationHelper.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/ConfigurationHelper.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.kernel;
+package org.nuiton.topia.migration.kernel;
import java.io.BufferedReader;
import java.io.File;
@@ -31,7 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.util.Resource;
+import org.nuiton.util.Resource;
import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.DocumentException;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/DependenciesHelper.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/DependenciesHelper.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/DependenciesHelper.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.kernel;
+package org.nuiton.topia.migration.kernel;
import java.util.HashSet;
import java.util.Hashtable;
@@ -27,8 +27,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.migration.common.ProxyClass;
-import org.codelutin.topia.migration.common.SimpleProxyClass;
+import org.nuiton.topia.migration.common.ProxyClass;
+import org.nuiton.topia.migration.common.SimpleProxyClass;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
import org.hibernate.engine.CascadeStyle;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/NullMigrationClass.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/NullMigrationClass.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/NullMigrationClass.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,11 +15,11 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.kernel;
+package org.nuiton.topia.migration.kernel;
-import org.codelutin.topia.migration.common.ProxyClass;
-import org.codelutin.topia.migration.common.Version;
-import org.codelutin.topia.migration.transformation.MigrationClass;
+import org.nuiton.topia.migration.common.ProxyClass;
+import org.nuiton.topia.migration.common.Version;
+import org.nuiton.topia.migration.transformation.MigrationClass;
/**
* NullMigrationClass.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/ObjectNotFound.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ObjectNotFound.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/ObjectNotFound.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.kernel;
+package org.nuiton.topia.migration.kernel;
/**
* ObjectNotFound.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/Transformer.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/Transformer.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/kernel/Transformer.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.kernel;
+package org.nuiton.topia.migration.kernel;
import java.io.Serializable;
import java.util.Collection;
@@ -27,18 +27,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.migration.common.MapAdapter;
-import org.codelutin.topia.migration.common.MapAdapterAdmin;
-import org.codelutin.topia.migration.common.ProxyClass;
-import org.codelutin.topia.migration.common.ProxyClassMapped;
-import org.codelutin.topia.migration.common.SimpleProxyClass;
-import org.codelutin.topia.migration.common.SimpleProxyClassMapped;
-import org.codelutin.topia.migration.common.Version;
-import org.codelutin.topia.migration.transformation.FinderMigration;
-import org.codelutin.topia.migration.transformation.MapHelper;
-import org.codelutin.topia.migration.transformation.Migration;
-import org.codelutin.topia.migration.transformation.MigrationClass;
-import org.codelutin.topia.migration.transformation.MigrationNull;
+import org.nuiton.topia.migration.common.MapAdapter;
+import org.nuiton.topia.migration.common.MapAdapterAdmin;
+import org.nuiton.topia.migration.common.ProxyClass;
+import org.nuiton.topia.migration.common.ProxyClassMapped;
+import org.nuiton.topia.migration.common.SimpleProxyClass;
+import org.nuiton.topia.migration.common.SimpleProxyClassMapped;
+import org.nuiton.topia.migration.common.Version;
+import org.nuiton.topia.migration.transformation.FinderMigration;
+import org.nuiton.topia.migration.transformation.MapHelper;
+import org.nuiton.topia.migration.transformation.Migration;
+import org.nuiton.topia.migration.transformation.MigrationClass;
+import org.nuiton.topia.migration.transformation.MigrationNull;
/**
* Transformer.java
@@ -218,56 +218,56 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.transformation.MapHelper#getNewMap(org.codelutin.topia.migration.common.ProxyClass, java.io.Serializable)
+ * @see org.nuiton.topia.migration.transformation.MapHelper#getNewMap(org.nuiton.topia.migration.common.ProxyClass, java.io.Serializable)
*/
public MapAdapter getNewMap(ProxyClass clazz, Serializable idVal) throws ObjectNotFound {
return getMap(this.nextConf, clazz, idVal);
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.transformation.MapHelper#getNewMap(java.lang.String, java.io.Serializable)
+ * @see org.nuiton.topia.migration.transformation.MapHelper#getNewMap(java.lang.String, java.io.Serializable)
*/
public MapAdapter getNewMap(String clazz, Serializable idVal) throws ObjectNotFound {
return getMap(this.nextConf, new SimpleProxyClass(clazz), idVal);
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.transformation.MapHelper#getOldMap(org.codelutin.topia.migration.common.ProxyClass, java.io.Serializable)
+ * @see org.nuiton.topia.migration.transformation.MapHelper#getOldMap(org.nuiton.topia.migration.common.ProxyClass, java.io.Serializable)
*/
public MapAdapter getOldMap(ProxyClass clazz, Serializable idVal) throws ObjectNotFound {
return getMap(this.baseConf, clazz, idVal);
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.transformation.MapHelper#getOldMap(java.lang.String, java.io.Serializable)
+ * @see org.nuiton.topia.migration.transformation.MapHelper#getOldMap(java.lang.String, java.io.Serializable)
*/
public MapAdapter getOldMap(String clazz, Serializable idVal) throws ObjectNotFound {
return getMap(this.baseConf, new SimpleProxyClass(clazz), idVal);
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.transformation.MapHelper#getNewMaps(java.lang.String)
+ * @see org.nuiton.topia.migration.transformation.MapHelper#getNewMaps(java.lang.String)
*/
public Collection<MapAdapter> getNewMaps(String clazz) {
return getMaps(this.nextConf, new SimpleProxyClass(clazz));
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.transformation.MapHelper#getNewMaps(org.codelutin.topia.migration.common.ProxyClass)
+ * @see org.nuiton.topia.migration.transformation.MapHelper#getNewMaps(org.nuiton.topia.migration.common.ProxyClass)
*/
public Collection<MapAdapter> getNewMaps(ProxyClass clazz) {
return getMaps(this.nextConf, clazz);
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.transformation.MapHelper#getOldMaps(java.lang.String)
+ * @see org.nuiton.topia.migration.transformation.MapHelper#getOldMaps(java.lang.String)
*/
public Collection<MapAdapter> getOldMaps(String clazz) {
return getMaps(this.baseConf, new SimpleProxyClass(clazz));
}
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.transformation.MapHelper#getOldMaps(org.codelutin.topia.migration.common.ProxyClass)
+ * @see org.nuiton.topia.migration.transformation.MapHelper#getOldMaps(org.nuiton.topia.migration.common.ProxyClass)
*/
public Collection<MapAdapter> getOldMaps(ProxyClass clazz) {
return getMaps(this.baseConf, clazz);
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/mappings/TMSVersion.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.mappings;
+package org.nuiton.topia.migration.mappings;
/**
* TMSVersion.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/AbstractMigration.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/transformation/AbstractMigration.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/AbstractMigration.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,12 +15,12 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.transformation;
+package org.nuiton.topia.migration.transformation;
import java.io.Serializable;
-import org.codelutin.topia.migration.common.MapAdapter;
-import org.codelutin.topia.migration.common.ProxyClass;
+import org.nuiton.topia.migration.common.MapAdapter;
+import org.nuiton.topia.migration.common.ProxyClass;
/**
* AbstractMigration.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/FinderMigration.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/transformation/FinderMigration.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/FinderMigration.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,12 +15,12 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.transformation;
+package org.nuiton.topia.migration.transformation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.migration.common.ProxyClass;
-import org.codelutin.topia.migration.common.Version;
+import org.nuiton.topia.migration.common.ProxyClass;
+import org.nuiton.topia.migration.common.Version;
/**
* FinderMigration.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/MapHelper.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/transformation/MapHelper.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/MapHelper.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,14 +15,14 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.transformation;
+package org.nuiton.topia.migration.transformation;
import java.io.Serializable;
import java.util.Collection;
-import org.codelutin.topia.migration.common.MapAdapter;
-import org.codelutin.topia.migration.common.ProxyClass;
-import org.codelutin.topia.migration.kernel.ObjectNotFound;
+import org.nuiton.topia.migration.common.MapAdapter;
+import org.nuiton.topia.migration.common.ProxyClass;
+import org.nuiton.topia.migration.kernel.ObjectNotFound;
/**
* MapHelper.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/Migration.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/transformation/Migration.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/Migration.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,12 +15,12 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.transformation;
+package org.nuiton.topia.migration.transformation;
import java.io.Serializable;
-import org.codelutin.topia.migration.common.MapAdapter;
-import org.codelutin.topia.migration.common.ProxyClass;
+import org.nuiton.topia.migration.common.MapAdapter;
+import org.nuiton.topia.migration.common.ProxyClass;
/**
* Migration.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/MigrationClass.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/transformation/MigrationClass.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/MigrationClass.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,11 +15,11 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.transformation;
+package org.nuiton.topia.migration.transformation;
-import org.codelutin.topia.migration.common.ProxyClass;
-import org.codelutin.topia.migration.common.SimpleProxyClass;
-import org.codelutin.topia.migration.common.Version;
+import org.nuiton.topia.migration.common.ProxyClass;
+import org.nuiton.topia.migration.common.SimpleProxyClass;
+import org.nuiton.topia.migration.common.Version;
/**
* MigrationClass.java
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/MigrationNull.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/migration/transformation/MigrationNull.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/migration/transformation/MigrationNull.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,9 +15,9 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.migration.transformation;
+package org.nuiton.topia.migration.transformation;
-import org.codelutin.topia.migration.common.MapAdapter;
+import org.nuiton.topia.migration.common.MapAdapter;
/**
* MigrationNull.java
@@ -34,7 +34,7 @@
/* (non-Javadoc)
- * @see org.codelutin.topia.migration.transformation.Migration#migrate(org.codelutin.topia.migration.common.MapAdapter, org.codelutin.topia.migration.transformation.MapHelper)
+ * @see org.nuiton.topia.migration.transformation.Migration#migrate(org.nuiton.topia.migration.common.MapAdapter, org.nuiton.topia.migration.transformation.MapHelper)
*/
public void migrate(MapAdapter map, MapHelper helper) {
map.copyAll();
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/TopiaSecurityService.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/TopiaSecurityService.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/TopiaSecurityService.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -16,9 +16,9 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
*/
-package org.codelutin.topia.security;
+package org.nuiton.topia.security;
-import org.codelutin.topia.framework.TopiaService;
+import org.nuiton.topia.framework.TopiaService;
public interface TopiaSecurityService extends TopiaService {
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/TopiaSecurityServiceImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,12 +15,12 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security;
+package org.nuiton.topia.security;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.CREATE;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.DELETE;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.TOPIA_SECURITY_PERSISTENCE_CLASSES;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.CREATE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.DELETE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.TOPIA_SECURITY_PERSISTENCE_CLASSES;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.UPDATE;
import java.security.AccessController;
import java.security.Permission;
@@ -38,35 +38,35 @@
import org.apache.commons.collections.map.ReferenceMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.TopiaNotFoundException;
-import org.codelutin.topia.TopiaServiceDAOHelper;
-import org.codelutin.topia.event.TopiaTransactionEvent;
-import org.codelutin.topia.event.TopiaTransactionVetoable;
-import org.codelutin.topia.framework.TopiaContextImplementor;
-import org.codelutin.topia.persistence.TopiaId;
-import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO;
-import org.codelutin.topia.security.entities.authorization.TopiaAuthorization;
-import org.codelutin.topia.security.entities.authorization.TopiaAuthorizationDAO;
-import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization;
-import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationDAO;
-import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl;
-import org.codelutin.topia.security.entities.authorization.TopiaExpressionLink;
-import org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkDAO;
-import org.codelutin.topia.security.entities.user.TopiaGroupDAO;
-import org.codelutin.topia.security.entities.user.TopiaUser;
-import org.codelutin.topia.security.entities.user.TopiaUserDAO;
-import org.codelutin.topia.security.jaas.TopiaConfiguration;
-import org.codelutin.topia.security.jaas.TopiaPermission;
-import org.codelutin.topia.security.jaas.TopiaPolicy;
-import org.codelutin.topia.security.listener.EntityVetoable;
-import org.codelutin.topia.security.listener.NoSecurityLoad;
-import org.codelutin.topia.security.listener.PropertyReadListener;
-import org.codelutin.topia.security.listener.PropertyVetoable;
-import org.codelutin.topia.security.listener.PropertyWriteListener;
-import org.codelutin.topia.security.util.TopiaSecurityCaching;
-import org.codelutin.topia.security.util.TopiaSecurityUtil;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.TopiaNotFoundException;
+import org.nuiton.topia.TopiaServiceDAOHelper;
+import org.nuiton.topia.event.TopiaTransactionEvent;
+import org.nuiton.topia.event.TopiaTransactionVetoable;
+import org.nuiton.topia.framework.TopiaContextImplementor;
+import org.nuiton.topia.persistence.TopiaId;
+import org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO;
+import org.nuiton.topia.security.entities.authorization.TopiaAuthorization;
+import org.nuiton.topia.security.entities.authorization.TopiaAuthorizationDAO;
+import org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorization;
+import org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationDAO;
+import org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl;
+import org.nuiton.topia.security.entities.authorization.TopiaExpressionLink;
+import org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkDAO;
+import org.nuiton.topia.security.entities.user.TopiaGroupDAO;
+import org.nuiton.topia.security.entities.user.TopiaUser;
+import org.nuiton.topia.security.entities.user.TopiaUserDAO;
+import org.nuiton.topia.security.jaas.TopiaConfiguration;
+import org.nuiton.topia.security.jaas.TopiaPermission;
+import org.nuiton.topia.security.jaas.TopiaPolicy;
+import org.nuiton.topia.security.listener.EntityVetoable;
+import org.nuiton.topia.security.listener.NoSecurityLoad;
+import org.nuiton.topia.security.listener.PropertyReadListener;
+import org.nuiton.topia.security.listener.PropertyVetoable;
+import org.nuiton.topia.security.listener.PropertyWriteListener;
+import org.nuiton.topia.security.util.TopiaSecurityCaching;
+import org.nuiton.topia.security.util.TopiaSecurityUtil;
/**
* Implantation du manager pour la s�curit�. C'est le point d'acc�s � l'ensemble
@@ -107,7 +107,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#getServiceName()
+ * @see org.nuiton.topia.framework.TopiaService#getServiceName()
*/
public String getServiceName() {
return TopiaSecurityService.SERVICE_NAME;
@@ -115,7 +115,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.security.TopiaSecurityManager#getPersistenceClasses()
+ * @see org.nuiton.topia.security.TopiaSecurityManager#getPersistenceClasses()
*/
public Class [] getPersistenceClasses() {
return TOPIA_SECURITY_PERSISTENCE_CLASSES;
@@ -123,7 +123,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.security.TopiaSecurityManager#init()
+ * @see org.nuiton.topia.security.TopiaSecurityManager#init()
*/
public boolean preInit(TopiaContextImplementor context) {
return true;
@@ -131,7 +131,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.security.TopiaSecurityManager#init()
+ * @see org.nuiton.topia.security.TopiaSecurityManager#init()
*/
public boolean postInit(TopiaContextImplementor context) {
this.rootContext = context;
@@ -159,7 +159,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.security.TopiaSecurityManager#getSecurityContext()
+ * @see org.nuiton.topia.security.TopiaSecurityManager#getSecurityContext()
*/
public TopiaContext getSecurityContext() throws TopiaException {
if(securityContext == null) {
@@ -407,7 +407,7 @@
return actions;
}
/* (non-Javadoc)
- * @see org.codelutin.topia.security.TopiaSecurityService#checkPermission(java.lang.Class, int)
+ * @see org.nuiton.topia.security.TopiaSecurityService#checkPermission(java.lang.Class, int)
*/
public void checkPermission(Class entityClass, int actions) throws SecurityException {
if (log.isTraceEnabled()) {
@@ -421,7 +421,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.security.TopiaSecurityService#checkPermission(java.lang.String, int)
+ * @see org.nuiton.topia.security.TopiaSecurityService#checkPermission(java.lang.String, int)
*/
public void checkPermission(String topiaId, int actions) throws SecurityException {
int realActions = getRealActions(topiaId, actions);
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,16 +15,16 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.entities.authorization;
+package org.nuiton.topia.security.entities.authorization;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.actionsString2Int;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.actionsString2Int;
import java.util.HashSet;
import java.util.List;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.persistence.TopiaId;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaId;
/**
* Classe permettant les autorisations de type association. C'est � dire l'autorisation
@@ -49,7 +49,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.security.entities.authorization.TopiaAuthorization#getId()
+ * @see org.nuiton.topia.security.entities.authorization.TopiaAuthorization#getId()
*/
public String getExpression() {
return idBeginAssociation;
@@ -57,7 +57,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl#impliesId(java.lang.String, java.lang.String)
+ * @see org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl#impliesId(java.lang.String, java.lang.String)
*/
public boolean impliesExpression(String thisExpression, String thatExpression) {
String select = "count(test)";
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,12 +15,12 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.entities.authorization;
+package org.nuiton.topia.security.entities.authorization;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.CREATE;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.DELETE;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.LOAD;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.CREATE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.DELETE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.LOAD;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.UPDATE;
import java.util.Set;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,9 +15,9 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.entities.authorization;
+package org.nuiton.topia.security.entities.authorization;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.actionsString2Int;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.actionsString2Int;
import java.security.Principal;
import java.util.HashSet;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.entities.authorization;
+package org.nuiton.topia.security.entities.authorization;
/**
* Permet de spécifier entre deux expressions qu'ils ont le même comportement au niveau
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/user/TopiaGroupImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/entities/user/TopiaGroupImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/user/TopiaGroupImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,12 +15,12 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.entities.user;
+package org.nuiton.topia.security.entities.user;
import java.util.ArrayList;
import java.util.List;
-import org.codelutin.topia.security.listener.NoSecurityLoad;
+import org.nuiton.topia.security.listener.NoSecurityLoad;
/**
* Classe permettant la gestion de groupes d'utilisateurs.
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/entities/user/TopiaUserImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,15 +15,15 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.entities.user;
+package org.nuiton.topia.security.entities.user;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.hash;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.hash;
import java.util.ArrayList;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.security.listener.NoSecurityLoad;
+import org.nuiton.topia.security.listener.NoSecurityLoad;
/**
* Classe permettant la gestion des utilisateurs.
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaCallbackHandler.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/jaas/TopiaCallbackHandler.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaCallbackHandler.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.security.jaas;
+package org.nuiton.topia.security.jaas;
import java.io.IOException;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaConfiguration.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/jaas/TopiaConfiguration.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaConfiguration.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,10 +27,10 @@
* par : $Author$
*/
-package org.codelutin.topia.security.jaas;
+package org.nuiton.topia.security.jaas;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.SECURITY_MANAGER_KEY;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.TOPIA_LOGIN_MODULE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.SECURITY_MANAGER_KEY;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.TOPIA_LOGIN_MODULE;
import java.util.HashMap;
import java.util.Map;
@@ -38,7 +38,7 @@
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
-import org.codelutin.topia.security.TopiaSecurityService;
+import org.nuiton.topia.security.TopiaSecurityService;
/**
* Classe permettant de passer des paramètres entre le LoginModule et le
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/jaas/TopiaLoginModule.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,9 +27,9 @@
* par : $Author$
*/
-package org.codelutin.topia.security.jaas;
+package org.nuiton.topia.security.jaas;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.SECURITY_MANAGER_KEY;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.SECURITY_MANAGER_KEY;
import java.security.Principal;
import java.util.HashSet;
@@ -47,11 +47,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.security.TopiaSecurityServiceImpl;
-import org.codelutin.topia.security.entities.user.TopiaGroup;
-import org.codelutin.topia.security.entities.user.TopiaUser;
-import org.codelutin.topia.security.entities.user.TopiaUserDAO;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.security.TopiaSecurityServiceImpl;
+import org.nuiton.topia.security.entities.user.TopiaGroup;
+import org.nuiton.topia.security.entities.user.TopiaUser;
+import org.nuiton.topia.security.entities.user.TopiaUserDAO;
/**
* LoginModule permettant l'authentification d'un utilisateur au pr�s du syst�me.
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaPermission.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/jaas/TopiaPermission.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaPermission.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,13 +27,13 @@
* par : $Author$
*/
-package org.codelutin.topia.security.jaas;
+package org.nuiton.topia.security.jaas;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.actionsInt2String;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.actionsInt2String;
import java.security.Permission;
-import org.codelutin.topia.security.entities.authorization.TopiaAuthorization;
+import org.nuiton.topia.security.entities.authorization.TopiaAuthorization;
/**
* Classe permettant d'encapsuler les autorisations et de déléguer le travail aux
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaPolicy.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/jaas/TopiaPolicy.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaPolicy.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.security.jaas;
+package org.nuiton.topia.security.jaas;
import java.security.AccessController;
import java.security.CodeSource;
@@ -42,8 +42,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.security.TopiaSecurityServiceImpl;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.security.TopiaSecurityServiceImpl;
/**
* Implantation d'un policy avec une prise en compte des permissions à la volée.
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaPrincipal.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/jaas/TopiaPrincipal.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/jaas/TopiaPrincipal.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.security.jaas;
+package org.nuiton.topia.security.jaas;
import java.security.Principal;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/listener/EntityVetoable.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,20 +27,20 @@
* par : $Author$
*/
-package org.codelutin.topia.security.listener;
+package org.nuiton.topia.security.listener;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.CREATE;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.DELETE;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.LOAD;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.CREATE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.DELETE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.LOAD;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaNotFoundException;
-import org.codelutin.topia.event.TopiaEntityEvent;
-import org.codelutin.topia.event.TopiaEntityVetoable;
-import org.codelutin.topia.persistence.TopiaEntity;
-import org.codelutin.topia.persistence.TopiaId;
-import org.codelutin.topia.security.TopiaSecurityServiceImpl;
+import org.nuiton.topia.TopiaNotFoundException;
+import org.nuiton.topia.event.TopiaEntityEvent;
+import org.nuiton.topia.event.TopiaEntityVetoable;
+import org.nuiton.topia.persistence.TopiaEntity;
+import org.nuiton.topia.persistence.TopiaId;
+import org.nuiton.topia.security.TopiaSecurityServiceImpl;
/**
* Listenner permettant de vérifier les autorisations pour la création ou la
@@ -58,7 +58,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityListener#createEntity(org.codelutin.topia.event.TopiaVetoableEntityEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityListener#createEntity(org.nuiton.topia.event.TopiaVetoableEntityEvent)
*/
public void create(TopiaEntityEvent event) {
TopiaEntity entity = event.getEntity();
@@ -78,7 +78,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityListener#deleteEntity(org.codelutin.topia.event.TopiaVetoableEntityEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityListener#deleteEntity(org.nuiton.topia.event.TopiaVetoableEntityEvent)
*/
public void delete(TopiaEntityEvent event) {
String topiaId = event.getEntity().getTopiaId();
@@ -90,7 +90,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityLoadListener#loadEntity(org.codelutin.topia.event.TopiaVetoableEntityLoadEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityLoadListener#loadEntity(org.nuiton.topia.event.TopiaVetoableEntityLoadEvent)
*/
public void load(TopiaEntityEvent event) {
boolean authorized = true;
@@ -118,7 +118,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityListener#updateEntity(org.codelutin.topia.event.TopiaVetoableEntityEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityListener#updateEntity(org.nuiton.topia.event.TopiaVetoableEntityEvent)
*/
public void update(TopiaEntityEvent event) {
}
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/NoSecurityLoad.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/listener/NoSecurityLoad.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/NoSecurityLoad.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.listener;
+package org.nuiton.topia.security.listener;
/**
* Interface permettant à préciser que l'entité n'est pas soumis aux autorisations
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/PropertyReadListener.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/listener/PropertyReadListener.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/PropertyReadListener.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,9 +15,9 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.listener;
+package org.nuiton.topia.security.listener;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.LOAD;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.LOAD;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyVetoException;
@@ -25,8 +25,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.persistence.TopiaEntityAbstract;
-import org.codelutin.topia.security.TopiaSecurityServiceImpl;
+import org.nuiton.topia.persistence.TopiaEntityAbstract;
+import org.nuiton.topia.security.TopiaSecurityServiceImpl;
/**
* Listenner permettant de vérifier les autorisations pour la chargement d'une
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/PropertyVetoable.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/listener/PropertyVetoable.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/PropertyVetoable.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,11 +27,11 @@
* par : $Author$
*/
-package org.codelutin.topia.security.listener;
+package org.nuiton.topia.security.listener;
-import org.codelutin.topia.event.TopiaEntityEvent;
-import org.codelutin.topia.event.TopiaEntityListener;
-import org.codelutin.topia.persistence.TopiaEntity;
+import org.nuiton.topia.event.TopiaEntityEvent;
+import org.nuiton.topia.event.TopiaEntityListener;
+import org.nuiton.topia.persistence.TopiaEntity;
/**
* Ajout en cas de chargement ou de creation d'entités des listeners pour la
@@ -65,7 +65,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntityLoadListener#entityLoaded(org.codelutin.topia.event.TopiaEntityLoadEvent)
+ * @see org.nuiton.topia.event.TopiaEntityLoadListener#entityLoaded(org.nuiton.topia.event.TopiaEntityLoadEvent)
*/
public void load(TopiaEntityEvent event) {
putVetoables(event);
@@ -73,21 +73,21 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntityListener#entityCreated(org.codelutin.topia.event.TopiaEntityEvent)
+ * @see org.nuiton.topia.event.TopiaEntityListener#entityCreated(org.nuiton.topia.event.TopiaEntityEvent)
*/
public void create(TopiaEntityEvent event) {
}
/*
* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntityListener#entityDeleted(org.codelutin.topia.event.TopiaEntityEvent)
+ * @see org.nuiton.topia.event.TopiaEntityListener#entityDeleted(org.nuiton.topia.event.TopiaEntityEvent)
*/
public void delete(TopiaEntityEvent event) {
}
/*
* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntityListener#entityUpdated(org.codelutin.topia.event.TopiaEntityEvent)
+ * @see org.nuiton.topia.event.TopiaEntityListener#entityUpdated(org.nuiton.topia.event.TopiaEntityEvent)
*/
public void update(TopiaEntityEvent event) {
}
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/PropertyWriteListener.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/listener/PropertyWriteListener.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/listener/PropertyWriteListener.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,9 +15,9 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.listener;
+package org.nuiton.topia.security.listener;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.UPDATE;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyVetoException;
@@ -25,8 +25,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.persistence.TopiaEntityAbstract;
-import org.codelutin.topia.security.TopiaSecurityServiceImpl;
+import org.nuiton.topia.persistence.TopiaEntityAbstract;
+import org.nuiton.topia.security.TopiaSecurityServiceImpl;
/**
* Listenner permettant de vérifier les autorisations pour le modification d'une
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/util/TopiaSecurityCaching.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/util/TopiaSecurityCaching.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/util/TopiaSecurityCaching.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.util;
+package org.nuiton.topia.security.util;
import static org.apache.commons.collections.map.AbstractReferenceMap.SOFT;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/util/TopiaSecurityFactoryFilter.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security.util;
+package org.nuiton.topia.security.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,9 +24,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.persistence.TopiaEntity;
-import org.codelutin.topia.security.TopiaSecurityService;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaEntity;
+import org.nuiton.topia.security.TopiaSecurityService;
/**
* La classe permet de filtrer n'importe quel objet (Collection, List, TopiaEntity, ...)
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,24 +27,24 @@
* par : $Author$
*/
-package org.codelutin.topia.security.util;
+package org.nuiton.topia.security.util;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaContextFactory;
-import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.framework.TopiaContextImpl;
-import org.codelutin.topia.persistence.TopiaId;
-import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl;
-import org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl;
-import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl;
-import org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkImpl;
-import org.codelutin.topia.security.entities.user.TopiaGroupImpl;
-import org.codelutin.topia.security.entities.user.TopiaUser;
-import org.codelutin.topia.security.entities.user.TopiaUserImpl;
-import org.codelutin.topia.security.jaas.TopiaLoginModule;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaContextFactory;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.framework.TopiaContextImpl;
+import org.nuiton.topia.persistence.TopiaId;
+import org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl;
+import org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl;
+import org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl;
+import org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl;
+import org.nuiton.topia.security.entities.user.TopiaGroupImpl;
+import org.nuiton.topia.security.entities.user.TopiaUser;
+import org.nuiton.topia.security.entities.user.TopiaUserImpl;
+import org.nuiton.topia.security.jaas.TopiaLoginModule;
import sun.misc.BASE64Encoder;
import javax.security.auth.Subject;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/TaasService.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/TaasService.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/TaasService.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.taas;
+package org.nuiton.topia.taas;
import java.lang.reflect.Constructor;
import java.security.AccessController;
@@ -42,41 +42,39 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaContextFactory;
-import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.TopiaNotFoundException;
-import org.codelutin.topia.event.TopiaTransactionEvent;
-import org.codelutin.topia.event.TopiaTransactionVetoable;
-import org.codelutin.topia.framework.TopiaContextImpl;
-import org.codelutin.topia.framework.TopiaContextImplementor;
-import org.codelutin.topia.framework.TopiaService;
-import org.codelutin.topia.framework.TopiaUtil;
-import org.codelutin.topia.persistence.TopiaDAO;
-import org.codelutin.topia.persistence.TopiaEntity;
-import org.codelutin.topia.persistence.TopiaId;
-import org.codelutin.topia.taas.entities.TaasAuthorizationImpl;
-import org.codelutin.topia.taas.entities.TaasPrincipalImpl;
-import org.codelutin.topia.taas.entities.TaasUserImpl;
-import org.codelutin.topia.taas.event.TaasAccessEntity;
-import org.codelutin.topia.taas.event.TaasEntityVetoable;
-import org.codelutin.topia.taas.jaas.TaasConfiguration;
-import org.codelutin.topia.taas.jaas.TaasLoginModule;
-import org.codelutin.topia.taas.jaas.TaasPermission;
-import org.codelutin.topia.taas.jaas.TaasPolicy;
-import org.codelutin.topia.taas.jaas.TaasSubjectFinder;
-import org.codelutin.topia.taas.jaas.TaasSubjectFinderImpl;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaContextFactory;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.TopiaNotFoundException;
+import org.nuiton.topia.event.TopiaTransactionEvent;
+import org.nuiton.topia.event.TopiaTransactionVetoable;
+import org.nuiton.topia.framework.TopiaContextImplementor;
+import org.nuiton.topia.framework.TopiaService;
+import org.nuiton.topia.persistence.TopiaDAO;
+import org.nuiton.topia.persistence.TopiaEntity;
+import org.nuiton.topia.persistence.TopiaId;
+import org.nuiton.topia.taas.entities.TaasAuthorizationImpl;
+import org.nuiton.topia.taas.entities.TaasPrincipalImpl;
+import org.nuiton.topia.taas.entities.TaasUserImpl;
+import org.nuiton.topia.taas.event.TaasAccessEntity;
+import org.nuiton.topia.taas.event.TaasEntityVetoable;
+import org.nuiton.topia.taas.jaas.TaasConfiguration;
+import org.nuiton.topia.taas.jaas.TaasLoginModule;
+import org.nuiton.topia.taas.jaas.TaasPermission;
+import org.nuiton.topia.taas.jaas.TaasPolicy;
+import org.nuiton.topia.taas.jaas.TaasSubjectFinder;
+import org.nuiton.topia.taas.jaas.TaasSubjectFinderImpl;
-import static org.codelutin.topia.taas.TaasUtil.getPrincipalNames;
+import static org.nuiton.topia.taas.TaasUtil.getPrincipalNames;
/**
* Service pour la s�curit�
* <p>
* Pour utiliser le service taas, il suffit de rajouter les lignes suivantes dans
* le TopiaContext.properties :<p>
- * topia.service.taas=org.codelutin.topia.taas.TaasService
- * topia.service.taas.event=org.codelutin.topia.taas.event.TaasEntityVetoable
- * topia.service.taas.subject=org.codelutin.topia.taas.jaas.TaasSubjectImpl
+ * topia.service.taas=org.nuiton.topia.taas.TaasService
+ * topia.service.taas.event=org.nuiton.topia.taas.event.TaasEntityVetoable
+ * topia.service.taas.subject=org.nuiton.topia.taas.jaas.TaasSubjectImpl
*
* @author julien
*
@@ -105,10 +103,11 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#getPersistenceClasses()
+ * @see org.nuiton.topia.framework.TopiaService#getPersistenceClasses()
*/
- public Class[] getPersistenceClasses() {
- return new Class [] {
+ @Override
+ public Class<?>[] getPersistenceClasses() {
+ return new Class<?>[] {
TaasUserImpl.class,
TaasPrincipalImpl.class,
TaasAuthorizationImpl.class,
@@ -117,16 +116,18 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#getServiceName()
+ * @see org.nuiton.topia.framework.TopiaService#getServiceName()
*/
+ @Override
public String getServiceName() {
return SERVICE_NAME;
}
/*
* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#preInit(org.codelutin.topia.framework.TopiaContextImplementor)
+ * @see org.nuiton.topia.framework.TopiaService#preInit(org.nuiton.topia.framework.TopiaContextImplementor)
*/
+ @Override
public boolean preInit(TopiaContextImplementor context) {
rootContext = context;
initSecurity(rootContext);
@@ -157,7 +158,7 @@
config.remove("topia.service.taas");
String persistences = config.getProperty("topia.persistence.classes");
- for (Class klass : getPersistenceClasses()) {
+ for (Class<?> klass : getPersistenceClasses()) {
persistences += "," + klass.getName();
}
config.setProperty("topia.persistence.classes", persistences);
@@ -189,7 +190,7 @@
context.addTopiaEntityVetoable(clazz, accessEntity);
}
- Class[] noLoadClasses = getPersistenceClasses();
+ Class<?>[] noLoadClasses = getPersistenceClasses();
for (Class clazz : noLoadClasses) {
context.addTopiaEntityVetoable(clazz, accessEntity);
}
@@ -200,8 +201,9 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.framework.TopiaService#postInit(org.codelutin.topia.framework.TopiaContextImplementor)
+ * @see org.nuiton.topia.framework.TopiaService#postInit(org.nuiton.topia.framework.TopiaContextImplementor)
*/
+ @Override
public boolean postInit(TopiaContextImplementor context) {
policy.installPolicy();
@@ -223,6 +225,7 @@
/**
* Permet de recuperer un context root sans securite
* @return context root non securise
+ * @throws TopiaException
*/
public TopiaContext getRootContextNoSecure() throws TopiaException {
return rootContextNoSecure;
@@ -237,8 +240,8 @@
}
/**
- * Permet de v�rifier les authorizations sur une collection et de supprimer les donn�es non autoris�es
- * @param entities collection d'entit�s
+ * Permet de verifier les authorizations sur une collection et de supprimer les donnees non autoris�es
+ * @param entities collection d'entites
* @param actions actions
* @throws SecurityException en cas d'erreur de s�curit�
*/
@@ -282,7 +285,7 @@
/**
* Permet de v�rifier les authorizations
- * @param entity entit�
+ * @param topiaId id de l'entite
* @param actions actions
* @throws SecurityException en cas d'erreur de s�curit�
*/
@@ -376,7 +379,7 @@
*/
public List<Permission> getRequestPermission(TopiaEntity entity, int actions) {
String topiaId = entity.getTopiaId();
- Class klass = null;
+ Class<? extends TopiaEntity> klass = null;
try {
klass = TopiaId.getClassName(topiaId);
@@ -387,7 +390,7 @@
List<Permission> permissions = null;
try {
TopiaContextImplementor transaction = (TopiaContextImplementor) entity.getTopiaContext();
- TopiaDAO dao = transaction.getDAO(klass);
+ TopiaDAO<?> dao = transaction.getDAO(klass);
permissions = dao.getRequestPermission(topiaId, actions);
} catch (TopiaException e) {
throw new SecurityException("Error in getRequestPermission for " + klass.getName(), e);
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/TaasUtil.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/TaasUtil.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.taas;
+package org.nuiton.topia.taas;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -42,7 +42,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import sun.misc.BASE64Encoder;
/**
* Classe utilitaire
@@ -88,7 +87,7 @@
MessageDigest digest = MessageDigest.getInstance("SHA");
byte[] bytes = msg.getBytes();
bytes = digest.digest(bytes);
- BASE64Encoder encoder = new sun.misc.BASE64Encoder();
+ sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder();
String msgHashed = encoder.encode(bytes);
return msgHashed;
} catch (NoSuchAlgorithmException nsee) {
@@ -99,6 +98,8 @@
/**
* Fait le checksum SHA de la chaine de caractere le resultat est retourne
* sous forme de chaine Hexadecimal.
+ * @param ch la chaine a traiter
+ * @return le checksum SHA en mode hexadecimal
*/
static public String digestSHAHex(String ch){
if(ch == null){
@@ -200,13 +201,13 @@
* @param iface l'interface
* @return vrai si la classe impl�mente l'interface sinon faux
*/
- public static boolean isImplement(Class klass, Class iface) {
+ public static boolean isImplement(Class<?> klass, Class<?> iface) {
boolean result = false;
- Class[] interfaces = klass.getInterfaces();
+ Class<?>[] interfaces = klass.getInterfaces();
result |= ArrayUtils.contains(interfaces, iface);
- Class superclass = klass.getSuperclass();
+ Class<?> superclass = klass.getSuperclass();
if(!result && superclass != null) {
result |= isImplement(superclass, iface);
}
@@ -218,7 +219,7 @@
* Renvoie dans un Set les attribut 'name' des principals du Subject passe
* en param
* @param subj
- * @return
+ * @return les attribut 'name' des principals du Subject passe
*/
public static Set<String> getPrincipalNames(Subject subj) {
Set<String> result = new HashSet<String>();
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/event/TaasAccessEntity.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/event/TaasAccessEntity.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/event/TaasAccessEntity.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -16,10 +16,10 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
*/
-package org.codelutin.topia.taas.event;
+package org.nuiton.topia.taas.event;
-import org.codelutin.topia.event.TopiaEntitiesVetoable;
-import org.codelutin.topia.event.TopiaEntityVetoable;
+import org.nuiton.topia.event.TopiaEntitiesVetoable;
+import org.nuiton.topia.event.TopiaEntityVetoable;
public interface TaasAccessEntity extends TopiaEntitiesVetoable, TopiaEntityVetoable {
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoable.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/event/TaasEntityVetoable.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoable.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -16,21 +16,21 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
*/
-package org.codelutin.topia.taas.event;
+package org.nuiton.topia.taas.event;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.event.TopiaEntitiesEvent;
-import org.codelutin.topia.event.TopiaEntityEvent;
-import org.codelutin.topia.persistence.TopiaEntity;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE;
-import org.codelutin.topia.taas.TaasService;
-import static org.codelutin.topia.taas.TaasUtil.CREATE;
-import static org.codelutin.topia.taas.TaasUtil.DELETE;
-import static org.codelutin.topia.taas.TaasUtil.LOAD;
-import org.codelutin.topia.taas.entities.TaasAuthorization;
-import org.codelutin.topia.taas.entities.TaasPrincipal;
-import org.codelutin.topia.taas.entities.TaasUser;
+import org.nuiton.topia.event.TopiaEntitiesEvent;
+import org.nuiton.topia.event.TopiaEntityEvent;
+import org.nuiton.topia.persistence.TopiaEntity;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.UPDATE;
+import org.nuiton.topia.taas.TaasService;
+import static org.nuiton.topia.taas.TaasUtil.CREATE;
+import static org.nuiton.topia.taas.TaasUtil.DELETE;
+import static org.nuiton.topia.taas.TaasUtil.LOAD;
+import org.nuiton.topia.taas.entities.TaasAuthorization;
+import org.nuiton.topia.taas.entities.TaasPrincipal;
+import org.nuiton.topia.taas.entities.TaasUser;
import java.util.List;
@@ -48,7 +48,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityListener#createEntity(org.codelutin.topia.event.TopiaVetoableEntityEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityListener#createEntity(org.nuiton.topia.event.TopiaVetoableEntityEvent)
*/
public void create(TopiaEntityEvent event) {
TopiaEntity entity = event.getEntity();
@@ -62,7 +62,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityListener#deleteEntity(org.codelutin.topia.event.TopiaVetoableEntityEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityListener#deleteEntity(org.nuiton.topia.event.TopiaVetoableEntityEvent)
*/
public void delete(TopiaEntityEvent event) {
TopiaEntity entity = event.getEntity();
@@ -76,7 +76,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityLoadListener#loadEntity(org.codelutin.topia.event.TopiaVetoableEntityLoadEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityLoadListener#loadEntity(org.nuiton.topia.event.TopiaVetoableEntityLoadEvent)
*/
public void load(TopiaEntityEvent event) {
// TopiaEntity entity = event.getEntity();
@@ -89,7 +89,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityListener#updateEntity(org.codelutin.topia.event.TopiaVetoableEntityEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityListener#updateEntity(org.nuiton.topia.event.TopiaVetoableEntityEvent)
*/
public void update(TopiaEntityEvent event) {
TopiaEntity entity = event.getEntity();
@@ -103,7 +103,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntitiesVetoable#load(org.codelutin.topia.event.TopiaEntitiesEvent)
+ * @see org.nuiton.topia.event.TopiaEntitiesVetoable#load(org.nuiton.topia.event.TopiaEntitiesEvent)
*/
public <E extends TopiaEntity> List<E> load(TopiaEntitiesEvent<E> event) {
if (log.isDebugEnabled()) {
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoableRequestPermission.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/event/TaasEntityVetoableRequestPermission.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoableRequestPermission.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -16,18 +16,18 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
*/
-package org.codelutin.topia.taas.event;
+package org.nuiton.topia.taas.event;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.event.TopiaEntitiesEvent;
-import org.codelutin.topia.event.TopiaEntityEvent;
-import org.codelutin.topia.persistence.TopiaEntity;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE;
-import org.codelutin.topia.taas.TaasService;
-import static org.codelutin.topia.taas.TaasUtil.CREATE;
-import static org.codelutin.topia.taas.TaasUtil.DELETE;
-import static org.codelutin.topia.taas.TaasUtil.LOAD;
+import org.nuiton.topia.event.TopiaEntitiesEvent;
+import org.nuiton.topia.event.TopiaEntityEvent;
+import org.nuiton.topia.persistence.TopiaEntity;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.UPDATE;
+import org.nuiton.topia.taas.TaasService;
+import static org.nuiton.topia.taas.TaasUtil.CREATE;
+import static org.nuiton.topia.taas.TaasUtil.DELETE;
+import static org.nuiton.topia.taas.TaasUtil.LOAD;
import java.util.List;
@@ -45,7 +45,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityListener#createEntity(org.codelutin.topia.event.TopiaVetoableEntityEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityListener#createEntity(org.nuiton.topia.event.TopiaVetoableEntityEvent)
*/
public void create(TopiaEntityEvent event) {
TopiaEntity entity = event.getEntity();
@@ -59,7 +59,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityListener#deleteEntity(org.codelutin.topia.event.TopiaVetoableEntityEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityListener#deleteEntity(org.nuiton.topia.event.TopiaVetoableEntityEvent)
*/
public void delete(TopiaEntityEvent event) {
TopiaEntity entity = event.getEntity();
@@ -73,7 +73,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityLoadListener#loadEntity(org.codelutin.topia.event.TopiaVetoableEntityLoadEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityLoadListener#loadEntity(org.nuiton.topia.event.TopiaVetoableEntityLoadEvent)
*/
public void load(TopiaEntityEvent event) {
// TopiaEntity entity = event.getEntity();
@@ -86,7 +86,7 @@
}
/* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaVetoableEntityListener#updateEntity(org.codelutin.topia.event.TopiaVetoableEntityEvent)
+ * @see org.nuiton.topia.event.TopiaVetoableEntityListener#updateEntity(org.nuiton.topia.event.TopiaVetoableEntityEvent)
*/
public void update(TopiaEntityEvent event) {
TopiaEntity entity = event.getEntity();
@@ -100,7 +100,7 @@
/*
* (non-Javadoc)
- * @see org.codelutin.topia.event.TopiaEntitiesVetoable#load(org.codelutin.topia.event.TopiaEntitiesEvent)
+ * @see org.nuiton.topia.event.TopiaEntitiesVetoable#load(org.nuiton.topia.event.TopiaEntitiesEvent)
*/
public <E extends TopiaEntity> List<E> load(TopiaEntitiesEvent<E> event) {
if (log.isDebugEnabled()) {
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasCallbackHandler.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/jaas/TaasCallbackHandler.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasCallbackHandler.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.taas.jaas;
+package org.nuiton.topia.taas.jaas;
import java.io.IOException;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasConfiguration.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/jaas/TaasConfiguration.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasConfiguration.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.taas.jaas;
+package org.nuiton.topia.taas.jaas;
import java.util.HashMap;
import java.util.Map;
@@ -35,7 +35,7 @@
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
-import org.codelutin.topia.taas.TaasService;
+import org.nuiton.topia.taas.TaasService;
/**
* Classe permettant de passer des paramètres entre le LoginModule et le
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.taas.jaas;
+package org.nuiton.topia.taas.jaas;
import java.util.Collection;
@@ -46,13 +46,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaServiceDAOHelper;
-import org.codelutin.topia.taas.TaasService;
-import org.codelutin.topia.taas.TaasUtil;
-import org.codelutin.topia.taas.entities.TaasPrincipal;
-import org.codelutin.topia.taas.entities.TaasUser;
-import org.codelutin.topia.taas.entities.TaasUserDAO;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaServiceDAOHelper;
+import org.nuiton.topia.taas.TaasService;
+import org.nuiton.topia.taas.TaasUtil;
+import org.nuiton.topia.taas.entities.TaasPrincipal;
+import org.nuiton.topia.taas.entities.TaasUser;
+import org.nuiton.topia.taas.entities.TaasUserDAO;
/**
* LoginModule permettant l'authentification d'un utilisateur au près du système.
@@ -75,6 +75,7 @@
* java.util.Map,
* java.util.Map)
*/
+ @Override
public void initialize(Subject subject, CallbackHandler callbackHandler,
Map<String,?> sharedState, Map<String,?> options) {
this.subject = subject;
@@ -87,6 +88,7 @@
/* (non-Javadoc)
* @see javax.security.auth.spi.LoginModule#login()
*/
+ @Override
public boolean login() throws LoginException {
if (callbackHandler == null) {
throw new LoginException("CallbackHandler cannot be null");
@@ -169,6 +171,7 @@
/* (non-Javadoc)
* @see javax.security.auth.spi.LoginModule#commit()
*/
+ @Override
public boolean commit() throws LoginException {
subject.getPrincipals().addAll(principals);
subject.getPrivateCredentials().add(privateCredential);
@@ -178,6 +181,7 @@
/* (non-Javadoc)
* @see javax.security.auth.spi.LoginModule#abort()
*/
+ @Override
public boolean abort() throws LoginException {
//On effectue les mêmes actions que logout
return logout();
@@ -186,6 +190,7 @@
/* (non-Javadoc)
* @see javax.security.auth.spi.LoginModule#logout()
*/
+ @Override
public boolean logout() throws LoginException {
//On libère les ressources
subject.getPrincipals().removeAll(principals);
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/jaas/TaasPermission.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,16 +27,16 @@
* par : $Author$
*/
-package org.codelutin.topia.taas.jaas;
+package org.nuiton.topia.taas.jaas;
-import static org.codelutin.topia.taas.TaasUtil.CREATE;
-import static org.codelutin.topia.taas.TaasUtil.DELETE;
-import static org.codelutin.topia.taas.TaasUtil.LOAD;
-import static org.codelutin.topia.taas.TaasUtil.UPDATE;
+import static org.nuiton.topia.taas.TaasUtil.CREATE;
+import static org.nuiton.topia.taas.TaasUtil.DELETE;
+import static org.nuiton.topia.taas.TaasUtil.LOAD;
+import static org.nuiton.topia.taas.TaasUtil.UPDATE;
import java.security.Permission;
-import org.codelutin.topia.taas.entities.TaasAuthorization;
+import org.nuiton.topia.taas.entities.TaasAuthorization;
/**
* Classe permettant d'encapsuler les autorisations et de déléguer le travail aux
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/jaas/TaasPolicy.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.taas.jaas;
+package org.nuiton.topia.taas.jaas;
import java.security.CodeSource;
import java.security.Permission;
@@ -41,7 +41,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.taas.TaasService;
+import org.nuiton.topia.taas.TaasService;
/**
* Implantation d'un policy avec une prise en compte des permissions � la vol�e.
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasPrincipalWrapper.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/jaas/TaasPrincipalWrapper.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasPrincipalWrapper.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.taas.jaas;
+package org.nuiton.topia.taas.jaas;
import java.security.PermissionCollection;
import java.security.Permissions;
@@ -35,8 +35,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.taas.entities.TaasAuthorization;
-import org.codelutin.topia.taas.entities.TaasPrincipal;
+import org.nuiton.topia.taas.entities.TaasAuthorization;
+import org.nuiton.topia.taas.entities.TaasPrincipal;
/**
* Implantation des principals de JAAS.
@@ -52,7 +52,7 @@
/**
* Contructeur avec comme paramètre le nom du principal.
- * @param name topiaId d'un group ou d'utilisateur
+ * @param principal ?
*/
public TaasPrincipalWrapper(TaasPrincipal principal) {
this.name = principal.getName();
@@ -66,6 +66,7 @@
/* (non-Javadoc)
* @see java.security.Principal#getName()
*/
+ @Override
public String getName() {
return name;
}
@@ -81,6 +82,7 @@
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
+ @Override
public String toString() {
return this.getClass().getName() + " : " + name;
}
@@ -88,9 +90,11 @@
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object o) {
- if (!(o instanceof TaasPrincipalWrapper))
+ if (!(o instanceof TaasPrincipalWrapper)) {
return false;
+ }
if (name == null) {
return (((Principal)o).getName() == null);
}
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinder.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/jaas/TaasSubjectFinder.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinder.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.taas.jaas;
+package org.nuiton.topia.taas.jaas;
import javax.security.auth.Subject;
Modified: topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinderImpl.java
===================================================================
--- topia-service/trunk/src/main/java/org/codelutin/topia/taas/jaas/TaasSubjectFinderImpl.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinderImpl.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -27,7 +27,7 @@
* par : $Author$
*/
-package org.codelutin.topia.taas.jaas;
+package org.nuiton.topia.taas.jaas;
import java.security.AccessControlContext;
import java.security.AccessController;
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.history.entities">
+ <class name="org.nuiton.topia.history.entities.HistoryImpl" table="history" node="org.nuiton.topia.history.entities.HistoryImpl" abstract="false" proxy="org.nuiton.topia.history.entities.History" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ <property name="actionDate" type="java.util.Date" access="field" column="actionDate" node="actionDate"/>
+ <property name="userId" type="text" access="field" column="userId" node="userId"/>
+ <property name="action" type="int" access="field" column="action" node="action"/>
+ <property name="type" type="text" access="field" column="type" node="type"/>
+ <property name="target" type="text" access="field" column="target" node="target"/>
+ </class>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization">
+ <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAssociationAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorization" >
+ <!--key column="topiaId"/-->
+ <property name="idBeginAssociation" type="text" access="field" column="idBeginAssociation" node="idBeginAssociation"/>
+ <property name="nameAssociation" type="text" access="field" column="nameAssociation" node="nameAssociation"/>
+ <property name="actions" type="int" access="field" column="actions" node="actions"/>
+ <property name="principals" type="serializable" access="field" column="principals" node="principals"/>
+ </union-subclass>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization">
+ <class name="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" abstract="true" proxy="org.nuiton.topia.security.entities.authorization.TopiaAuthorization" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ </class>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization">
+ <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaEntityAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorization" >
+ <!--key column="topiaId"/-->
+ <property name="expression" type="text" access="field" column="expression" node="expression"/>
+ <property name="actions" type="int" access="field" column="actions" node="actions"/>
+ <property name="principals" type="serializable" access="field" column="principals" node="principals"/>
+ </union-subclass>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization">
+ <class name="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" table="topiaExpressionLink" node="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaExpressionLink" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ <property name="replace" type="text" access="field" column="replace" node="replace"/>
+ <property name="by" type="text" access="field" column="by" node="by"/>
+ </class>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user">
+ <class name="org.nuiton.topia.security.entities.user.TopiaGroupImpl" table="topiaGroup" node="org.nuiton.topia.security.entities.user.TopiaGroupImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaGroup" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ <property name="name" type="text" access="field" column="name" node="name"/>
+ <property name="description" type="text" access="field" column="description" node="description"/>
+ <bag name="topiaUser" table="topiagroup_topiauser" lazy="true" node="topiaUser" embed-xml="true">
+ <key column="topiaGroup"/>
+ <many-to-many class="org.nuiton.topia.security.entities.user.TopiaUserImpl" column="topiaUser" node="topiaId"/>
+ </bag>
+ <many-to-one name="superGroup" class="org.nuiton.topia.security.entities.user.TopiaGroupImpl" column="superGroup" node="superGroup/@topiaId" embed-xml="false" />
+ <bag name="subGroup" inverse="true" lazy="true" node="subGroup" embed-xml="false">
+ <key column="superGroup"/>
+ <one-to-many class="org.nuiton.topia.security.entities.user.TopiaGroupImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user">
+ <class name="org.nuiton.topia.security.entities.user.TopiaUserImpl" table="topiaUser" node="org.nuiton.topia.security.entities.user.TopiaUserImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaUser" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ <property name="login" type="text" access="field" column="login" node="login"/>
+ <property name="email" type="text" access="field" column="email" node="email"/>
+ <property name="password" type="text" access="field" column="password" node="password"/>
+ <property name="note" type="text" access="field" column="note" node="note"/>
+ <property name="linkApplication" type="text" access="field" column="linkApplication" node="linkApplication"/>
+ <bag name="topiaGroup" table="topiagroup_topiauser" inverse="true" lazy="true" node="topiaGroup" embed-xml="true">
+ <key column="topiaUser"/>
+ <many-to-many class="org.nuiton.topia.security.entities.user.TopiaGroupImpl" column="topiaGroup" node="topiaId"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities">
+ <class name="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" table="taasAuthorization" node="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasAuthorization" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ <property name="expression" type="text" access="field" column="expression" node="expression"/>
+ <property name="actions" type="int" access="field" column="actions" node="actions"/>
+ </class>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities">
+ <class name="org.nuiton.topia.taas.entities.TaasPrincipalImpl" table="taasPrincipal" node="org.nuiton.topia.taas.entities.TaasPrincipalImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasPrincipal" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ <property name="name" type="text" access="field" column="name" node="name"/>
+ <bag name="authorizations" table="authorizations_principals" lazy="false" node="authorizations" embed-xml="true">
+ <key column="principals"/>
+ <many-to-many class="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" column="authorizations" node="topiaId"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities">
+ <class name="org.nuiton.topia.taas.entities.TaasUserImpl" table="taasUser" node="org.nuiton.topia.taas.entities.TaasUserImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasUser" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ <property name="login" type="text" access="field" column="login" node="login"/>
+ <property name="password" type="text" access="field" column="password" node="password"/>
+ <property name="email" type="text" access="field" column="email" node="email"/>
+ <property name="enabled" type="boolean" access="field" column="enabled" node="enabled"/>
+ <property name="lastConnectionDate" type="java.util.Date" access="field" column="lastConnectionDate" node="lastConnectionDate"/>
+ <property name="numberOfConnection" type="int" access="field" column="numberOfConnection" node="numberOfConnection"/>
+ <property name="link" type="text" access="field" column="link" node="link"/>
+ <bag name="principals" table="principals_users" lazy="true" node="principals" embed-xml="true">
+ <key column="users"/>
+ <many-to-many class="org.nuiton.topia.taas.entities.TaasPrincipalImpl" column="principals" node="topiaId"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/entities/PersonImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/entities/PersonImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/entities/PersonImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.test.entities">
+ <class name="org.nuiton.topia.test.entities.PersonImpl" table="person" node="org.nuiton.topia.test.entities.PersonImpl" abstract="false" proxy="org.nuiton.topia.test.entities.Person" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ <property name="name" type="text" access="field" column="name" node="name"/>
+ <property name="firstname" type="text" access="field" column="firstname" node="firstname"/>
+ <bag name="pet" inverse="true" lazy="true" node="pet" embed-xml="false">
+ <key column="person"/>
+ <one-to-many class="org.nuiton.topia.test.entities.PetImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/entities/PetImpl.hbm.xml
===================================================================
--- topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/entities/PetImpl.hbm.xml (rev 0)
+++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/1/org/nuiton/topia/test/entities/PetImpl.hbm.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.test.entities">
+ <class name="org.nuiton.topia.test.entities.PetImpl" table="pet" node="org.nuiton.topia.test.entities.PetImpl" abstract="false" proxy="org.nuiton.topia.test.entities.Pet" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+ <property name="name" type="text" access="field" column="name" node="name"/>
+ <property name="type" type="text" access="field" column="type" node="type"/>
+ <many-to-one name="person" class="org.nuiton.topia.test.entities.PersonImpl" column="person" node="person/@topiaId" embed-xml="false" />
+ </class>
+</hibernate-mapping>
Modified: topia-service/trunk/src/main/xmi/TopiaService.zargo
===================================================================
(Binary files differ)
Modified: topia-service/trunk/src/site/site.xml
===================================================================
--- topia-service/trunk/src/site/site.xml 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/site/site.xml 2009-05-16 07:56:47 UTC (rev 1459)
@@ -31,6 +31,7 @@
<links>
<item name="ToPIA" href="http://topia.labs.libre-entreprise.org/topia"/>
<item name="Labs" href="http://labs.libre-entreprise.org/"/>
+ <item name="Nuiton" href="http://www.nuiton.org"/>
<item name="${project.organization.name}" href="${project.organization.url}"/>
</links>
@@ -43,12 +44,16 @@
</menu>
<menu name="Téléchargement">
- <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+ <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
name="Librairie (jar)"/>
- <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+ <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
name="Javadoc (jar)"/>
- <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+ <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
name="Sources (jar)"/>
+ <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip"
+ name="Bundle sans sources (zip)"/>
+ <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip"
+ name="Bundle complêt (zip)"/>
</menu>
<menu name="Developpeur">
Copied: topia-service/trunk/src/test/java/org/nuiton (from rev 1458, topia-service/trunk/src/test/java/org/codelutin)
Property changes on: topia-service/trunk/src/test/java/org/nuiton
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: topia-service/trunk/src/test/java/org/nuiton/topia/TestUtils.java
===================================================================
--- topia-service/trunk/src/test/java/org/codelutin/topia/TestUtils.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/test/java/org/nuiton/topia/TestUtils.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -16,11 +16,11 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
*/
-package org.codelutin.topia;
+package org.nuiton.topia;
import java.io.File;
-import org.codelutin.util.FileUtil;
+import org.nuiton.util.FileUtil;
/**
* Une classe pour avoir des choses utiles pour tous les tests.
Modified: topia-service/trunk/src/test/java/org/nuiton/topia/history/HistoryTest.java
===================================================================
--- topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/test/java/org/nuiton/topia/history/HistoryTest.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -17,15 +17,15 @@
-package org.codelutin.topia.history;
+package org.nuiton.topia.history;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaContextFactory;
-import org.codelutin.topia.TopiaServiceDAOHelper;
-import org.codelutin.topia.security.util.TopiaSecurityUtil;
-import org.codelutin.topia.test.entities.Person;
-import org.codelutin.topia.test.entities.PersonDAO;
-import org.codelutin.util.FileUtil;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaContextFactory;
+import org.nuiton.topia.TopiaServiceDAOHelper;
+import org.nuiton.topia.security.util.TopiaSecurityUtil;
+import org.nuiton.topia.test.entities.Person;
+import org.nuiton.topia.test.entities.PersonDAO;
+import org.nuiton.util.FileUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -47,8 +47,8 @@
public class HistoryTest extends Assert {
protected static String entitiesList =
- "org.codelutin.topia.test.entities.PersonImpl," +
- "org.codelutin.topia.test.entities.PetImpl";
+ "org.nuiton.topia.test.entities.PersonImpl," +
+ "org.nuiton.topia.test.entities.PetImpl";
protected static Properties getProperties() throws Exception {
Properties config = new Properties();
@@ -67,9 +67,9 @@
"jdbc:h2:" + tmp.getCanonicalPath() + "/data;create=true;LOCK_MODE=0");
config.setProperty("topia.history",
- "org.codelutin.topia.history.TopiaHistoryServiceImpl");
+ "org.nuiton.topia.history.TopiaHistoryServiceImpl");
config.setProperty("topia.service.history",
- "org.codelutin.topia.history.TopiaHistoryServiceImpl");
+ "org.nuiton.topia.history.TopiaHistoryServiceImpl");
return config;
}
Modified: topia-service/trunk/src/test/java/org/nuiton/topia/index/IndexTest.java
===================================================================
--- topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/test/java/org/nuiton/topia/index/IndexTest.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,15 +15,17 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.index;
+package org.nuiton.topia.index;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaContextFactory;
-import org.codelutin.topia.framework.TopiaContextImplementor;
-import org.codelutin.topia.persistence.TopiaDAO;
-import org.codelutin.topia.test.entities.Person;
-import org.codelutin.topia.test.entities.PersonImpl;
-import org.codelutin.topia.test.entities.PetImpl;
+import org.nuiton.topia.index.IndexEntry;
+import org.nuiton.topia.index.TopiaIndexService;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaContextFactory;
+import org.nuiton.topia.framework.TopiaContextImplementor;
+import org.nuiton.topia.persistence.TopiaDAO;
+import org.nuiton.topia.test.entities.Person;
+import org.nuiton.topia.test.entities.PersonImpl;
+import org.nuiton.topia.test.entities.PetImpl;
import org.junit.Assert;
import org.junit.Test;
@@ -66,9 +68,9 @@
protected Properties getIndexProperties() {
Properties result = getProperties();
- result.setProperty("topia.index.engin", "org.codelutin.topia.index.LuceneIndexer");
+ result.setProperty("topia.index.engin", "org.nuiton.topia.index.LuceneIndexer");
result.setProperty("topia.index.lucene.directory", "/tmp/topia-test-index");
- result.setProperty("topia.service.index", "org.codelutin.topia.index.LuceneIndexer");
+ result.setProperty("topia.service.index", "org.nuiton.topia.index.LuceneIndexer");
return result;
}
Modified: topia-service/trunk/src/test/java/org/nuiton/topia/migration/common/VersionTest.java
===================================================================
--- topia-service/trunk/src/test/java/org/codelutin/topia/migration/common/VersionTest.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/test/java/org/nuiton/topia/migration/common/VersionTest.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,8 +15,9 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
*/
-package org.codelutin.topia.migration.common;
+package org.nuiton.topia.migration.common;
+import org.nuiton.topia.migration.common.Version;
import org.junit.Assert;
import org.junit.Test;
Modified: topia-service/trunk/src/test/java/org/nuiton/topia/migration/kernel/ConfigurationAdapterTest.java
===================================================================
--- topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/test/java/org/nuiton/topia/migration/kernel/ConfigurationAdapterTest.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,9 +15,11 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
*/
-package org.codelutin.topia.migration.kernel;
+package org.nuiton.topia.migration.kernel;
-import org.codelutin.topia.migration.common.Version;
+import org.nuiton.topia.migration.kernel.ConfigurationAdapter;
+import org.nuiton.topia.migration.kernel.DependenciesHelper;
+import org.nuiton.topia.migration.common.Version;
import org.hibernate.EntityMode;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
Modified: topia-service/trunk/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java
===================================================================
--- topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2009-05-16 07:56:47 UTC (rev 1459)
@@ -15,11 +15,12 @@
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
-package org.codelutin.topia.security;
+package org.nuiton.topia.security;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.LOAD;
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE;
+import org.nuiton.topia.security.TopiaSecurityService;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.LOAD;
+import static org.nuiton.topia.security.util.TopiaSecurityUtil.UPDATE;
import java.io.File;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
@@ -29,28 +30,28 @@
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
-import org.codelutin.topia.TestUtils;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaContextFactory;
-import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.TopiaServiceDAOHelper;
-import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorization;
-import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO;
-import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization;
-import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationDAO;
-import org.codelutin.topia.security.entities.authorization.TopiaExpressionLink;
-import org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkDAO;
-import org.codelutin.topia.security.entities.user.TopiaGroup;
-import org.codelutin.topia.security.entities.user.TopiaGroupDAO;
-import org.codelutin.topia.security.entities.user.TopiaUser;
-import org.codelutin.topia.security.entities.user.TopiaUserDAO;
-import org.codelutin.topia.security.jaas.TopiaCallbackHandler;
-import org.codelutin.topia.security.util.TopiaSecurityFactoryFilter;
-import org.codelutin.topia.security.util.TopiaSecurityUtil;
-import org.codelutin.topia.test.entities.Person;
-import org.codelutin.topia.test.entities.PersonDAO;
-import org.codelutin.topia.test.entities.Pet;
-import org.codelutin.topia.test.entities.PetDAO;
+import org.nuiton.topia.TestUtils;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaContextFactory;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.TopiaServiceDAOHelper;
+import org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorization;
+import org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO;
+import org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorization;
+import org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationDAO;
+import org.nuiton.topia.security.entities.authorization.TopiaExpressionLink;
+import org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkDAO;
+import org.nuiton.topia.security.entities.user.TopiaGroup;
+import org.nuiton.topia.security.entities.user.TopiaGroupDAO;
+import org.nuiton.topia.security.entities.user.TopiaUser;
+import org.nuiton.topia.security.entities.user.TopiaUserDAO;
+import org.nuiton.topia.security.jaas.TopiaCallbackHandler;
+import org.nuiton.topia.security.util.TopiaSecurityFactoryFilter;
+import org.nuiton.topia.security.util.TopiaSecurityUtil;
+import org.nuiton.topia.test.entities.Person;
+import org.nuiton.topia.test.entities.PersonDAO;
+import org.nuiton.topia.test.entities.Pet;
+import org.nuiton.topia.test.entities.PetDAO;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -75,8 +76,8 @@
// FIXME comment il trouve les autres tout seul ?
// The grande question !!!
protected static String entitiesList = //TopiaServiceDAOHelper.entitiesList + "," +
- "org.codelutin.topia.test.entities.PersonImpl," +
- "org.codelutin.topia.test.entities.PetImpl";
+ "org.nuiton.topia.test.entities.PersonImpl," +
+ "org.nuiton.topia.test.entities.PetImpl";
@BeforeClass
public static void init() throws Exception {
@@ -103,7 +104,7 @@
config.setProperty("hibernate.connection.url", "jdbc:h2:" + TestUtils.getDirDatabase().getAbsolutePath() + File.separator + "topia-security");
// add this to use security service
- config.setProperty("topia.service.security", "org.codelutin.topia.security.TopiaSecurityServiceImpl");
+ config.setProperty("topia.service.security", "org.nuiton.topia.security.TopiaSecurityServiceImpl");
return config;
}
Modified: topia-service/trunk/src/test/resources/log4j.properties
===================================================================
--- topia-service/trunk/src/test/resources/log4j.properties 2009-05-15 16:30:09 UTC (rev 1458)
+++ topia-service/trunk/src/test/resources/log4j.properties 2009-05-16 07:56:47 UTC (rev 1459)
@@ -6,4 +6,4 @@
log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n
# package level
-log4j.logger.org.codelutin=INFO
\ No newline at end of file
+log4j.logger.org.nuiton=INFO
\ No newline at end of file
1
0
r1458 - in topia/trunk: . src/site topia-persistence topia-persistence/src/site topia-soa topia-soa/src/site topia-ui topia-ui/src/site
by tchemit＠users.labs.libre-entreprise.org 15 May '09
by tchemit＠users.labs.libre-entreprise.org 15 May '09
15 May '09
Author: tchemit
Date: 2009-05-15 16:30:09 +0000 (Fri, 15 May 2009)
New Revision: 1458
Modified:
topia/trunk/pom.xml
topia/trunk/src/site/site.xml
topia/trunk/topia-persistence/pom.xml
topia/trunk/topia-persistence/src/site/site.xml
topia/trunk/topia-soa/pom.xml
topia/trunk/topia-soa/src/site/site.xml
topia/trunk/topia-ui/pom.xml
topia/trunk/topia-ui/src/site/site.xml
Log:
make scm plugin works for multi-modules + use nuiton-utils
Modified: topia/trunk/pom.xml
===================================================================
--- topia/trunk/pom.xml 2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/pom.xml 2009-05-15 16:30:09 UTC (rev 1458)
@@ -12,7 +12,6 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.nuiton</groupId>
<artifactId>topia</artifactId>
<version>2.2.0-SNAPSHOT</version>
@@ -34,7 +33,7 @@
<dependency>
<groupId>org.nuiton</groupId>
- <artifactId>nuitonutil</artifactId>
+ <artifactId>nuiton-utils</artifactId>
<version>${nuitonutil.version}</version>
<scope>compile</scope>
</dependency>
@@ -169,21 +168,19 @@
<packaging>pom</packaging>
<properties>
- <!-- id du projet du labs -->
- <labs.id>21</labs.id>
-
- <!-- nom du projet sur le labs -->
- <labs.project>topia</labs.project>
-
+
<!-- libs version -->
<generator.version>1.0.0-SNAPSHOT</generator.version>
<processor.version>1.0.0-SNAPSHOT</processor.version>
<nuitonutil.version>1.1.0-SNAPSHOT</nuitonutil.version>
+ <xmlrpc.version>3.1</xmlrpc.version>
+ <hibernate.version>3.3.1.GA</hibernate.version>
<topia.version>${project.version}</topia.version>
- <xmlrpc.version>3.1</xmlrpc.version>
- <hibernate.version>3.3.1.GA</hibernate.version>
+ <!-- a supprimer des qu'on pourra deployer les sites sur nuiton -->
+ <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/topia/htdocs</site.deploy.url>
+
</properties>
<build>
@@ -195,7 +192,7 @@
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-processor-plugin</artifactId>
+ <artifactId>maven-process-plugin</artifactId>
<version>${processor.version}</version>
<executions>
<execution>
@@ -246,18 +243,13 @@
<!-- ************************************************************* -->
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
- <scm>
- <url>${maven.scm.url}</url>
- <connection>${maven.scm.connection}</connection>
- <developerConnection>${maven.scm.developerConnection}</developerConnection>
- </scm>
- <!--Code Lutin Repository-->
+ <!--Nuiton Repository : pourra etre supprimer lorsqu'on sera sur central -->
<repositories>
<repository>
- <id>codelutin-repository</id>
- <name>CodeLutinRepository</name>
- <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url>
+ <id>nuiton-repository</id>
+ <name>NuitonRepository</name>
+ <url>${repository.home.url}</url>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
Modified: topia/trunk/src/site/site.xml
===================================================================
--- topia/trunk/src/site/site.xml 2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/src/site/site.xml 2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,6 +30,7 @@
<links>
<item name="ToPIA Service" href="../topia-service"/>
<item name="Labs" href="http://labs.libre-entreprise.org/"/>
+ <item name="Nuiton" href="http://www.nuiton.org"/>
<item name="Code Lutin" href="http://www.codelutin.com/"/>
</links>
Modified: topia/trunk/topia-persistence/pom.xml
===================================================================
--- topia/trunk/topia-persistence/pom.xml 2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-persistence/pom.xml 2009-05-15 16:30:09 UTC (rev 1458)
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.nuiton</groupId>
- <artifactId>nuitonutil</artifactId>
+ <artifactId>nuiton-utils</artifactId>
</dependency>
<dependency>
@@ -77,6 +77,10 @@
<packaging>jar</packaging>
+ <properties>
+ <helper.scmModuleLevel>1</helper.scmModuleLevel>
+ </properties>
+
<build>
<testResources>
@@ -101,7 +105,7 @@
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-processor-plugin</artifactId>
+ <artifactId>maven-process-plugin</artifactId>
</plugin>
<plugin>
@@ -134,11 +138,5 @@
<!-- ************************************************************* -->
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
- <scm>
- <url>${maven.scm.url.child}</url>
- <connection>${maven.scm.connection.child}</connection>
- <developerConnection>${maven.scm.developerConnection.child}</developerConnection>
- </scm>
-
-
+
</project>
Modified: topia/trunk/topia-persistence/src/site/site.xml
===================================================================
--- topia/trunk/topia-persistence/src/site/site.xml 2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-persistence/src/site/site.xml 2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,6 +30,7 @@
<links>
<item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/>
<item name="Labs" href="http://labs.libre-entreprise.org/"/>
+ <item name="Nuiton" href="http://www.nuiton.org"/>
<item name="Code Lutin" href="http://www.codelutin.com/"/>
</links>
@@ -40,11 +41,11 @@
</menu>
<menu name="Téléchargement">
- <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+ <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
name="Librairie (jar)"/>
- <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+ <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
name="Javadoc (jar)"/>
- <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+ <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
name="Sources (jar)"/>
</menu>
Modified: topia/trunk/topia-soa/pom.xml
===================================================================
--- topia/trunk/topia-soa/pom.xml 2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-soa/pom.xml 2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.nuiton</groupId>
- <artifactId>nuitonutil</artifactId>
+ <artifactId>nuiton-utils</artifactId>
</dependency>
<dependency>
@@ -90,6 +90,10 @@
<!-- ************************************************************* -->
<packaging>jar</packaging>
+
+ <properties>
+ <helper.scmModuleLevel>1</helper.scmModuleLevel>
+ </properties>
<build>
@@ -97,7 +101,7 @@
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-processor-plugin</artifactId>
+ <artifactId>maven-process-plugin</artifactId>
</plugin>
<plugin>
@@ -138,10 +142,5 @@
<!-- ************************************************************* -->
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
- <scm>
- <url>${maven.scm.url.child}</url>
- <connection>${maven.scm.connection.child}</connection>
- <developerConnection>${maven.scm.developerConnection.child}</developerConnection>
- </scm>
-
+
</project>
Modified: topia/trunk/topia-soa/src/site/site.xml
===================================================================
--- topia/trunk/topia-soa/src/site/site.xml 2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-soa/src/site/site.xml 2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,6 +30,7 @@
<links>
<item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/>
<item name="Labs" href="http://labs.libre-entreprise.org/"/>
+ <item name="Nuiton" href="http://www.nuiton.org"/>
<item name="Code Lutin" href="http://www.codelutin.com/"/>
</links>
@@ -39,12 +40,12 @@
<item href="/index.html" name="Accueil"/>
</menu>
- <menu name="Téléchargement">
- <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+ <menu name="Téléchargement">
+ <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
name="Librairie (jar)"/>
- <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+ <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
name="Javadoc (jar)"/>
- <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+ <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
name="Sources (jar)"/>
</menu>
Modified: topia/trunk/topia-ui/pom.xml
===================================================================
--- topia/trunk/topia-ui/pom.xml 2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-ui/pom.xml 2009-05-15 16:30:09 UTC (rev 1458)
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.nuiton</groupId>
- <artifactId>nuitonutil</artifactId>
+ <artifactId>nuiton-utils</artifactId>
</dependency>
<dependency>
@@ -65,13 +65,17 @@
<packaging>jar</packaging>
+ <properties>
+ <helper.scmModuleLevel>1</helper.scmModuleLevel>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-processor-plugin</artifactId>
+ <artifactId>maven-process-plugin</artifactId>
</plugin>
<plugin>
@@ -106,10 +110,5 @@
<!-- ************************************************************* -->
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
- <scm>
- <url>${maven.scm.url.child}</url>
- <connection>${maven.scm.connection.child}</connection>
- <developerConnection>${maven.scm.developerConnection.child}</developerConnection>
- </scm>
-
+
</project>
Modified: topia/trunk/topia-ui/src/site/site.xml
===================================================================
--- topia/trunk/topia-ui/src/site/site.xml 2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-ui/src/site/site.xml 2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,6 +30,7 @@
<links>
<item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/>
<item name="Labs" href="http://labs.libre-entreprise.org/"/>
+ <item name="Nuiton" href="http://www.nuiton.org"/>
<item name="Code Lutin" href="http://www.codelutin.com/"/>
</links>
@@ -39,12 +40,12 @@
<item href="/index.html" name="Accueil"/>
</menu>
- <menu name="Téléchargement">
- <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+ <menu name="Téléchargement">
+ <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
name="Librairie (jar)"/>
- <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+ <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
name="Javadoc (jar)"/>
- <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+ <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
name="Sources (jar)"/>
</menu>
1
0
r1457 - in topia/trunk: . topia-persistence topia-persistence/src/main/java/org/nuiton/topia topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile topia-persistence/src/main/java/org/nuiton/topia/persistence/util topia-persistence/src/test/java/org/nuiton/topia/persistence topia-soa topia-ui
by tchemit＠users.labs.libre-entreprise.org 15 May '09
by tchemit＠users.labs.libre-entreprise.org 15 May '09
15 May '09
Author: tchemit
Date: 2009-05-15 02:12:45 +0000 (Fri, 15 May 2009)
New Revision: 1457
Modified:
topia/trunk/pom.xml
topia/trunk/topia-persistence/pom.xml
topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java
topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java
topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java
topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java
topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java
topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java
topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java
topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java
topia/trunk/topia-soa/pom.xml
topia/trunk/topia-ui/pom.xml
Log:
migrate to nuiton (part 2 : plus de dependances vers du org.codelutin :))
Modified: topia/trunk/pom.xml
===================================================================
--- topia/trunk/pom.xml 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/pom.xml 2009-05-15 02:12:45 UTC (rev 1457)
@@ -33,9 +33,9 @@
</dependency>
<dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinutil</artifactId>
- <version>${lutinutil.version}</version>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuitonutil</artifactId>
+ <version>${nuitonutil.version}</version>
<scope>compile</scope>
</dependency>
@@ -140,7 +140,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
@@ -177,8 +177,8 @@
<!-- libs version -->
<generator.version>1.0.0-SNAPSHOT</generator.version>
- <processor.version>0.18</processor.version>
- <lutinutil.version>1.0.6</lutinutil.version>
+ <processor.version>1.0.0-SNAPSHOT</processor.version>
+ <nuitonutil.version>1.1.0-SNAPSHOT</nuitonutil.version>
<topia.version>${project.version}</topia.version>
@@ -194,7 +194,7 @@
<plugins>
<plugin>
- <groupId>org.codelutin</groupId>
+ <groupId>org.nuiton</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>${processor.version}</version>
<executions>
@@ -205,16 +205,12 @@
</goals>
</execution>
</executions>
- <configuration>
- <addCompileDirectory>true</addCompileDirectory>
- <includes>
- <include>**/*.java</include>
- </includes>
+ <configuration>
+ <includes>**/*.java</includes>
<filters>
- org.codelutin.processor.filters.GeneratorTemplatesFilter,
- org.codelutin.processor.filters.ActiveLogsCodeFilter
+ org.nuiton.processor.filters.GeneratorTemplatesFilter,
+ org.nuiton.processor.filters.ActiveLogsCodeFilter
</filters>
- <verbose>${maven.verbose}</verbose>
</configuration>
</plugin>
@@ -273,36 +269,4 @@
</repository>
</repositories>
- <profiles>
- <!-- perform only on a release stage when using the maven-release-plugin -->
- <profile>
- <id>release-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <!-- always add license and third-party files to classpath -->
- <plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-license-switcher-plugin</artifactId>
- <version>0.8</version>
- <executions>
- <execution>
- <id>attach-licenses</id>
- <goals>
- <goal>license</goal>
- <goal>third-party</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
Modified: topia/trunk/topia-persistence/pom.xml
===================================================================
--- topia/trunk/topia-persistence/pom.xml 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/pom.xml 2009-05-15 02:12:45 UTC (rev 1457)
@@ -19,8 +19,8 @@
<dependencies>
<dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinutil</artifactId>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuitonutil</artifactId>
</dependency>
<dependency>
@@ -100,7 +100,7 @@
<plugins>
<plugin>
- <groupId>org.codelutin</groupId>
+ <groupId>org.nuiton</groupId>
<artifactId>maven-processor-plugin</artifactId>
</plugin>
Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java 2009-05-15 02:12:45 UTC (rev 1457)
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.util.Resource;
+import org.nuiton.util.Resource;
/**
* ContextUtil.java
Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2009-05-15 02:12:45 UTC (rev 1457)
@@ -46,7 +46,7 @@
import org.nuiton.topia.persistence.TopiaDAODelegator;
import org.nuiton.topia.persistence.TopiaEntity;
import org.nuiton.topia.persistence.TopiaId;
-import org.codelutin.util.ArrayUtil;
+import org.nuiton.util.ArrayUtil;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentFactory;
Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2009-05-15 02:12:45 UTC (rev 1457)
@@ -45,8 +45,8 @@
import org.nuiton.topia.event.TopiaTransactionVetoable;
import org.nuiton.topia.persistence.TopiaEntity;
import org.nuiton.topia.persistence.TopiaEntityAbstract;
-import org.codelutin.util.CategorisedListenerSet;
-import org.codelutin.util.ListenerSet;
+import org.nuiton.util.CategorisedListenerSet;
+import org.nuiton.util.ListenerSet;
import org.hibernate.Session;
import org.hibernate.event.PostDeleteEvent;
import org.hibernate.event.PostDeleteEventListener;
@@ -514,6 +514,7 @@
* Recherche le context utilisant la session hibernate passe en
* parametre
*
+ * @param parent le context parent
* @param hibernate la session hibernate que doit utiliser le
* TopiaContext pour etre retourne
* @return le TopiaContext utilisant cette session hibernate ou null si
@@ -561,6 +562,7 @@
}
/* Création */
+ @Override
public boolean onPreInsert(PreInsertEvent event) {
TopiaContextImplementor context = getContext(rootContext, event
.getSession());
@@ -571,6 +573,7 @@
return false;
}
+ @Override
public void onPostInsert(PostInsertEvent event) {
TopiaContextImplementor context = getContext(rootContext, event
.getSession());
@@ -581,6 +584,7 @@
}
/* Chargement */
+ @Override
public void onPreLoad(PreLoadEvent event) {
TopiaContextImplementor context = getContext(rootContext, event
.getSession());
@@ -595,6 +599,7 @@
}
}
+ @Override
public void onPostLoad(PostLoadEvent event) {
TopiaContextImplementor context = getContext(rootContext, event
.getSession());
@@ -606,6 +611,7 @@
}
/* Modification */
+ @Override
public boolean onPreUpdate(PreUpdateEvent event) {
TopiaContextImplementor context = getContext(rootContext, event
.getSession());
@@ -616,6 +622,7 @@
return false;
}
+ @Override
public void onPostUpdate(PostUpdateEvent event) {
TopiaContextImplementor context = getContext(rootContext, event
.getSession());
@@ -629,6 +636,7 @@
}
/* Suppression */
+ @Override
public boolean onPreDelete(PreDeleteEvent event) {
TopiaContextImplementor context = getContext(rootContext, event
.getSession());
@@ -640,6 +648,7 @@
return false;
}
+ @Override
public void onPostDelete(PostDeleteEvent event) {
TopiaContextImplementor context = getContext(rootContext, event
.getSession());
@@ -770,7 +779,10 @@
/**
* Notify entities listeners for load operation
+ * @param <E>
+ * @param context
* @param entities entities loaded
+ * @return
*/
public <E extends TopiaEntity> List<E> fireEntitiesLoad(
TopiaContextImplementor context, List<E> entities) {
Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2009-05-15 02:12:45 UTC (rev 1457)
@@ -33,8 +33,8 @@
import org.apache.commons.logging.LogFactory;
import org.nuiton.topia.TopiaNotFoundException;
import org.nuiton.topia.persistence.TopiaEntity;
-import org.codelutin.util.RecursiveProperties;
-import org.codelutin.util.Resource;
+import org.nuiton.util.RecursiveProperties;
+import org.nuiton.util.Resource;
import java.net.URL;
import java.util.Properties;
Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-05-15 02:12:45 UTC (rev 1457)
@@ -43,7 +43,7 @@
import org.nuiton.eugene.models.object.ObjectModelAttribute;
import org.nuiton.eugene.models.object.ObjectModelClass;
import org.nuiton.eugene.models.object.ObjectModelClassifier;
-import org.codelutin.util.StringUtil;
+import org.nuiton.util.StringUtil;
/**
* Genere des DAOs abstrait par defaut, l'utilisateur peut ensuite en herite
Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java 2009-05-15 02:12:45 UTC (rev 1457)
@@ -64,7 +64,7 @@
import org.nuiton.topia.framework.TopiaUtil;
import org.nuiton.topia.persistence.TopiaDAOAbstract;
import org.nuiton.topia.persistence.TopiaEntity;
-import org.codelutin.util.FileUtil;
+import org.nuiton.util.FileUtil;
import org.hibernate.Criteria;
import org.hibernate.FlushMode;
import org.hibernate.criterion.Criterion;
Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2009-05-15 02:12:45 UTC (rev 1457)
@@ -6,7 +6,7 @@
import org.nuiton.topia.TopiaException;
import org.nuiton.topia.persistence.TopiaDAO;
import org.nuiton.topia.persistence.TopiaEntity;
-import org.codelutin.util.IOUtils;
+import org.nuiton.util.IOUtils;
import java.io.ByteArrayOutputStream;
import java.io.File;
Modified: topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java
===================================================================
--- topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2009-05-15 02:12:45 UTC (rev 1457)
@@ -36,7 +36,7 @@
import org.nuiton.topiatest.DepartmentDAO;
import org.nuiton.topiatest.Employe;
import org.nuiton.topiatest.EmployeDAO;
-import org.codelutin.util.FileUtil;
+import org.nuiton.util.FileUtil;
import org.hibernate.cfg.Environment;
import org.junit.After;
import org.junit.AfterClass;
Modified: topia/trunk/topia-soa/pom.xml
===================================================================
--- topia/trunk/topia-soa/pom.xml 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-soa/pom.xml 2009-05-15 02:12:45 UTC (rev 1457)
@@ -26,11 +26,11 @@
<version>${project.version}</version>
</dependency>
- <!-- lutin Dependencies -->
+ <!-- nuiton Dependencies -->
<dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinutil</artifactId>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuitonutil</artifactId>
</dependency>
<dependency>
@@ -96,7 +96,7 @@
<plugins>
<plugin>
- <groupId>org.codelutin</groupId>
+ <groupId>org.nuiton</groupId>
<artifactId>maven-processor-plugin</artifactId>
</plugin>
Modified: topia/trunk/topia-ui/pom.xml
===================================================================
--- topia/trunk/topia-ui/pom.xml 2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-ui/pom.xml 2009-05-15 02:12:45 UTC (rev 1457)
@@ -19,8 +19,8 @@
<dependencies>
<dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinutil</artifactId>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuitonutil</artifactId>
</dependency>
<dependency>
@@ -70,7 +70,7 @@
<plugins>
<plugin>
- <groupId>org.codelutin</groupId>
+ <groupId>org.nuiton</groupId>
<artifactId>maven-processor-plugin</artifactId>
</plugin>
1
0