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> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>fr.ird</groupId> <artifactId>msaccess-importer</artifactId> </dependency--> <!-- comons dependencies --> - <!--dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> </dependency> <dependency> @@ -51,6 +53,11 @@ <artifactId>commons-lang3</artifactId> </dependency> + <!--dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -68,6 +75,11 @@ <artifactId>topia-persistence</artifactId> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <!-- test dependencies --> <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> + <!--dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> - </dependency> + </dependency--> <!-- comons dependencies --> @@ -65,15 +65,15 @@ <artifactId>commons-logging</artifactId> </dependency> - <!--dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</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>org.apache.commons</groupId> <artifactId>commons-lang3</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> + <!-- This version does not work (missing javax.el api in overlay) --> + <!--<jettyVersion>8.0.1.v20110908</jettyVersion>--> + <hibernateVersion>3.6.8.Final</hibernateVersion> <googleSearchEnabled>true</googleSearchEnabled> <!-- license header configuration --> @@ -214,6 +221,12 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> + <!-- base postgres --> <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> + <!-- loggin libraries --> <dependency> @@ -394,7 +414,7 @@ </reporting> <profiles> - + <profile> <id>central-safe</id> <activation>