Author: tchemit Date: 2011-09-09 18:14:41 +0200 (Fri, 09 Sep 2011) New Revision: 3288 Url: http://chorem.org/repositories/revision/lima/3288 Log: use new site deployment configuration Modified: trunk/lima-business/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-09-09 16:10:08 UTC (rev 3287) +++ trunk/lima-business/pom.xml 2011-09-09 16:14:41 UTC (rev 3288) @@ -1,4 +1,6 @@ -<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> <!-- ************************************************************* --> @@ -18,7 +20,7 @@ <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> <scope>provided</scope> - </dependency> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>lima-callao</artifactId> @@ -104,7 +106,7 @@ <properties> <!--Main class in JAR --> <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> - + <redmine.releaseFiles> target/lima-server-${project.version}-bin.zip, </redmine.releaseFiles> @@ -173,7 +175,7 @@ </plugin> </plugins> </build> - + <profiles> <profile> <id>assembly-profile</id> @@ -189,9 +191,9 @@ <artifactId>maven-assembly-plugin</artifactId> <configuration> <finalName>lima-server-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> <attach>false</attach> </configuration> <executions> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-09-09 16:10:08 UTC (rev 3287) +++ trunk/lima-swing/pom.xml 2011-09-09 16:14:41 UTC (rev 3288) @@ -128,7 +128,8 @@ <properties> <!--Main class in JAR --> <maven.jar.main.class>org.chorem.lima.LimaMain</maven.jar.main.class> - + <webstartPluginVersion>1.0-beta-2-SNAPSHOT</webstartPluginVersion> + <redmine.releaseFiles> target/lima-${project.version}-bin.zip, </redmine.releaseFiles> @@ -139,7 +140,8 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.bundleOutputName>lima</i18n.bundleOutputName> - + <jnlp.codebase>${project.url}/jnlp</jnlp.codebase> + </properties> <build> @@ -245,18 +247,31 @@ </plugin> <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> <configuration> + <libPath>lib</libPath> + <makeArchive>false</makeArchive> + <verbose>false</verbose> + + <jnlp> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + <sign> + <keystore>${keystorepath}</keystore> + <storepass>${keystorepass}</storepass> + <alias>${keyalias}</alias> + <keypass>${keypass}</keypass> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> <jnlpExtensions> - <!--jnlpExtension> - <name>sun</name> - <title>Sun MicroSystems</title> - <vendor>Sun MicroSystems, Inc.</vendor> - <includes> - <include>javax.help:javahelp</include> - </includes> - </jnlpExtension--> <jnlpExtension> <name>jxlayer</name> <title>Swing labs JXLayer</title> @@ -289,9 +304,9 @@ <reporting> <plugins> <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20091001</version> + <version>${webstartPluginVersion}</version> </plugin> </plugins> </reporting> @@ -332,7 +347,7 @@ </plugin> <!-- make webstart --> <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> @@ -348,7 +363,62 @@ </build> </profile> + <!-- just add to buil the local webstart (codebase will be in target/jnlp) --> <profile> + <id>local-jnlp-profile</id> + <activation> + <property> + <name>doLocalWebstart</name> + <value>true</value> + </property> + </activation> + <properties> + <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase> + </properties> + <build> + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp-local</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + + <profile> <id>assembly-profile</id> <activation> <property> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:10:08 UTC (rev 3287) +++ trunk/pom.xml 2011-09-09 16:14:41 UTC (rev 3288) @@ -210,7 +210,6 @@ <version>1.5.0</version> </dependency> - </dependencies> </dependencyManagement> @@ -378,6 +377,13 @@ <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + <repositories> <!-- depot des releases nuiton --> <!--repository>