November 2011 - Echobase-commits - mailman.cloud.codelutin.com

r69 - in trunk: . echobase-entities echobase-services echobase-ui
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 09:20:11 +0100 (Mon, 14 Nov 2011) New Revision: 69 Url: http://forge.codelutin.com/repositories/revision/echobase/69 Log: [maven-release-plugin] rollback the release of echobase-0.1 Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-14 08:16:57 UTC (rev 68) +++ trunk/echobase-entities/pom.xml 2011-11-14 08:20:11 UTC (rev 69) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-14 08:16:57 UTC (rev 68) +++ trunk/echobase-services/pom.xml 2011-11-14 08:20:11 UTC (rev 69) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-14 08:16:57 UTC (rev 68) +++ trunk/echobase-ui/pom.xml 2011-11-14 08:20:11 UTC (rev 69) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-14 08:16:57 UTC (rev 68) +++ trunk/pom.xml 2011-11-14 08:20:11 UTC (rev 69) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <modules> <module>echobase-entities</module>

1 0

r68 - in trunk: . echobase-entities echobase-services echobase-ui
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 09:16:57 +0100 (Mon, 14 Nov 2011) New Revision: 68 Url: http://forge.codelutin.com/repositories/revision/echobase/68 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-14 08:16:56 UTC (rev 67) +++ trunk/echobase-entities/pom.xml 2011-11-14 08:16:57 UTC (rev 68) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-14 08:16:56 UTC (rev 67) +++ trunk/echobase-services/pom.xml 2011-11-14 08:16:57 UTC (rev 68) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-14 08:16:56 UTC (rev 67) +++ trunk/echobase-ui/pom.xml 2011-11-14 08:16:57 UTC (rev 68) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-14 08:16:56 UTC (rev 67) +++ trunk/pom.xml 2011-11-14 08:16:57 UTC (rev 68) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> <modules> <module>echobase-entities</module> @@ -79,11 +79,11 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1</url> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 + scm:svn:http://svn.forge.codelutin.com/svn/echobase </developerConnection> </scm>

1 0

r67 - tags
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 09:16:56 +0100 (Mon, 14 Nov 2011) New Revision: 67 Url: http://forge.codelutin.com/repositories/revision/echobase/67 Log: [maven-release-plugin] copy for tag echobase-0.1 Added: tags/echobase-0.1/

1 0

r66 - in trunk: . echobase-entities echobase-services echobase-ui
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 09:16:54 +0100 (Mon, 14 Nov 2011) New Revision: 66 Url: http://forge.codelutin.com/repositories/revision/echobase/66 Log: [maven-release-plugin] prepare release echobase-0.1 Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-14 08:15:42 UTC (rev 65) +++ trunk/echobase-entities/pom.xml 2011-11-14 08:16:54 UTC (rev 66) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-14 08:15:42 UTC (rev 65) +++ trunk/echobase-services/pom.xml 2011-11-14 08:16:54 UTC (rev 66) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-14 08:15:42 UTC (rev 65) +++ trunk/echobase-ui/pom.xml 2011-11-14 08:16:54 UTC (rev 66) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-14 08:15:42 UTC (rev 65) +++ trunk/pom.xml 2011-11-14 08:16:54 UTC (rev 66) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> <modules> <module>echobase-entities</module> @@ -79,11 +79,11 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 </developerConnection> </scm>

1 0

r65 - in trunk: . echobase-entities echobase-services echobase-ui
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 09:15:42 +0100 (Mon, 14 Nov 2011) New Revision: 65 Url: http://forge.codelutin.com/repositories/revision/echobase/65 Log: back to 0.1-SNAPSHOT version Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-14 08:13:57 UTC (rev 64) +++ trunk/echobase-entities/pom.xml 2011-11-14 08:15:42 UTC (rev 65) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-14 08:13:57 UTC (rev 64) +++ trunk/echobase-services/pom.xml 2011-11-14 08:15:42 UTC (rev 65) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-14 08:13:57 UTC (rev 64) +++ trunk/echobase-ui/pom.xml 2011-11-14 08:15:42 UTC (rev 65) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-14 08:13:57 UTC (rev 64) +++ trunk/pom.xml 2011-11-14 08:15:42 UTC (rev 65) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <modules> <module>echobase-entities</module>

1 0

r64 - tags
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 09:13:57 +0100 (Mon, 14 Nov 2011) New Revision: 64 Url: http://forge.codelutin.com/repositories/revision/echobase/64 Log: wrong release Removed: tags/echobase-0.1/

1 0

