Author: tchemit Date: 2009-02-06 09:03:51 +0000 (Fri, 06 Feb 2009) New Revision: 42 Added: lutinj2r/trunk/changelog.txt lutinj2r/trunk/src/main/assembly/ lutinj2r/trunk/src/main/assembly/deps.xml lutinj2r/trunk/src/main/assembly/full.xml Removed: lutinj2r/trunk/changelog Modified: lutinj2r/trunk/ lutinj2r/trunk/pom.xml Log: use lutinproject 3.4, make assembly Property changes on: lutinj2r/trunk ___________________________________________________________________ Name: svn:ignore - target .classpath .project .settings + target .classpath .project .settings lutinj2r.iml lutinj2r.ipr Deleted: lutinj2r/trunk/changelog =================================================================== --- lutinj2r/trunk/changelog 2009-02-06 09:02:39 UTC (rev 41) +++ lutinj2r/trunk/changelog 2009-02-06 09:03:51 UTC (rev 42) @@ -1,9 +0,0 @@ -lutinj2r (0.2) unstable; urgency=low - - * LGPL v3 - * Update site generation - * Maven2 layout - * UTF-8 - * Update pom - - -- chatellier -- mar sep 23 18:16:41 CEST 2008 \ No newline at end of file Copied: lutinj2r/trunk/changelog.txt (from rev 40, lutinj2r/trunk/changelog) =================================================================== --- lutinj2r/trunk/changelog.txt (rev 0) +++ lutinj2r/trunk/changelog.txt 2009-02-06 09:03:51 UTC (rev 42) @@ -0,0 +1,12 @@ +lutinj2r (0.3) unstable; urgency=low + * use lutinproject 3.4 + +lutinj2r (0.2) unstable; urgency=low + + * LGPL v3 + * Update site generation + * Maven2 layout + * UTF-8 + * Update pom + + -- chatellier -- mar sep 23 18:16:41 CEST 2008 \ No newline at end of file Modified: lutinj2r/trunk/pom.xml =================================================================== --- lutinj2r/trunk/pom.xml 2009-02-06 09:02:39 UTC (rev 41) +++ lutinj2r/trunk/pom.xml 2009-02-06 09:03:51 UTC (rev 42) @@ -1,57 +1,28 @@ -<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/maven-v4_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/maven-v4_0_0.xsd"> - <!--The version of maven's project object model--> <modelVersion>4.0.0</modelVersion> - <!--lutinproject.xml--> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.1</version> + <version>3.4-SNAPSHOT</version> </parent> - <!--A unique name for this project--> <artifactId>lutinj2r</artifactId> - <name>Lutin Java-2-R library</name> - - <!--ejb, jar, war...--> - <packaging>jar</packaging> - - <!--Version--> <version>0.3-SNAPSHOT</version> - <!--Description--> - <description>Librairie permettant d'utiliser R en Java, que ce soit par le - Network ou en JNI.</description> - <inceptionYear>2006</inceptionYear> - - <!-- Properties --> - <properties> - <!-- id du projet du labs --> - <labs.id>109</labs.id> - - <!-- Test --> - <maven.test.skip>true</maven.test.skip> - - <!-- Jar main class --> - <maven.jar.main.class>org.codelutin.j2r.RProxy</maven.jar.main.class> - </properties> - - <!--Source control management--> - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - - <!--Librairies--> <dependencies> - <dependency> + <!--dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1.1</version> <scope>compile</scope> - </dependency> + </dependency--> <dependency> <groupId>externallib</groupId> <artifactId>JRclient</artifactId> @@ -65,4 +36,141 @@ <scope>compile</scope> </dependency> </dependencies> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>Lutin Java-2-R library</name> + <description>Librairie permettant d'utiliser R en Java, que ce soit par le + Network ou en JNI. + </description> + <inceptionYear>2006</inceptionYear> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + + <properties> + <!-- id du projet du labs --> + <labs.id>109</labs.id> + + <labs.name>lutinj2r</labs.name> + + <!-- FIXME --> + <maven.test.skip>true</maven.test.skip> + + <!-- Jar main class --> + <!--maven.jar.main.class>org.codelutin.j2r.RProxy</maven.jar.main.class--> + </properties> + + <build> + <defaultGoal>install</defaultGoal> + + <plugins> + + <!-- Always process jrst files, but only called on pre-site phase --> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <id>create-assembly</id> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + + </build> + + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> + + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assembly</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + + <!-- always add license and third-party files to classpath --> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + </project> \ No newline at end of file Added: lutinj2r/trunk/src/main/assembly/deps.xml =================================================================== --- lutinj2r/trunk/src/main/assembly/deps.xml (rev 0) +++ lutinj2r/trunk/src/main/assembly/deps.xml 2009-02-06 09:03:51 UTC (rev 42) @@ -0,0 +1,34 @@ +<assembly> + <id>deps</id> + <formats> + <format>zip</format> + </formats> + <!-- This don't support SNAPSHOT --> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>junit:junit</exclude> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> + <!--source>target/${artifact.artifactId}-${artifact.version}.jar</source--> + <source>target/${project.build.finalName}.jar</source> + </file> + <file> + <source>target/classes/THIRD-PARTY.txt</source> + </file> + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: lutinj2r/trunk/src/main/assembly/full.xml =================================================================== --- lutinj2r/trunk/src/main/assembly/full.xml (rev 0) +++ lutinj2r/trunk/src/main/assembly/full.xml 2009-02-06 09:03:51 UTC (rev 42) @@ -0,0 +1,38 @@ +<assembly> + <id>full</id> + <formats> + <format>zip</format> + </formats> + <!-- This don't support SNAPSHOT --> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> + <!--source>target/${artifact.artifactId}-${artifact.version}.jar</source--> + <source>target/${project.build.finalName}.jar</source> + </file> + <file> + <source>target/classes/THIRD-PARTY.txt</source> + </file> + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file