Commit 2c0d5b1c authored by Steve Fisher's avatar Steve Fisher

Fixes #24 : Needs to work with icat 4.5.0

Prepare for release 1.3.2
parent dbe197b9
/target/
/.settings/
/.classpath
/.project
Copyright 2012-2015 The ICAT Collaboration
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
<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>
<groupId>org.icatproject</groupId>
<artifactId>ids.server</artifactId>
<packaging>war</packaging>
......@@ -12,32 +13,27 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<repoUrl>http://www.icatproject.org/mvn/repo</repoUrl>
<storage.plugin>ids.storage_file-1.3.3-SNAPSHOT.jar</storage.plugin>
<project.scm.id>github</project.scm.id>
</properties>
<distributionManagement>
<downloadUrl>http://www.icatproject.org/mvn/repo</downloadUrl>
<site>
<id>website</id>
<url>scp://www.icatproject.org/var/www/html/mvn/site/ids/server/${project.version}</url>
</site>
<repositories>
<repository>
<id>repo</id>
<url>scp://www.icatproject.org/var/www/html/mvn/repo</url>
<id>ICAT Repo</id>
<url>http://www.icatproject.org/mvn/repo</url>
</repository>
</distributionManagement>
<description>ICAT Data Service to provide a uniform interface to data.</description>
<issueManagement>
<url>http://code.google.com/p/icat-data-service/issues/list</url>
<system>Google Code</system>
</issueManagement>
</repositories>
<scm>
<connection>scm:svn:http://icat-data-service.googlecode.com/svn/ids/trunk</connection>
<developerConnection>scm:svn:https://icat-data-service.googlecode.com/svn/ids/trunk</developerConnection>
<url>http://code.google.com/p/icat-data-service/source/browse/#svn%2Fids%2Ftrunk</url>
<connection>scm:git:https://github.com/icatproject/ids.server.git</connection>
<developerConnection>scm:git:https://github.com/icatproject/ids.server.git</developerConnection>
<url>https://github.com/icatproject/ids.server</url>
</scm>
<issueManagement>
<url>https://github.com/icatproject/ids.server/issues</url>
<system>GitHub</system>
</issueManagement>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
......@@ -50,33 +46,26 @@
<url>http://www.icatproject.org</url>
</organization>
<repositories>
<repository>
<id>java.net2</id>
<name>Repository hosting the jee6 artifacts</name>
<url>http://download.java.net/maven/2</url>
</repository>
<repository>
<url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
<id>eclipselink</id>
<layout>default</layout>
<name>Repository for library Library[eclipselink]</name>
</repository>
<distributionManagement>
<downloadUrl>http://www.icatproject.org/mvn/repo</downloadUrl>
<site>
<id>website</id>
<url>scp://www.icatproject.org/var/www/html/mvn/site/ids/server/${project.version}</url>
</site>
<repository>
<id>ICAT Repo</id>
<url>http://www.icatproject.org/mvn/repo</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>repo</id>
<url>scp://www.icatproject.org/var/www/html/mvn/repo</url>
</repository>
</repositories>
</distributionManagement>
<description>ICAT Data Service to provide a uniform interface to data.</description>
<dependencies>
<dependency>
<groupId>org.icatproject</groupId>
<artifactId>icat.client</artifactId>
<version>4.3.3</version>
<version>4.5.0</version>
</dependency>
<dependency>
......@@ -148,6 +137,7 @@
</dependency>
</dependencies>
<build>
<resources>
......@@ -168,7 +158,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
......@@ -178,7 +168,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.16</version>
<version>2.18.1</version>
<configuration>
<excludes>
<exclude>
......@@ -192,7 +182,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>2.6</version>
<executions>
<execution>
<goals>
......@@ -205,13 +195,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.0.2</version>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<version>2.5.5</version>
<configuration>
<descriptors>
<descriptor>${project.basedir}/assemble/distribution.xml</descriptor>
......@@ -230,7 +220,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<version>1.4.0</version>
<executions>
<execution>
<id>Undeploy from glassfish</id>
......@@ -275,7 +265,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.1</version>
<version>3.4</version>
<dependencies>
<dependency><!-- add support for ssh/scp -->
<groupId>org.apache.maven.wagon</groupId>
......@@ -288,7 +278,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version>
<version>2.8.2</version>
<dependencies>
<dependency><!-- add support for ssh/scp -->
<groupId>org.apache.maven.wagon</groupId>
......@@ -301,7 +291,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.16</version>
<version>2.18.1</version>
<configuration>
<includes>
<include>**/integration/**/*Test.java</include>
......@@ -326,14 +316,13 @@
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
<version>2.8</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
......
File mode changed from 100644 to 100755
<?xml version="1.0" encoding="UTF-8"?>
<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>IDS Release Notes</title>
</properties>
<properties>
<title>IDS Release Notes</title>
</properties>
<body>
<section name="1.3.2">
<p>Bug fix release to fix handling of corrupt filesCheck.lastIdFile file.</p>
</section>
<body>
<section name="1.3.1">
<p>Bug fix release to fix file handle leak.</p>
<ul>
<li>Minor corections to the documentation.</li>
<li>Ensure that files are closed when returned indivdually.</li>
<li>Remove redundant (and possibly dangerous) line of code from DsWriter.</li>
</ul>
</section>
<section name="1.3.2">
<p>Bug fix release and work with icat 4.5</p>
<ul>
<li>Bug fix release to fix handling of corrupt filesCheck.lastIdFile
file.
</li>
<li>Work with icat 4.5</li>
</ul>
<section name="1.3.0">
<p>Add getApiVersion call, make major change to prepareData, make it also support archive by datafile and provide the option of protecting
Datafile.location with a cryptographic hash.
</p>
<ul>
<li>getApiVersion call added to return version of server
</li>
<li>ids.properties values: preparedCacheSize1024bytes, datasetCacheSize1024bytes, compressDatasetCache, and tolerateWrongCompression
are no longer used.
</li>
<li>ids.properties value preparedCount has changed its meaning.</li>
<li>ids.properties value tidyBlockSize has been added.</li>
<li>ids.properties value maxIdsInQuery has been added.</li>
<li>The json string returned by getServiceStatus has changed.</li>
<li>The Datafile.location value can be protected by a cryptographic hash. This is enabled by adding a property "key" to the
ids.properties file.
</li>
</ul>
</section>
</section>
<section name="1.2.0">
<p>For two level storage clean up main storage as needed.
</p>
<ul>
<li>Add parameters: startArchivingLevel1024bytes,
stopArchivingLevel1024bytes and linkLifetimeSeconds.
</li>
<li>Cope with some obscure file checker errors.</li>
<li>Datasets are archived when main storage becomes too full.</li>
</ul>
</section>
<section name="1.3.1">
<p>Bug fix release to fix file handle leak.</p>
<ul>
<li>Minor corrections to the documentation.</li>
<li>Ensure that files are closed when returned individually.</li>
<li>Remove redundant (and possibly dangerous) line of code from
DsWriter.
</li>
</ul>
</section>
<section name="1.1.0">
<p>Provide background file checking and facility control of returned zip file structure.
</p>
<ul>
<li>Another file handle leak fixed.</li>
<li>Compatible with plugin interface 1.1.0.</li>
<li>Provide background file checking - which requires that the parameter checkFiles.parallelCount is set to an integer. If the integer
is non zero then other entries must be set in the ids.properties file.
</li>
<li>ids.properties needs a new parameter: plugin.zipMapper.class which identifies the code to define the zip file structure.</li>
</ul>
</section>
<section name="1.3.0">
<p>Add getApiVersion call, make major change to prepareData, make it
also support archive by datafile and provide the option of
protecting
Datafile.location with a cryptographic hash.
</p>
<ul>
<li>getApiVersion call added to return version of server
</li>
<li>ids.properties values: preparedCacheSize1024bytes,
datasetCacheSize1024bytes, compressDatasetCache, and
tolerateWrongCompression
are no longer used.
</li>
<li>ids.properties value preparedCount has changed its meaning.</li>
<li>ids.properties value tidyBlockSize has been added.</li>
<li>ids.properties value maxIdsInQuery has been added.</li>
<li>The json string returned by getServiceStatus has changed.</li>
<li>The Datafile.location value can be protected by a cryptographic
hash. This is enabled by adding a property "key" to the
ids.properties file.
</li>
</ul>
</section>
<section name="1.0.1">
<p>Bug fix release.
</p>
<ul>
<li>Files are now being closed properly to avoid running out of file handles.</li>
</ul>
</section>
<section name="1.2.0">
<p>For two level storage clean up main storage as needed.
</p>
<ul>
<li>Add parameters: startArchivingLevel1024bytes,
stopArchivingLevel1024bytes and linkLifetimeSeconds.
</li>
<li>Cope with some obscure file checker errors.</li>
<li>Datasets are archived when main storage becomes too full.</li>
</ul>
</section>
<section name="1.0.0">
<p>Initial public release.
</p>
</section>
</body>
<section name="1.1.0">
<p>Provide background file checking and facility control of returned
zip file structure.
</p>
<ul>
<li>Another file handle leak fixed.</li>
<li>Compatible with plugin interface 1.1.0.</li>
<li>Provide background file checking - which requires that the
parameter checkFiles.parallelCount is set to an integer. If the
integer
is non zero then other entries must be set in the
ids.properties
file.
</li>
<li>ids.properties needs a new parameter: plugin.zipMapper.class
which identifies the code to define the zip file structure.
</li>
</ul>
</section>
<section name="1.0.1">
<p>Bug fix release.
</p>
<ul>
<li>Files are now being closed properly to avoid running out of file
handles.
</li>
</ul>
</section>
<section name="1.0.0">
<p>Initial public release.
</p>
</section>
</body>
</document>
\ No newline at end of file
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