r63 - in trunk: . echobase-entities echobase-services echobase-ui
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 08:59:48 +0100 (Mon, 14 Nov 2011) New Revision: 63 Url: http://forge.codelutin.com/repositories/revision/echobase/63 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-14 07:59:47 UTC (rev 62) +++ trunk/echobase-entities/pom.xml 2011-11-14 07:59:48 UTC (rev 63) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-14 07:59:47 UTC (rev 62) +++ trunk/echobase-services/pom.xml 2011-11-14 07:59:48 UTC (rev 63) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-14 07:59:47 UTC (rev 62) +++ trunk/echobase-ui/pom.xml 2011-11-14 07:59:48 UTC (rev 63) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-14 07:59:47 UTC (rev 62) +++ trunk/pom.xml 2011-11-14 07:59:48 UTC (rev 63) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> <modules> <module>echobase-entities</module> @@ -79,11 +79,11 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1</url> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 + scm:svn:http://svn.forge.codelutin.com/svn/echobase </developerConnection> </scm>

1 0

r62 - tags
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 08:59:47 +0100 (Mon, 14 Nov 2011) New Revision: 62 Url: http://forge.codelutin.com/repositories/revision/echobase/62 Log: [maven-release-plugin] copy for tag echobase-0.1 Added: tags/echobase-0.1/

1 0

r61 - in trunk: . echobase-entities echobase-services echobase-ui
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 08:59:46 +0100 (Mon, 14 Nov 2011) New Revision: 61 Url: http://forge.codelutin.com/repositories/revision/echobase/61 Log: [maven-release-plugin] prepare release echobase-0.1 Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-14 07:54:41 UTC (rev 60) +++ trunk/echobase-entities/pom.xml 2011-11-14 07:59:46 UTC (rev 61) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>  @@ -11,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-14 07:54:41 UTC (rev 60) +++ trunk/echobase-services/pom.xml 2011-11-14 07:59:46 UTC (rev 61) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-14 07:54:41 UTC (rev 60) +++ trunk/echobase-ui/pom.xml 2011-11-14 07:59:46 UTC (rev 61) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -13,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-14 07:54:41 UTC (rev 60) +++ trunk/pom.xml 2011-11-14 07:59:46 UTC (rev 61) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> <modules> <module>echobase-entities</module> @@ -81,11 +79,11 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 </developerConnection> </scm>

1 0

r60 - in trunk: . echobase-entities echobase-services echobase-ui echobase-ui/src/main/webapp
by tchemit＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: tchemit Date: 2011-11-14 08:54:41 +0100 (Mon, 14 Nov 2011) New Revision: 60 Url: http://forge.codelutin.com/repositories/revision/echobase/60 Log: mise ne place du war autoexecutable optimize dependencies Added: trunk/echobase-ui/src/main/webapp/favicon.png Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-13 22:47:30 UTC (rev 59) +++ trunk/echobase-entities/pom.xml 2011-11-14 07:54:41 UTC (rev 60) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>  @@ -24,26 +26,26 @@ <artifactId>nuiton-i18n</artifactId> </dependency> -   -  <dependency> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-13 22:47:30 UTC (rev 59) +++ trunk/echobase-services/pom.xml 2011-11-14 07:54:41 UTC (rev 60) @@ -38,10 +38,10 @@ <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> +   @@ -65,15 +65,15 @@ <artifactId>commons-logging</artifactId> </dependency> -  + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> <dependency> <groupId>com.google.guava</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-13 22:47:30 UTC (rev 59) +++ trunk/echobase-ui/pom.xml 2011-11-14 07:54:41 UTC (rev 60) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -80,7 +82,6 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> - <scope>compile</scope> </dependency> <dependency> @@ -90,6 +91,11 @@ </dependency> <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> @@ -120,10 +126,10 @@ <artifactId>commons-collections</artifactId> </dependency> -  + </dependency> <dependency> <groupId>commons-beanutils</groupId> @@ -281,6 +287,32 @@ </webAppConfig> </configuration> </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <type>jar</type> + <includes> + <include>**/war/Jetty*</include> + </includes> + </overlay> + <overlay> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> </plugins> </pluginManagement> </build> Copied: trunk/echobase-ui/src/main/webapp/favicon.png (from rev 51, trunk/echobase-ui/src/main/webapp/images/logo_codelutin.png) =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-13 22:47:30 UTC (rev 59) +++ trunk/pom.xml 2011-11-14 07:54:41 UTC (rev 60) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -80,7 +82,8 @@ <scm> <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk</connection> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + </connection> <developerConnection> scm:svn:http://svn.forge.codelutin.com/svn/echobase </developerConnection> @@ -118,7 +121,11 @@ <h2Version>1.3.157</h2Version> <postgresqlVersion>9.0-801.jdbc4</postgresqlVersion> <slf4jVersion>1.6.1</slf4jVersion> + <jettyVersion>7.5.3.v20111011</jettyVersion> +  +  + <hibernateVersion>3.6.8.Final</hibernateVersion> <googleSearchEnabled>true</googleSearchEnabled>  @@ -214,6 +221,12 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> +  <dependency> @@ -288,6 +301,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>${jettyVersion}</version> + <scope>provided</scope> + </dependency> +  <dependency> @@ -394,7 +414,7 @@ </reporting> <profiles> - + <profile> <id>central-safe</id> <activation>

1 0