Author: glandais Date: 2008-03-04 17:25:07 +0000 (Tue, 04 Mar 2008) New Revision: 1284 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-ear/pom.xml trunk/simexplorer-is/simexplorer-is-web/pom.xml trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java Log: Maven depedencies upgrade Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/pom.xml 2008-03-04 17:25:07 UTC (rev 1284) @@ -64,6 +64,39 @@ </profile> </profiles> + <repositories> + <repository> + <id>SEIS-java.net</id> + <url>http://download.java.net/maven/2</url> + </repository> + <repository> + <id>SEIS-codelutin-lib</id> + <url> + http://lutinbuilder.labs.libre-entreprise.org/maven2 + </url> + </repository> + <repository> + <id>SEIS-openhms</id> + <url>http://open.hmsonline.com/repo/maven2</url> + </repository> + <repository> + <id>SEIS-t5components</id> + <name>T5Components Maven Repository</name> + <url> + http://213.160.23.119:8080/t5components/maven-repository + </url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>SEIS-codelutin-plugin</id> + <url> + http://lutinbuilder.labs.libre-entreprise.org/maven2 + </url> + </pluginRepository> + </pluginRepositories> + <!--Tracking--> <issueManagement> <url> @@ -88,13 +121,6 @@ </site> </distributionManagement> - <repositories> - <repository> - <id>repository.jboss.com</id> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - <build> <plugins> <plugin> Modified: trunk/simexplorer-is/simexplorer-is-ear/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-ear/pom.xml 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-ear/pom.xml 2008-03-04 17:25:07 UTC (rev 1284) @@ -42,7 +42,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>${tapestry.version}</version> + <version>${tapestry.version}.1</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> @@ -60,11 +60,11 @@ <version>${tapestry.version}</version> </dependency> <dependency> - <groupId>de.hsofttec.t5components</groupId> - <artifactId>t5components</artifactId> - <version>0.5.6</version> + <groupId>org.apache.tapestry</groupId> + <artifactId>t5c-commons</artifactId> + <version>0.5.10</version> </dependency> - + <dependency> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-service</artifactId> Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-04 17:25:07 UTC (rev 1284) @@ -17,15 +17,6 @@ <artifactId>simexplorer-is</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <repositories> - <repository> - <id>t5components</id> - <name>T5Components Maven Repository</name> - <url> - http://213.160.23.119:8080/t5components/maven-repository - </url> - </repository> - </repositories> <build> <plugins> <!--WebApp in JAR --> @@ -76,22 +67,22 @@ <artifactId>maven-i18n-plugin</artifactId> <version>0.2-SNAPSHOT</version> <configuration> - <bundles> - <param>fr_FR</param> - <param>en_GB</param> - </bundles> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> </configuration> <executions> - <execution> - <phase>compile</phase> - <id>java</id> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> + <execution> + <phase>compile</phase> + <id>java</id> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> </executions> - </plugin--> + </plugin--> </plugins> </build> @@ -105,7 +96,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>${tapestry.version}</version> + <version>${tapestry.version}.1</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> @@ -123,9 +114,9 @@ <version>${tapestry.version}</version> </dependency> <dependency> - <groupId>de.hsofttec.t5components</groupId> - <artifactId>t5components</artifactId> - <version>0.5.6</version> + <groupId>org.apache.tapestry</groupId> + <artifactId>t5c-commons</artifactId> + <version>0.5.10</version> </dependency> <dependency> <groupId>jboss</groupId> @@ -133,12 +124,12 @@ <version>4.2.2.GA</version> <scope>provided</scope> </dependency> - <dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>5.1</version> <classifier>jdk15</classifier> <scope>test</scope> </dependency> - </dependencies> + </dependencies> </project> \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-03-04 17:25:07 UTC (rev 1284) @@ -22,10 +22,10 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-03-04 17:25:07 UTC (rev 1284) @@ -18,16 +18,16 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import org.apache.tapestry.annotations.InjectPage; +import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.upload.services.UploadedFile; import com.healthmarketscience.rmiio.SerializableInputStream; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; +import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; -import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; /** * The Class ElementImport. Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-03-04 17:25:07 UTC (rev 1284) @@ -25,10 +25,10 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java 2008-03-04 17:25:07 UTC (rev 1284) @@ -28,10 +28,10 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Actor; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-03-04 17:25:07 UTC (rev 1284) @@ -20,10 +20,10 @@ import org.apache.tapestry.ComponentResources; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-03-04 17:25:07 UTC (rev 1284) @@ -17,10 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.List; +import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.ioc.services.ExceptionAnalysis; @@ -28,7 +27,6 @@ import org.apache.tapestry.ioc.services.ExceptionInfo; import org.apache.tapestry.services.ExceptionReporter; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-04 17:25:07 UTC (rev 1284) @@ -21,14 +21,14 @@ import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; -import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; import fr.cemagref.simexplorer.is.ui.web.tools.ModelFactory; /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-04 17:25:07 UTC (rev 1284) @@ -28,10 +28,10 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Group; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-03-04 14:50:10 UTC (rev 1283) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-03-04 17:25:07 UTC (rev 1284) @@ -21,14 +21,14 @@ import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; -import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; import fr.cemagref.simexplorer.is.ui.web.tools.ModelFactory; /**