Skip to content

Commit

Permalink
Merge pull request #6 from J-Christophe/master
Browse files Browse the repository at this point in the history
New version
  • Loading branch information
Mathieu Gond committed Apr 30, 2014
2 parents b7f69b3 + ac65ce3 commit 38d6efe
Show file tree
Hide file tree
Showing 42 changed files with 2,425 additions and 889 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<!-- Informations generales sur le projet -->
<property name="project.name" value="fr.cnes.sitools.ext.astronomy" />
<property name="project.fullname" value="Sitools2 fr.cnes.sitools.ext.astronomy" />
<property name="project.version" value="2.3.1"/>
<property name="project.version" value="2.1"/>

<!-- Nom de l'application WEB -->
<property name="webapps.name" value="sitools" />
Expand Down Expand Up @@ -117,7 +117,7 @@
<include name="**/*.zip"/>
</fileset>
</path>

<property name="compile.classpath" refid="compile.classpath"/>


<!-- Tous les fichiers ressource -->
Expand Down
4 changes: 2 additions & 2 deletions fr.cnes.sitools.ext.astronomy/build.num
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Wed Dec 11 18:14:51 CET 2013
build.number=1
#Wed Apr 09 14:04:02 CEST 2014
build.number=2
2 changes: 1 addition & 1 deletion fr.cnes.sitools.ext.astronomy/build.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ROOT_DIRECTORY=D\:/CNES-ULISSE-2.0-GIT
ROOT_DIRECTORY=/home/malapert/git/Sitools2/V2.4/core-v2
source.. = src/
bin.includes = META-INF/,\
.
47 changes: 47 additions & 0 deletions fr.cnes.sitools.ext.astronomy/install-izpack/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ===================================
== Copyright 2010-2013 CNES - CENTRE NATIONAL d'ETUDES SPATIALES
==
== This file is part of SITools2.
==
== SITools2 is free software: you can redistribute it and/or modify
== it under the terms of the GNU General Public License as published by
== the Free Software Foundation, either version 3 of the License, or
== (at your option) any later version.
==
== SITools2 is distributed in the hope that it will be useful,
== but WITHOUT ANY WARRANTY; without even the implied warranty of
== MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
== GNU General Public License for more details.
==
== You should have received a copy of the GNU General Public License
== along with SITools2. If not, see <http://www.gnu.org/licenses/>.
==================================== -->
<project name="fr.cnes.sitools.install" default="build" basedir=".">

