Commit 5fbd1e5c authored by Alessio Fabiani's avatar Alessio Fabiani
Browse files

- JIRA GEOS-6289

parent 4d216d5f
......@@ -22,7 +22,6 @@ officially part of the GeoServer releases. They are however built along with the
python/index
scripting/index
spatialite/index
libjpeg-turbo/index
netcdf/index
netcdf-out/index
jdbcconfig/index
......
......@@ -25,4 +25,5 @@ see the :ref:`data_vector`, :ref:`data_raster`, and :ref:`data_database` section
styler
wps/index
xslt/index
csw/index
\ No newline at end of file
csw/index
libjpeg-turbo/index
\ No newline at end of file
.. _community_libjpeg-turbo:
.. _extensions_libjpeg-turbo:
libjpeg-turbo Map Encoder Extension
==========================================
......@@ -34,7 +34,7 @@ Installing the GeoServer libjpeg-turbo extension
.. warning:: Before moving on make sure you installed the libjpeg-turbo binaries as per the section above.
#. Download the extension from the `nightly GeoServer community module builds <http://ares.opengeo.org/geoserver/2.4.x/community-latest/>`_.
#. Download the extension from the `nightly GeoServer extensions module builds <http://ares.opengeo.org/geoserver/2.4.x/extensions-latest/>`_.
.. warning:: Make sure to match the version of the extension to the version of the GeoServer instance!
......
......@@ -45,7 +45,6 @@
<descriptor>release/ext-aggregate.xml</descriptor>
<descriptor>release/ext-wcs2_0.xml</descriptor>
<descriptor>release/ext-wms-eo.xml</descriptor>
<descriptor>release/ext-libjpeg-turbo.xml</descriptor>
<descriptor>release/ext-netcdf.xml</descriptor>
<descriptor>release/ext-netcdf-out.xml</descriptor>
<descriptor>release/ext-png.xml</descriptor>
......@@ -148,7 +147,7 @@
<id>communityRelease</id>
<modules>
<module>authkey</module>
<module>dds</module>
<module>dds</module>
<module>printing</module>
<module>release</module>
<module>ftp</module>
......@@ -161,7 +160,6 @@
<module>wcs2_0-eo</module>
<module>web-wcs2_0-eo</module>
<module>wms-eo</module>
<module>libjpeg-turbo</module>
<module>netcdf</module>
<module>netcdf-out</module>
<module>png</module>
......@@ -277,18 +275,6 @@
<module>kml-old</module>
</modules>
</profile>
<profile>
<id>libjpeg-turbo</id>
<activation>
<property>
<name>all</name>
<value>true</value>
</property>
</activation>
<modules>
<module>libjpeg-turbo</module>
</modules>
</profile>
<profile>
<id>importer</id>
<modules>
......
......@@ -98,11 +98,6 @@
<artifactId>web-wcs2_0-eo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.community</groupId>
<artifactId>libjpeg-turbo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.community</groupId>
<artifactId>png</artifactId>
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<artifactId>extension</artifactId>
<version>2.4-SNAPSHOT</version>
</parent>
<groupId>org.geoserver.community</groupId>
<groupId>org.geoserver.extension</groupId>
<artifactId>libjpeg-turbo</artifactId>
<packaging>jar</packaging>
<version>2.4-SNAPSHOT</version>
......
......@@ -258,6 +258,13 @@
</modules>
</profile>
<profile>
<id>libjpeg-turbo</id>
<modules>
<module>libjpeg-turbo</module>
</modules>
</profile>
<!-- allExtensions profile, includes all modules -->
<profile>
<id>allExtensions</id>
......@@ -289,6 +296,7 @@
<module>inspire</module>
<module>css</module>
<module>csw</module>
<module>libjpeg-turbo</module>
</modules>
</profile>
......@@ -323,6 +331,7 @@
<module>inspire</module>
<module>css</module>
<module>csw</module>
<module>libjpeg-turbo</module>
</modules>
</profile>
......
......@@ -1229,6 +1229,7 @@
<descriptor>release/ext-inspire.xml</descriptor>
<descriptor>release/ext-css.xml</descriptor>
<descriptor>release/ext-csw.xml</descriptor>
<descriptor>release/ext-libjpeg-turbo.xml</descriptor>
</descriptors>
<finalName>geoserver-2.4-SNAPSHOT</finalName>
<outputDirectory>${project.build.directory}/release</outputDirectory>
......
......@@ -247,6 +247,11 @@
<artifactId>csw-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>libjpeg-turbo</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
......
......@@ -457,6 +457,16 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>libjpeg-turbo</id>
<dependencies>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>libjpeg-turbo</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>printing</id>
<dependencies>
......@@ -961,18 +971,9 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>libjpeg-turbo</id>
<dependencies>
<dependency>
<groupId>org.geoserver.community</groupId>
<artifactId>libjpeg-turbo</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>netcdf</id>
<id>netcdf</id>
<dependencies>
<dependency>
<groupId>org.geotools</groupId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment