July 2009 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r1583 - in trunk/simexplorer-is: . simexplorer-is-entities simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-security simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao
by tchemit＠users.labs.libre-entreprise.org 11 Jul '09

11 Jul '09

Author: tchemit Date: 2009-07-11 12:12:58 +0000 (Sat, 11 Jul 2009) New Revision: 1583 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-entities/pom.xml trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java trunk/simexplorer-is/simexplorer-is-security/pom.xml trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java trunk/simexplorer-is/simexplorer-is-service/pom.xml trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java trunk/simexplorer-is/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java trunk/simexplorer-is/simexplorer-is-storage/src/main/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java trunk/simexplorer-is/simexplorer-is-swing/pom.xml trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFilePanel.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/main/resources/commandline.properties trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java Log: migrate to nuiton : stage two (libs) Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -41,14 +41,14 @@  <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> <version>${lutinutil.version}</version> </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> +   <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> @@ -92,8 +92,15 @@ </exclusion> </exclusions> </dependency> + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-widget</artifactId> + <version>${jaxx.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> @@ -339,15 +346,13 @@ <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url>  - <jaxx.version>1.3</jaxx.version> + <jaxx.version>1.7.0</jaxx.version> <commandline.version>1.0</commandline.version> - <lutinutil.version>1.0.3</lutinutil.version> - <lutinwidget.version>0.14</lutinwidget.version> - <i18n.version>0.11</i18n.version> - <jrst.version>0.8.4</jrst.version> - <license-switcher.version>0.6</license-switcher.version> - + <lutinutil.version>1.1.0-rc-9-SNAPSHOT</lutinutil.version> +  + <i18n.version>1.0.0-rc-4</i18n.version> + <tapestry.version>5.0.11</tapestry.version> <jboss.version>4.2.2.GA</jboss.version> @@ -543,8 +548,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>1.0.0-rc-4</version> -  + <version>${i18n.version}</version> <configuration> <bundles>fr_FR</bundles> </configuration> Modified: trunk/simexplorer-is/simexplorer-is-entities/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -23,8 +23,8 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency> </dependencies> Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,8 +16,8 @@ */ package fr.cemagref.simexplorer.is.entities; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.entities; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n_; /** * The Enum SimExplorerPage. Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,13 +16,13 @@ */ package fr.cemagref.simexplorer.is.entities.attachment; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.codelutin.util.StringUtil; +import org.nuiton.util.StringUtil; import fr.cemagref.simexplorer.is.entities.Leaf; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.attachment; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n_; import java.io.InputStream; import java.io.InputStreamReader; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,11 +16,11 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; -import org.codelutin.util.StringUtil; +import org.nuiton.util.StringUtil; import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.metadata; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.Date; Modified: trunk/simexplorer-is/simexplorer-is-security/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-security/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -37,8 +37,8 @@ <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency>  @@ -106,7 +106,7 @@   -  + </repositories> </project> Modified: trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.CollectionUtil; +import org.nuiton.util.CollectionUtil; import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Group; Modified: trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.CollectionUtil; +import org.nuiton.util.CollectionUtil; import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Permission; Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -108,7 +108,6 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> -  <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.service; -import org.codelutin.util.ConverterUtil; +import org.nuiton.util.ConverterUtil; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.service; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.Arrays; @@ -43,7 +43,7 @@ import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.i18n.I18n; +import org.nuiton.i18n.I18n; import org.jboss.annotation.ejb.RemoteBinding; import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.service; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.service; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.IOException; import java.io.InputStream; @@ -36,7 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.ZipStreamEncoder; +import org.nuiton.util.ZipStreamEncoder; import com.healthmarketscience.rmiio.SerializableInputStream; Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -23,7 +23,7 @@ import java.util.UUID; import org.apache.commons.lang.RandomStringUtils; -import org.codelutin.util.MD5; +import org.nuiton.util.MD5; import fr.cemagref.simexplorer.is.entities.Entity; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -23,7 +23,7 @@ import junit.framework.TestCase; -import org.codelutin.util.ArrayUtil; +import org.nuiton.util.ArrayUtil; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; Modified: trunk/simexplorer-is/simexplorer-is-storage/src/main/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/main/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-storage/src/main/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -26,8 +26,8 @@ import java.io.InputStream; import java.io.OutputStream; -import org.codelutin.util.MD5; -import org.codelutin.util.MD5InputStream; +import org.nuiton.util.MD5; +import org.nuiton.util.MD5InputStream; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -39,14 +39,21 @@  <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> - </dependency> + </dependency> + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-widget</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> </dependency> +  <dependency> @@ -69,10 +76,10 @@ <artifactId>jbossall-client</artifactId> </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> - </dependency> +  <dependency> <groupId>junit</groupId> @@ -152,12 +159,23 @@ </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${lutinutil.version}</version> + </dependency> + </dependencies> </plugin> <plugin> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> +  <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> + <configuration> + <addProjectClassPath>true</addProjectClassPath> + <addSourcesToClassPath>true</addSourcesToClassPath> + </configuration> <executions> <execution> <goals> @@ -166,15 +184,15 @@ </execution> </executions> <dependencies> - <dependency> +  <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> + <version>1.0.6</version> </dependency> </dependencies> </plugin> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -23,7 +23,7 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.i18n.I18n; +import org.nuiton.i18n.I18n; import org.codelutin.option.ContextProvider; import org.codelutin.option.ParserFailedException; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -35,7 +35,7 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; -import org.codelutin.i18n.I18n; +import org.nuiton.i18n.I18n; import org.codelutin.jaxx.action.ActionFactory; import org.codelutin.jaxx.action.ActionFactoryFromProvider; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -18,7 +18,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; -import org.codelutin.util.SimplePaginationEnum; +import org.nuiton.util.SimplePaginationEnum; import javax.swing.Action; import javax.swing.JComboBox; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -25,7 +25,7 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.LoginUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.JOptionPane; import javax.swing.JTabbedPane; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.JOptionPane; import java.awt.event.ActionEvent; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -20,8 +20,8 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.DownloadAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; -import static org.codelutin.i18n.I18n._; -import org.codelutin.util.FileUtil; +import static org.nuiton.i18n.I18n._; +import org.nuiton.util.FileUtil; import java.io.BufferedInputStream; import java.io.File; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -18,8 +18,8 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.DownloadAbstractAction; -import static org.codelutin.i18n.I18n._; -import org.codelutin.util.FileUtil; +import static org.nuiton.i18n.I18n._; +import org.nuiton.util.FileUtil; import java.io.BufferedInputStream; import java.io.File; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -26,7 +26,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.tab.SimExplorerAbstractTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n_; import org.codelutin.jaxx.tab.TabModel; import org.codelutin.jaxx.util.UIHelper; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -25,8 +25,8 @@ import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.ImportDialog; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.awt.event.ActionEvent; import java.io.File; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -25,8 +25,8 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.JAXXTab; import org.apache.commons.beanutils.Converter; -import org.codelutin.i18n.I18n; -import org.codelutin.util.ConverterUtil; +import org.nuiton.i18n.I18n; +import org.nuiton.util.ConverterUtil; import javax.swing.JComponent; import javax.swing.JTabbedPane; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -19,8 +19,8 @@ import fr.cemagref.simexplorer.is.entities.data.Descriptor; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import javax.swing.table.AbstractTableModel; import java.util.ArrayList; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -19,8 +19,8 @@ import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SortColumn; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import javax.swing.table.AbstractTableModel; import java.beans.BeanInfo; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -19,7 +19,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; -import org.codelutin.util.SimplePaginationEnum; +import org.nuiton.util.SimplePaginationEnum; import java.io.Serializable; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -27,7 +27,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.DefaultComboBoxModel; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx 2009-07-11 12:12:58 UTC (rev 1583) @@ -24,7 +24,7 @@ protected void chooseDir() { String type = (String) getTypeImport().getSelectedValue(); String[] filter = this.filters.get(type); - File dir= org.codelutin.util.FileUtil.getFile(filter==null?null:filter); + File dir= org.nuiton.util.FileUtil.getFile(filter==null?null:filter); if (dir!=null) { filePath.setText(dir.toString()); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2009-07-11 12:12:58 UTC (rev 1583) @@ -27,7 +27,7 @@ <JTextField id='searchText' toolTipText='simexplorer.action.searchText.tooltip'/> <JButton id='search'/> <JButton id='advancedSearch'/> - <org.codelutin.util.EnumEditor id='changeSizor' font-size='9' constructorParams="org.codelutin.util.SimplePaginationEnum.class" enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'/> + <org.nuiton.util.EnumEditor id='changeSizor' font-size='9' constructorParams="org.nuiton.util.SimplePaginationEnum.class" enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'/> </JToolBar> </cell> </row> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -22,7 +22,7 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.AbstractButton; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -26,7 +26,7 @@ import org.codelutin.jaxx.tab.TabFactory; import org.codelutin.jaxx.tab.TabModel; import jaxx.runtime.swing.JAXXTab; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.AbstractButton; import javax.swing.JComponent; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2009-07-11 12:12:58 UTC (rev 1583) @@ -61,7 +61,8 @@  <row> <cell fill="both"> - <org.codelutin.widget.StatusBar id='statusBar'/> + <jaxx.runtime.swing.StatusMessagePanel id='statusBar'/> +  </cell> </row> </Table> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFilePanel.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFilePanel.jaxx 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFilePanel.jaxx 2009-07-11 12:12:58 UTC (rev 1583) @@ -1,7 +1,7 @@ <Table> <script> protected void chooseDir() { - String dir= org.codelutin.util.FileUtil.getDirectory(); + String dir= org.nuiton.util.FileUtil.getDirectory(); if (dir!=null) { directory.setText(dir); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/resources/commandline.properties 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/resources/commandline.properties 2009-07-11 12:12:58 UTC (rev 1583) @@ -59,10 +59,10 @@ ### ### Application preferences ### -main.config.definition.localSizor=org.codelutin.util.SimplePaginationEnum:_5 +main.config.definition.localSizor=org.nuiton.util.SimplePaginationEnum:_5 main.config.modifiers.localSizor= -main.config.definition.remoteSizor=org.codelutin.util.SimplePaginationEnum:_20 +main.config.definition.remoteSizor=org.nuiton.util.SimplePaginationEnum:_20 main.config.modifiers.remoteSizor= main.config.definition.showLocalTab=java.lang.Boolean:True Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.InputStream; import java.text.SimpleDateFormat; Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -21,7 +21,7 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; -import org.codelutin.i18n.I18n; +import org.nuiton.i18n.I18n; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerSecurityException;

1 0

r1582 - in trunk/simexplorer-is: . simexplorer-is-entities simexplorer-is-security simexplorer-is-service simexplorer-is-storage simexplorer-is-swing simexplorer-is-web
by tchemit＠users.labs.libre-entreprise.org 11 Jul '09

11 Jul '09

Author: tchemit Date: 2009-07-11 11:05:59 +0000 (Sat, 11 Jul 2009) New Revision: 1582 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-entities/pom.xml trunk/simexplorer-is/simexplorer-is-security/pom.xml trunk/simexplorer-is/simexplorer-is-service/pom.xml trunk/simexplorer-is/simexplorer-is-storage/pom.xml trunk/simexplorer-is/simexplorer-is-swing/pom.xml trunk/simexplorer-is/simexplorer-is-web/pom.xml Log: migrate to nuiton : first stage (poms + plugins) Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -9,11 +9,11 @@   - <parent> +  <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is</artifactId> @@ -29,12 +29,12 @@ <module>simexplorer-is-ear</module> </modules> - <dependencies> +  <dependencyManagement> <dependencies> @@ -176,6 +176,20 @@  <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.6</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>2.3</version> @@ -237,6 +251,7 @@ <name>${project.artifactId}</name> <description>SimExplorer Information System</description> <inceptionYear>2008</inceptionYear> + <url>http://simexplorer-si.labs.libre-entreprise.org</url> <licenses> <license> @@ -272,12 +287,57 @@ <properties> -  +  <labs.id>130</labs.id> - -  <labs.project>simexplorer-si</labs.project> + <labs.list.host>lists.labs.libre-entreprise.org</labs.list.host> +  + +  + <maven.compile.source>1.6</maven.compile.source> + <maven.compile.target>1.6</maven.compile.target> + +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + +  + <maven.src.dir>${basedir}/src</maven.src.dir> + +  + <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> + +  + <maven.test.gen.dir>${project.build.directory}/generated-test-sources</maven.test.gen.dir> + +  + <maven.site.locales>fr</maven.site.locales> + +  + <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> + +  + <maven.test.skip>false</maven.test.skip> + +  + <maven.test.forkMode>once</maven.test.forkMode> + +  + <maven.reports.generate>true</maven.reports.generate> + +  + <maven.javadoc.skip>false</maven.javadoc.skip> + +  + <javadoc.version>2.4</javadoc.version> + +  + <license.licenseName>gpl_v3</license.licenseName> + +  + <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> +  <jaxx.version>1.3</jaxx.version> <commandline.version>1.0</commandline.version> @@ -291,50 +351,183 @@ <tapestry.version>5.0.11</tapestry.version> <jboss.version>4.2.2.GA</jboss.version> -  + </properties> + + <build> - <maven.scm.url> - http://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${project.artifactId}?root=${labs.project} - </maven.scm.url> + <pluginManagement> + <plugins> - <maven.scm.developerConnection> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/trunk/${project.artifactId} - </maven.scm.developerConnection> +  + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.3</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> - <maven.scm.connection> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/trunk/${project.artifactId} - </maven.scm.connection> +  + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <fork>true</fork> + <source>${maven.compile.source}</source> + <target>${maven.compile.target}</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> -  - <maven.scm.url.child> - http://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${project.parent.artifactId}/${project.artifactId}?root=${labs.project} - </maven.scm.url.child> +  + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <excludes> + <exclude>**/*MassTestCase.java</exclude> + </excludes> + <forkMode>once</forkMode> + <skip>${maven.test.skip}</skip> + <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> + </configuration> + </plugin> - <maven.scm.developerConnection.child> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/trunk/${project.parent.artifactId}/${project.artifactId} - </maven.scm.developerConnection.child> +  + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <silent>true</silent> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> - <maven.scm.connection.child> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/trunk/${project.parent.artifactId}/${project.artifactId} - </maven.scm.connection.child> +  + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <inherited>true</inherited> - </properties> + <configuration> + <archive> +  +  + <manifest> + <mainClass>${maven.jar.main.class}</mainClass> + </manifest> + <manifestEntries> + <url>${pom.url}</url> + </manifestEntries> + <index>false</index> + </archive> + </configuration> + </plugin> - <build> -  -  +  + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.1</version> + <inherited>true</inherited> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> - <pluginManagement> - <plugins> +  + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <docencoding>${project.reporting.outputEncoding}</docencoding> + <encoding>${project.reporting.outputEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> + <quiet>true</quiet> + <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <attach>true</attach> + <quiet>true</quiet> +  +  + </configuration> + </execution> + </executions> + </plugin> + +  <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.0</version> + <configuration> + <inputEncoding>${project.reporting.outputEncoding}</inputEncoding> + <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> + <generateReports>${maven.reports.generate}</generateReports> + <locales>fr</locales> + <attach>false</attach> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.2-rc-1</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-9</version> + </plugin> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5</version> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-4</version> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + + <plugin> <artifactId>maven-ejb-plugin</artifactId> <configuration> <ejbVersion>3.0</ejbVersion> </configuration> </plugin> - <plugin> +  <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>1.0.0-rc-4</version> +  <configuration> - <skip>${maven.test.skip}</skip> - <excludes> - <exclude>**/*MassTestCase.java</exclude> - </excludes> + <bundles>fr_FR</bundles> </configuration> </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + </plugin> + </plugins> </pluginManagement> + + </build> + +  + <reporting> <plugins> -  +  <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> +  + <artifactId>maven-project-info-reports-plugin</artifactId> +  + <version>2.1.1-cl</version> + <reportSets> + <reportSet> + <reports> + <report>summary</report> + <report>license</report> + <report>cim</report> + <report>scm</report> + <report>mailing-list</report> +  + <report>project-team</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> <configuration> - <defaultLocale>fr</defaultLocale> + <quiet>true</quiet> + <docencoding>${project.build.sourceEncoding}</docencoding> + <encoding>${project.build.sourceEncoding}</encoding> + <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> </configuration> - <executions> - <execution> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> </plugin> + + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.4.3</version> + </plugin> + </plugins> - - </build> + </reporting>    +  + <prerequisites> + <maven>[2.0.10,)</maven> + </prerequisites> + + <ciManagement> + <system>hudson</system> + <url>http://hudson.nuiton.org</url> + </ciManagement> + +  + <mailingLists> + + <mailingList> + <name>${projectId}-commits</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-commits</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-commits</unsubscribe> + <post>${projectId}-commits(a)${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-commits/</archive> + </mailingList> + + <mailingList> + <name>${projectId}-devel</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</unsubscribe> + <post>${projectId}-devel(a)${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> + </mailingList> + + <mailingList> + <name>${projectId}-users</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-users</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-users</unsubscribe> + <post>${projectId}-users(a)${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-users/</archive> + </mailingList> + + </mailingLists> + +  + <distributionManagement> + <repository> + <id>codelutin</id> + <url>scpexe://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> + </repository> + <site> + <id>codelutin</id> + <url>scpexe://labs.libre-entreprise.org/home/groups/observe/htdocs/observe</url> + </site> + </distributionManagement> + <scm> - <url>${maven.scm.url}</url> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/simexplorer-si/trunk/simexplorer-is</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/simexplorer-si/trunk/simexplorer-is</developerConnection> +  </scm> <repositories> -  +  <repository> <id>SEIS-codelutin</id> <name>CodeLutinRepository</name> @@ -410,7 +693,37 @@ </releases> </repository> +  + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + +  + + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + + <repository> <id>SEIS-java.net</id> <url>http://download.java.net/maven/2</url> </repository> @@ -424,7 +737,68 @@ </repositories> + <pluginRepositories> + +  + + <pluginRepository> + + <id>labs.release</id> + <name>LabsReleaseRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> +  + + <pluginRepository> + + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + +  + + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + + </pluginRepositories> + <profiles> +  + <profile> + <id>notests</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + </profile> +  <profile> <id>release-profile</id> @@ -435,24 +809,140 @@ </property> </activation> <build> + <plugins> + +  + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>validate-project</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>initialize</phase> + </execution> + </executions> + <configuration> + <rules> + <requireFilesExist> + <files> + <file>changelog.txt</file> + <file>LICENSE.txt</file> + <file>README.txt</file> + </files> + </requireFilesExist> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + + </configuration> + </plugin> + +  + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + </execution> + </executions> + </plugin> + +  + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + </execution> + </executions> + </plugin> +  <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> <executions> <execution> <id>attach-licenses</id> <goals> - <goal>license</goal> - <goal>third-party</goal> + <goal>add-license</goal> + <goal>add-third-party</goal> </goals> </execution> </executions> </plugin> + </plugins> + </build> </profile> + +  + <profile> + <id>run</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <defaultGoal>compile</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>run</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>initialize</phase> + <configuration> + <rules> + <requireProperty> + <property>maven.jar.main.class</property> + <message>Could not find the "maven.jar.main.class" required property, use + -Dmaven.jar.main.class=your.main.class.fqn + </message> + </requireProperty> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>run</id> + <goals> + <goal>java</goal> + </goals> + <phase>compile</phase> + <configuration> + <mainClass>${maven.jar.main.class}</mainClass> + <classpathScope>runtime</classpathScope> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + <properties> + <exec.mainClass>${maven.jar.main.class}</exec.mainClass> + <exec.classpathScope>runtime</exec.classpathScope> + </properties> + </profile> + </profiles> + </project> Modified: trunk/simexplorer-is/simexplorer-is-entities/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -17,10 +17,15 @@ <artifactId>simexplorer-is-entities</artifactId> <dependencies> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> </dependencies>  @@ -39,7 +44,8 @@ <build> <plugins> <plugin> - <groupId>org.codelutin</groupId> +  + <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> @@ -52,15 +58,5 @@ </plugin> </plugins> </build> - -  -  -  - - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - + </project> Modified: trunk/simexplorer-is/simexplorer-is-security/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-security/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -36,6 +36,11 @@ <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> +  <dependency> @@ -101,13 +106,7 @@   - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - - <repositories> +  </project> Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-service/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -79,6 +79,11 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies>  @@ -102,7 +107,8 @@ <build> <plugins> <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton.i18n</groupId> +  <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> @@ -116,16 +122,6 @@ </plugins> </build> -  -  -  - - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - <repositories>  <repository> Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -41,6 +41,12 @@ <groupId>jboss</groupId> <artifactId>jboss-ejb3x</artifactId> </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> @@ -64,14 +70,4 @@ </properties> -  -  -  - - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - </project> \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -74,6 +74,11 @@ <artifactId>lutinwidget</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies>  @@ -175,7 +180,8 @@ </plugin> <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton.i18n</groupId> +  <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> @@ -233,29 +239,26 @@ </configuration> </execution> </executions> - <dependencies> +  </plugin> <plugin> <artifactId>maven-dependency-plugin</artifactId> - <configuration> +  <executions> <execution> - <goals> - <goal>copy-dependencies</goal> - </goals> + <id>copy-dependencies</id> </execution> </executions> </plugin> @@ -282,12 +285,6 @@   - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - <pluginRepositories> <pluginRepository> <id>evolvis-release-repository</id> Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -63,7 +63,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>servlet-api</artifactId> </dependency>  @@ -96,7 +96,7 @@  <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> +  <configuration> <warSourceDirectory>${basedir}/src/main/webapp</warSourceDirectory> <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> @@ -134,14 +134,4 @@ </plugins> </build> -  -  -  - - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - </project> \ No newline at end of file

1 0

r1581 - tags
by tchemit＠users.labs.libre-entreprise.org 11 Jul '09

11 Jul '09

Author: tchemit Date: 2009-07-11 09:12:23 +0000 (Sat, 11 Jul 2009) New Revision: 1581 Added: tags/simexplorer-is-before_nuiton_migration_20090711/ Log: tag before nuiton storm Copied: tags/simexplorer-is-before_nuiton_migration_20090711 (from rev 1580, trunk/simexplorer-is)

1 0

r1580 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 11 Jul '09

11 Jul '09

Author: tchemit Date: 2009-07-11 09:10:00 +0000 (Sat, 11 Jul 2009) New Revision: 1580 Modified: trunk/simexplorer-is/pom.xml Log: bump versions before migration to nuiton Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2009-04-23 01:29:25 UTC (rev 1579) +++ trunk/simexplorer-is/pom.xml 2009-07-11 09:10:00 UTC (rev 1580) @@ -169,7 +169,8 @@ <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>t5c-commons</artifactId> - <version>0.5.11</version> + <version>0.5.15</version> +  </dependency>  @@ -332,9 +333,23 @@ <ejbVersion>3.0</ejbVersion> </configuration> </plugin> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + </dependency> + </dependencies> + </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> <configuration> <skip>${maven.test.skip}</skip> <excludes> @@ -343,13 +358,6 @@ </configuration> </plugin> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <useProjectReferences>true</useProjectReferences> - </configuration> - </plugin> - </plugins> </pluginManagement> @@ -410,7 +418,8 @@ <repository> <id>SEIS-t5components</id> <name>T5Components Maven Repository</name> - <url>http://87.193.218.134:8080/t5components/maven-repository</url> + <url>http://mp2.crecg.com/m2_repo</url> +  </repository> </repositories>

1 0