diff --git a/.gitignore b/.gitignore
index 7dcecb8715c3d0105a16d998a4d8ce01ffed2a18..4b9a987df90d33683e2399715cf3910c965a0d33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ bin
.project
.settings
target
-geotiff/target
-geotiff/src/test/resources/org/orekit/rugged/geotiff/ASTGTM2_*.zip
+core/target
+aster/target
+aster/src/test/resources/org/orekit/rugged/geotiff/ASTGTM2_*.zip
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0ba691d9c9fa2252b01e5b86bea2bcb6d0117758
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,94 @@
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.orekit</groupId>
+ <artifactId>rugged-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>rugged-core</artifactId>
+ <packaging>bundle</packaging>
+ <name>Rugged Core Engine</name>
+
+ <inceptionYear>2014</inceptionYear>
+ <description>
+ This module is the core engine for Rugged,
+ an Orekit add-on handling Digital Elevation Models
+ contribution to line of sight computation
+ </description>
+
+ <developers>
+ <developer>
+ <name>Luc Maisonobe</name>
+ <id>luc</id>
+ <roles>
+ <role>architect</role>
+ <role>developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Aude Espesset</name>
+ </contributor>
+ </contributors>
+
+ <organization>
+ <name>CS Systèmes d'Information</name>
+ <url>http://www.c-s.fr/</url>
+ </organization>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.orekit</groupId>
+ <artifactId>orekit</artifactId>
+ <version>7.0-SNAPSHOT</version>
+ <type>jar</type>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.3</version>
+ <type>jar</type>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <type>jar</type>
+ <scope>test</scope>
+ <optional>false</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${rugged.maven-bundle-plugin.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.orekit.rugged.api.*;version=${project.version};-noimport:=true</Export-Package>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 47a438c70dc9250491f1e7bf1a75cba4735d6af2..ab3fa52f25b8f5ad701ef8e00b6574f14040e2d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,14 @@
<module>aster</module>
</modules>
+ <distributionManagement>
+ <site>
+ <id>rugged.website</id>
+ <name>Rugged Website</name>
+ <url>https://www.orekit.org/rugged/static/</url>
+ </site>
+ </distributionManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -89,156 +97,168 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${rugged.maven-compiler-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<version>${rugged.maven-jar-plugin.version}</version>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${rugged.maven-assembly-plugin.version}</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/source-assembly.xml</descriptor>
- <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${rugged.maven-resources-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>${rugged.maven-clean-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${rugged.jacoco-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <phase>site</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- <execution>
- <id>check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <rules>
- <rule>
- <element>BUNDLE</element>
- <limits>
- <limit>
- <counter>CLASS</counter>
- <value>COVEREDRATIO</value>
- <minimum>1.00</minimum>
- </limit>
- <limit>
- <counter>INSTRUCTION</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.90</minimum>
- </limit>
- <limit>
- <counter>METHOD</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.95</minimum>
- </limit>
- <limit>
- <counter>BRANCH</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.85</minimum>
- </limit>
- <limit>
- <counter>COMPLEXITY</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.85</minimum>
- </limit>
- <limit>
- <counter>LINE</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.90</minimum>
- </limit>
- </limits>
- </rule>
- </rules>
- <haltOnFailure>false</haltOnFailure>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.jeluard</groupId>
- <artifactId>maven-plantuml-plugin</artifactId>
- <version>${rugged.maven-plantuml-plugin.version}</version>
- <configuration>
- <sourceFiles>
- <directory>${basedir}</directory>
- <includes>
- <include>
- design/**/*.puml
- </include>
- </includes>
- </sourceFiles>
- <outputDirectory>
- ${basedir}/target/site/images/design
- </outputDirectory>
- </configuration>
- <executions>
- <execution>
- <phase>pre-site</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.plantuml</groupId>
- <artifactId>plantuml</artifactId>
- <version>${rugged.plantuml.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>${rugged.maven-site-plugin.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${rugged.maven-assembly-plugin.version}</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/source-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${rugged.maven-resources-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>${rugged.maven-clean-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${rugged.jacoco-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>site</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <rule>
+ <element>BUNDLE</element>
+ <limits>
+ <limit>
+ <counter>CLASS</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>1.00</minimum>
+ </limit>
+ <limit>
+ <counter>INSTRUCTION</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.90</minimum>
+ </limit>
+ <limit>
+ <counter>METHOD</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.95</minimum>
+ </limit>
+ <limit>
+ <counter>BRANCH</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.85</minimum>
+ </limit>
+ <limit>
+ <counter>COMPLEXITY</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.85</minimum>
+ </limit>
+ <limit>
+ <counter>LINE</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.90</minimum>
+ </limit>
+ </limits>
+ </rule>
+ </rules>
+ <haltOnFailure>false</haltOnFailure>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.github.jeluard</groupId>
+ <artifactId>maven-plantuml-plugin</artifactId>
+ <version>${rugged.maven-plantuml-plugin.version}</version>
+ <configuration>
+ <sourceFiles>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>
+ design/**/*.puml
+ </include>
+ </includes>
+ </sourceFiles>
+ <outputDirectory>
+ ${basedir}/target/site/images/design
+ </outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.plantuml</groupId>
+ <artifactId>plantuml</artifactId>
+ <version>${rugged.plantuml.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${rugged.maven-site-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<reporting>
@@ -289,6 +309,8 @@
</configuration>
<reportSets>
<reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
<reports>
<report>checkstyle</report>
</reports>
@@ -317,6 +339,15 @@
<configuration>
<linkJavadoc>false</linkJavadoc>
</configuration>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -333,8 +364,10 @@
</configuration>
<reportSets>
<reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
<reports>
- <report>javadoc</report>
+ <report>aggregate</report>
</reports>
</reportSet>
</reportSets>