<!-- ==============================================================================
=== Build file to allow ant (http://jakarta.apache.org/ant/) to be used ===
to build the Sitools project. === === Author : AKKA Technologies === ===
name : nom du projet === default : tache ant executee par defaut === basedir
: repertoire courant lors de l'execution des taches ant === ============================================================================== -->

<!-- Allows us to use the IzPack Ant task -->
<taskdef name="izpack" classpath="lib/standalone-compiler.jar"
classname="com.izforge.izpack.ant.IzPackTask" />


<target name="build"
depends="build-izpack-installer" />

<!-- TARGET build-izpack-installer creates the izpack installer file -->

<target name="build-izpack-installer" description="generation de l'installeur IzPack">
<echo message="Build installer from file : install.xml "></echo>
<!-- Run installer build -->
<izpack input="install.xml"
output="AstronomyPlugin-1.0-install.jar"
installerType="standard" inheritAll="true" basedir="."
compression="deflate" compressionlevel="9" />
</target>

</project>
91 changes: 91 additions & 0 deletions fr.cnes.sitools.ext.astronomy/install-izpack/install.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>
<!-- ===================================
== Copyright 2010-2013 CNES - CENTRE NATIONAL d'ETUDES SPATIALES
==
== This file is part of SITools2.
==
== SITools2 is free software: you can redistribute it and/or modify
== it under the terms of the GNU General Public License as published by
== the Free Software Foundation, either version 3 of the License, or
== (at your option) any later version.
==
== SITools2 is distributed in the hope that it will be useful,
== but WITHOUT ANY WARRANTY; without even the implied warranty of
== MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
== GNU General Public License for more details.
==
== You should have received a copy of the GNU General Public License
== along with SITools2. If not, see <http://www.gnu.org/licenses/>.
==================================== -->
<installation version="1.0">
<!-- Includes some jars -->
<info>
<appname>Astronomy Extension</appname>
<appversion>1.0</appversion>
<authors>
<author email="jean-christophe.malapert@cnes.fr" name="CNES" />
</authors>
<url>http://sitools2.github.io/Astronomy-Extension-v2</url>
<uninstaller name="Uninstaller.jar" write="yes" />
<javaversion>1.6</javaversion>
<requiresjdk>no</requiresjdk>
</info>

<guiprefs width="900" height="700" resizable="yes">
<modifier key="useHeadingPanel" value="yes" />
<modifier key="headingImageOnLeft" value="yes" />
<modifier key="headingLineCount" value="1" />
<modifier key="headingFontSize" value="1.5" />
<modifier key="headingBackgroundColor" value="0x00ffffff" />
<modifier key="headingPanelCounter" value="text" />
<modifier key="headingPanelCounterPos" value="inHeading" />
<modifier key="langDisplayType" value="native" />
</guiprefs>

<locale>
<langpack iso3="eng" />
<langpack iso3="fra" />
</locale>
<resources>
<res id="LicencePanel.licence_eng" parse="yes"
src="install_res/licences/gpl-3.0.txt" />
<res id="LicencePanel.licence_fra" parse="yes"
src="install_res/licences/gpl-3.0.txt" />
<!-- <res id="userInputSpec.xml" src="install_res/install_userInputSpec.xml" />-->
<!-- Ant action file -->
<!-- <res id="AntActionsSpec.xml" src="AntActionsSpec.xml" /> -->
<!--<res id="Heading.image" src="res/img/logo_01_petiteTaille.png" />
<res id="installer.langsel.img" src="res/img/mizarBackground.png" />-->
<!-- for internationnalization -->
<!--<res id="userInputLang.xml_eng" src="install_res/userInputLang.xml_eng" />
<res id="userInputLang.xml_fra" src="install_res/userInputLang.xml_fra" />-->
<res id="HTMLInfoPanel.Readme" src="install_res/Readme.html"/>
<res id="userInputSpec.xml" src="install_res/install_userInputSpec.xml" />
</resources>


<panels>
<panel classname="CheckedHelloPanel" />
<panel classname="LicencePanel" />
<panel classname="UserInputPanel" id="UserInputPanel.0" />
<panel classname="InstallPanel" />
<panel classname="HTMLInfoPanel" id="Readme"/>
<panel classname="SimpleFinishPanel" />
</panels>

<packs>
<pack name="plugin" required="yes">
<description>The required application files to update an existing installation.</description>
<file src="../dist/fr.cnes.sitools.ext.astronomy.jar" targetdir="$INSTALL_PATH/workspace/fr.cnes.sitools.core/ext/"/>
<file src="../dist/lib/ehcache-2.7.0.jar" targetdir="$INSTALL_PATH/workspace/fr.cnes.sitools.core/ext/lib"/>
<file src="../dist/lib/fits.jar" targetdir="$INSTALL_PATH/workspace/fr.cnes.sitools.core/ext/lib"/>
<file src="../dist/lib/jai_codec.jar" targetdir="$INSTALL_PATH/workspace/fr.cnes.sitools.core/ext/lib"/>
<file src="../dist/lib/jai_core.jar" targetdir="$INSTALL_PATH/workspace/fr.cnes.sitools.core/ext/lib"/>
<file src="../dist/lib/jai_imageio.jar" targetdir="$INSTALL_PATH/workspace/fr.cnes.sitools.core/ext/lib"/>
<file src="../dist/lib/mlibwrapper_jai.jar" targetdir="$INSTALL_PATH/workspace/fr.cnes.sitools.core/ext/lib"/>
</pack>
</packs>

</installation>


41 changes: 41 additions & 0 deletions fr.cnes.sitools.ext.astronomy/install-izpack/install_res/Readme
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Astronomy Extension comes with ABSOLUTELY NO WARRANTY. See the licences directory.

--------------------------------------------------------------------------------

1. INTRODUCTION 4. THANKS
2. INSTALLATION INSTRUCTIONS
3. REQUIREMENTS

--------------------------------------------------------------------------------
1. INTRODUCTION
--------------------------------------------------------------------------------
Astronomy is a GPLV3 plugin of SITools2 which provides services for SITools2
in the astronomical thematic. It is available on all platforms.

--------------------------------------------------------------------------------
2. INSTALLATION INSTRUCTIONS
--------------------------------------------------------------------------------
Just run "java -jar AstronomyPlugin-1.0-install.jar"

--------------------------------------------------------------------------------
3. REQUIREMENTS
--------------------------------------------------------------------------------
JAVA 1.6 or higher
SITools2

--------------------------------------------------------------------------------
4. THANKS
--------------------------------------------------------------------------------

This plugin is based on technology developed by :

- Multi Order Coverage library (http://wiki.ivoa.net/twiki/bin/view/IVOA/MocInfo), developped by CDS
- Hierarchical Progressive Surveys, developed by CDS
- Sesame name resolver service, developed by CDS
- Reverse name resolver service, developed by CDS
- Name resolver service for solar bodies, developed by IMCCE
- Healpix library (http://sourceforge.net/projects/healpix/)
- SITools2 framework (http://github.com/SITools2/), developed by CNES
- sdss package, developed by Sloan Digital Sky Survey
- jhlabs library, developed by Jerry Huxtable
- part of jsky software, developed by ESO
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<html>
<head>
<title/>
</head>
<body>
Mizar comes with ABSOLUTELY NO WARRANTY. See the licences directory.<br/>
<br/>
---------------------------------------------------------------------------------<br/>
<br/>
<table border="0">
<tr><td>1. INTRODUCTION</td><td>4. THANKS</td></tr>
<tr><td>2. INSTALLATION INSTRUCTIONS</td><td>&nbsp;</td></tr>
<tr><td>3. REQUIREMENTS</td><td>&nbsp;<td/></tr>
</table>
<br/>
--------------------------------------------------------------------------------<br/>
1. INTRODUCTION<br/>
--------------------------------------------------------------------------------<br/>
Astronomy is a GPLV3 plugin of SITools2 which provides services for SITools2<br/>
in the astronomical thematic. It is available on all platforms.<br/>
<br/>
--------------------------------------------------------------------------------<br/>
2. INSTALLATION INSTRUCTIONS<br/>
--------------------------------------------------------------------------------<br/>
Just run "java -jar AstronomyPlugin-1.0-install.jar"
<br/>
--------------------------------------------------------------------------------<br/>
3. REQUIREMENTS<br/>
--------------------------------------------------------------------------------<br/>
JAVA 1.6 or higher<br/>
SITools2<br/>
<br/>
--------------------------------------------------------------------------------<br/
4. THANKS<br/>
--------------------------------------------------------------------------------<br/>
<br/>
This plugin is based on technology developed by :<br/>
<ul>
<li> <a href="http://wiki.ivoa.net/twiki/bin/view/IVOA/MocInfo">Multi Order Coverage library</a>, developped by <a href="http://cdsweb.u-strasbg.fr">CDS</a></li>
<li> Hierarchical Progressive Surveys, developed by <a href="http://cdsweb.u-strasbg.fr">CDS</a></li>
<li> Sesame name resolver service, developed by <a href="http://cdsweb.u-strasbg.fr">CDS</a></li>
<li> Reverse name resolver service, developed by <a href="http://cdsweb.u-strasbg.fr">CDS</a></li>
<li> Name resolver service for solar bodies, developed by <a href="http://www.imcce.fr">IMCCE</a></li>
<li> <a href="http://sourceforge.net/projects/healpix/">Healpix library</a></li>
<li> <a href="http://github.com/SITools2/">SITools2</a> framework, developed by CNES</li>
<li>sdss package, developed by Sloan Digital Sky Survey</li>
<li>jhlabs library, developed by Jerry Huxtable</li>
<li>part of jsky software, developed by ESO</li>

</ul>

</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<userInput>
<panel order="0">
<field type="title" txt="Installation in SITools2" bold="true" size="2" />
<field type="staticText" align="left"
txt="The Astronomy plugin installation process requires access to SITools2. Please specify the path to sitools2:" />
<field type="search" align="left" variable="INSTALL_PATH">
<spec txt="" size="30" checkfilename="./workspace/fr.cnes.sitools.core/ext/" type="directory" result="directory"/>
</field>
</panel>
</userInput>
Loading

0 comments on commit 38d6efe

Please sign in to comment.