Menu
▾
▴
andspidclient-commit — Project SVN Changes Notification List
You can subscribe to this list here.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(69) |
Jul
(3) |
Aug
(11) |
Sep
(4) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
|
Feb
|
Mar
(54) |
Apr
|
May
(14) |
Jun
(3) |
Jul
(4) |
Aug
(7) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2016 |
Jan
|
Feb
(8) |
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(10) |
Dec
(9) |
| 2019 |
Jan
|
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <chr...@us...> - 2019-02-04 07:54:44
|
Revision: 220
http://sourceforge.net/p/andspidclient/code/220
Author: chris-trapani
Date: 2019-02-04 07:54:43 +0000 (Mon, 04 Feb 2019)
Log Message:
-----------
Merge pull request #8 in APPS/ands-pid-client from bugfix/EPR-5168-doi-minting-fails to master
* commit '51e3b15636ec4066a9d0243b344959fbac99d9c1':
EPR-5168 DOI minting fails. Corrected nameType constansts.
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/business/Creator.java
Modified: trunk/src/main/java/au/csiro/doiclient/business/Creator.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2019-02-04 03:22:45 UTC (rev 219)
+++ trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2019-02-04 07:54:43 UTC (rev 220)
@@ -30,12 +30,12 @@
/**
* Name type: organizational. Attribute to describe type of creator
*/
- public static final String NAME_TYPE_ORGANIZATIONAL = "organizational";
+ public static final String NAME_TYPE_ORGANIZATIONAL = "Organizational";
/**
* Name type: personal. Attribute to describe type of creator
*/
- public static final String NAME_TYPE_PERSONAL = "personal";
+ public static final String NAME_TYPE_PERSONAL = "Personal";
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2019-02-04 03:24:19
|
Revision: 219
http://sourceforge.net/p/andspidclient/code/219
Author: chris-trapani
Date: 2019-02-04 03:24:17 +0000 (Mon, 04 Feb 2019)
Log Message:
-----------
Merge pull request #7 in APPS/ands-pid-client from bugfix/EPR-5168-doi-minting-fails to master
* commit '68b93248877a6e5a9bb298ea3897c96faeac90c8':
Do not include creator attribute 'nameType' if not present. Update .xsd used to validate schema.
EPR-5168 DOI minting fails. Add nameType constansts.
EPR-5168 DOI minting fails when creator type is not set update
EPR-5168 DOI minting fails when creator type is not set.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2019-02-04 03:23:42
|
Revision: 217
http://sourceforge.net/p/andspidclient/code/217
Author: chris-trapani
Date: 2019-02-04 03:23:40 +0000 (Mon, 04 Feb 2019)
Log Message:
-----------
EPR-5168 DOI minting fails. Add nameType constansts.
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/business/Creator.java
Modified: trunk/src/main/java/au/csiro/doiclient/business/Creator.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2019-02-01 01:05:26 UTC (rev 216)
+++ trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2019-02-04 03:23:40 UTC (rev 217)
@@ -25,6 +25,18 @@
private String affiliation;
private String nameIdentifier;
private String creatorName;
+
+
+ /**
+ * Name type: organizational. Attribute to describe type of creator
+ */
+ public static final String NAME_TYPE_ORGANIZATIONAL = "organizational";
+
+ /**
+ * Name type: personal. Attribute to describe type of creator
+ */
+ public static final String NAME_TYPE_PERSONAL = "personal";
+
/**
* Default constructor
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2019-02-04 03:23:30
|
Revision: 216
http://sourceforge.net/p/andspidclient/code/216
Author: chris-trapani
Date: 2019-02-04 03:23:27 +0000 (Mon, 04 Feb 2019)
Log Message:
-----------
EPR-5168 DOI minting fails when creator type is not set update
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2019-02-01 00:34:17 UTC (rev 215)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2019-02-04 03:23:27 UTC (rev 216)
@@ -439,7 +439,7 @@
childElement.setText(stripNonValidXMLCharacters(creator.getCreatorName()));
if (StringUtils.isNotEmpty(creator.getNameType()))
{
- childElement.setAttribute(DoiMetaDataGenerator.NAME_TYPE, firstNode.getNameType());
+ childElement.setAttribute(DoiMetaDataGenerator.NAME_TYPE, creator.getNameType());
}
setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.GIVEN_NAME,
creator.getFirstName());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2019-02-04 03:23:08
|
Revision: 215
http://sourceforge.net/p/andspidclient/code/215
Author: chris-trapani
Date: 2019-02-04 03:23:05 +0000 (Mon, 04 Feb 2019)
Log Message:
-----------
EPR-5168 DOI minting fails when creator type is not set.
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/business/Creator.java
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
Modified: trunk/src/main/java/au/csiro/doiclient/business/Creator.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2018-12-11 04:34:18 UTC (rev 214)
+++ trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2019-02-04 03:23:05 UTC (rev 215)
@@ -34,7 +34,7 @@
}
/**
- * Create Creator from first and last name.
+ * Create Creator from first and last name and name type.
*
* @param firstName
* The first name
@@ -49,6 +49,20 @@
this.lastName = lastName;
this.nameType = nameType;
}
+
+ /**
+ * Create Creator from first and last name.
+ *
+ * @param firstName
+ * The first name
+ * @param lastName
+ * The last name
+ */
+ public Creator(String firstName, String lastName)
+ {
+ this.firstName = firstName;
+ this.lastName = lastName;
+ }
/**
* Get creator name, If not specified then last name + first name is returned.
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-11 04:34:18 UTC (rev 214)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2019-02-04 03:23:05 UTC (rev 215)
@@ -416,7 +416,7 @@
if (StringUtils.isNotEmpty(firstNode.getNameType()))
{
- updateAttribute(document, nameSpace, element, DoiMetaDataGenerator.NAME_TYPE, firstNode.getNameType());
+ baseElement.setAttribute(DoiMetaDataGenerator.NAME_TYPE, firstNode.getNameType());
}
setElementValueForParent(document, baseElement.getParentElement(), DoiMetaDataGenerator.GIVEN_NAME,
@@ -437,7 +437,10 @@
Creator creator = creators.get(counter);
childElement.setText(stripNonValidXMLCharacters(creator.getCreatorName()));
- childElement.setAttribute(DoiMetaDataGenerator.NAME_TYPE, creator.getNameType());
+ if (StringUtils.isNotEmpty(creator.getNameType()))
+ {
+ childElement.setAttribute(DoiMetaDataGenerator.NAME_TYPE, firstNode.getNameType());
+ }
setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.GIVEN_NAME,
creator.getFirstName());
setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.FAMILY_NAME,
Modified: trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
===================================================================
--- trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-12-11 04:34:18 UTC (rev 214)
+++ trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2019-02-04 03:23:05 UTC (rev 215)
@@ -78,13 +78,16 @@
/**
* Populates a DTO with values that will passed on the DOIMetaDataTemplate.
*
- * @param doiDTO
+ * @param withNameTypes
+ * for name type values to be populated pass in true
+ * @return doiDTO
* DTO with the values for the DOIMetaDataTemplate.
*/
- private DoiDTO populateDummydoiDTO()
+ private DoiDTO populateDummydoiDTO(boolean withNameTypes)
{
DoiDTO doiDTO = new DoiDTO();
- List<Creator> creators = createDummyCreators();
+ List<Creator> creators = withNameTypes? createDummyCreators(): createDummyCreatorsWithoutNameType();
+
// creators
doiDTO.setCreators(creators);
@@ -159,6 +162,22 @@
creators.add(new Creator("John", "Smith", "Personal"));
return creators;
}
+
+
+ private List<Creator> createDummyCreatorsWithoutNameType()
+ {
+ List<Creator> creators = new ArrayList<Creator>();
+ Creator c = new Creator();
+ c.setCreatorName("CSIRO");
+ creators.add(c);
+ creators.add(new Creator("David", "Phillips"));
+ creators.add(new Creator("Rahul", "Gandhi"));
+ creators.add(new Creator("Alison", "Chapman"));
+ creators.add(new Creator("Matt", "Green"));
+ creators.add(new Creator("Rahul", "Dravid"));
+ creators.add(new Creator("John", "Smith"));
+ return creators;
+ }
private DoiDTO populateDummydoiDTOMinimal()
@@ -194,8 +213,8 @@
*/
public final void testCreateDoiMetaDataXML() throws Exception
{
- String doiMetaDataXML = DoiMetaDataGenerator.createDoiMetaDataXML(populateDummydoiDTO());
- assertNotNull(doiMetaDataXML);
+ String doiMetaDataXML = DoiMetaDataGenerator.createDoiMetaDataXML(populateDummydoiDTO(true));
+ assertNotNull(doiMetaDataXML);
Document document = ConverterUtils.xmlToDoc(doiMetaDataXML);
XPath xPath = XPath.newInstance(CREATOR_NAME_XPATH);
@@ -205,6 +224,7 @@
assertEquals(7, nodes.size());
assertEquals("creatorName", ((Element) nodes.get(0)).getName());
+ assertEquals("Organizational",((Element) nodes.get(0)).getAttributeValue("nameType"));
assertEquals("CSIRO", ((Element) nodes.get(0)).getText());
assertEquals("Phillips, David", ((Element) nodes.get(1)).getText());
assertEquals("Gandhi, Rahul", ((Element) nodes.get(2)).getText());
@@ -212,6 +232,27 @@
assertEquals("Green, Matt", ((Element) nodes.get(4)).getText());
assertEquals("Dravid, Rahul", ((Element) nodes.get(5)).getText());
assertEquals("Smith, John", ((Element) nodes.get(6)).getText());
+
+ String doiMetaDataNoNameTypeXML = DoiMetaDataGenerator.createDoiMetaDataXML(populateDummydoiDTO(false));
+ assertNotNull(doiMetaDataNoNameTypeXML);
+ Document documentNoNameType = ConverterUtils.xmlToDoc(doiMetaDataNoNameTypeXML);
+ XPath xPathNoNameType = XPath.newInstance(CREATOR_NAME_XPATH);
+ xPathNoNameType.addNamespace("xsi", documentNoNameType.getRootElement().getNamespaceURI());
+ @SuppressWarnings("rawtypes")
+ List nodesx = xPathNoNameType.selectNodes(documentNoNameType);
+ assertEquals(7, nodesx.size());
+ assertEquals("Personal",((Element) nodesx.get(0)).getAttributeValue("nameType"));
+ assertEquals("creatorName", ((Element) nodesx.get(0)).getName());
+ assertEquals("CSIRO", ((Element) nodesx.get(0)).getText());
+
+ assertEquals("Phillips, David", ((Element) nodesx.get(1)).getText());
+ //nameType is from template even though its no set in creator object
+ assertEquals("Personal", ((Element) nodesx.get(1)).getAttributeValue("nameType"));
+ assertEquals("Gandhi, Rahul", ((Element) nodesx.get(2)).getText());
+ assertEquals("Chapman, Alison", ((Element) nodesx.get(3)).getText());
+ assertEquals("Green, Matt", ((Element) nodesx.get(4)).getText());
+ assertEquals("Dravid, Rahul", ((Element) nodesx.get(5)).getText());
+ assertEquals("Smith, John", ((Element) nodesx.get(6)).getText());
XPath resourceTypeXPath = XPath.newInstance(RESOURCETYPE_NAME_XPATH);
resourceTypeXPath.addNamespace("xsi", document.getRootElement().getNamespaceURI());
@@ -358,7 +399,7 @@
*/
public final void testCreateDoiMetaDataXMLWithInvalidData() throws Exception
{
- DoiDTO doiDTO = populateDummydoiDTO();
+ DoiDTO doiDTO = populateDummydoiDTO(true);
doiDTO.setPublicationYear("234");
try
{
@@ -371,7 +412,7 @@
assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
}
- doiDTO = populateDummydoiDTO();
+ doiDTO = populateDummydoiDTO(true);
doiDTO.setTitle(null);
try
@@ -385,7 +426,7 @@
assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
}
- doiDTO = populateDummydoiDTO();
+ doiDTO = populateDummydoiDTO(true);
doiDTO.getCreators().clear();
try
@@ -399,7 +440,7 @@
assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
}
- doiDTO = populateDummydoiDTO();
+ doiDTO = populateDummydoiDTO(true);
doiDTO.setPublisher(null);
try
@@ -423,7 +464,7 @@
{
String doi = "10.5072/08/4F5838BF44E5A";
- String doiMetaDataXML = DoiMetaDataGenerator.createDoiMetaDataXML(populateDummydoiDTO());
+ String doiMetaDataXML = DoiMetaDataGenerator.createDoiMetaDataXML(populateDummydoiDTO(true));
assertNotNull(doiMetaDataXML);
String updatedMetaData = DoiMetaDataGenerator.updateDOI(doi, doiMetaDataXML);
@@ -450,7 +491,7 @@
public final void testUpdate() throws Exception
{
- DoiDTO dto = populateDummydoiDTO();
+ DoiDTO dto = populateDummydoiDTO(true);
String doiMetaDataXML = DoiMetaDataGenerator.createDoiMetaDataXML(dto);
List<Creator> creators = dto.getCreators();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-12-11 04:35:36
|
Revision: 214
http://sourceforge.net/p/andspidclient/code/214
Author: chris-trapani
Date: 2018-12-11 04:35:34 +0000 (Tue, 11 Dec 2018)
Log Message:
-----------
Merge pull request #6 in APPS/ands-pid-client from bugfix/DMSTECH-9641-rds-datacite-schema-creator-name-wrong-name to master
* commit '2de85abf997083777719861aa096613ecd44cb61':
Creator.java edited online with Bitbucket
TestDoiMetaDataGenerator.java edited online with Bitbucket
DMSTECH-9641 unit test fix + some code clean up checkstyle & findbugs
DMSTECH-9641 fix for nameType attribute
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-12-11 04:35:21
|
Revision: 213
http://sourceforge.net/p/andspidclient/code/213
Author: chris-trapani
Date: 2018-12-11 04:35:19 +0000 (Tue, 11 Dec 2018)
Log Message:
-----------
Creator.java edited online with Bitbucket
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/business/Creator.java
Modified: trunk/src/main/java/au/csiro/doiclient/business/Creator.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2018-12-11 04:11:52 UTC (rev 212)
+++ trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2018-12-11 04:35:19 UTC (rev 213)
@@ -40,6 +40,8 @@
* The first name
* @param lastName
* The last name
+ * @param nameType
+ * The name type, either Personal or Organizational
*/
public Creator(String firstName, String lastName, String nameType)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-12-11 04:35:08
|
Revision: 212
http://sourceforge.net/p/andspidclient/code/212
Author: chris-trapani
Date: 2018-12-11 04:35:06 +0000 (Tue, 11 Dec 2018)
Log Message:
-----------
TestDoiMetaDataGenerator.java edited online with Bitbucket
Modified Paths:
--------------
trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
Modified: trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
===================================================================
--- trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-12-11 04:10:12 UTC (rev 211)
+++ trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-12-11 04:35:06 UTC (rev 212)
@@ -365,7 +365,7 @@
DoiMetaDataGenerator.createDoiMetaDataXML(doiDTO);
fail("Validation for Publication Year passed even when we expected to fail");
}
- catch (IllegalArgumentException ex)
+ catch (Exception ex)
{
assertTrue(ex instanceof IllegalArgumentException);
assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
@@ -393,7 +393,7 @@
DoiMetaDataGenerator.createDoiMetaDataXML(doiDTO);
fail("Validation for Creator passed even when we expected to fail");
}
- catch (IllegalArgumentException ex)
+ catch (Exception ex)
{
assertTrue(ex instanceof IllegalArgumentException);
assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
@@ -407,7 +407,7 @@
DoiMetaDataGenerator.createDoiMetaDataXML(doiDTO);
fail("Validation for Publisher passed even when we expected to fail");
}
- catch (IllegalArgumentException ex)
+ catch (Exception ex)
{
assertTrue(ex instanceof IllegalArgumentException);
assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-12-11 04:34:54
|
Revision: 211
http://sourceforge.net/p/andspidclient/code/211
Author: chris-trapani
Date: 2018-12-11 04:34:52 +0000 (Tue, 11 Dec 2018)
Log Message:
-----------
DMSTECH-9641 unit test fix + some code clean up checkstyle & findbugs
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/business/Creator.java
trunk/src/main/java/au/csiro/doiclient/business/Description.java
trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
trunk/src/main/java/au/csiro/doiclient/business/RelatedIdentifier.java
trunk/src/main/java/au/csiro/doiclient/business/Subject.java
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java
trunk/src/main/java/au/csiro/pidclient/AndsPidResponse.java
trunk/src/main/java/au/csiro/pidclient/CustomHttpsSocketFactory.java
trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
Modified: trunk/src/main/java/au/csiro/doiclient/business/Creator.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -1,5 +1,7 @@
package au.csiro.doiclient.business;
+import java.io.Serializable;
+
import org.apache.commons.lang.StringUtils;
/**
@@ -12,8 +14,11 @@
* @author Chris Trapani on 13/11/2018
* @version $Revision$ $Date$
*/
-public class Creator
+public class Creator implements Serializable
{
+ /** Generated serial version **/
+ private static final long serialVersionUID = 6854351518485871962L;
+
private String firstName;
private String lastName;
private String nameType;
@@ -36,10 +41,11 @@
* @param lastName
* The last name
*/
- public Creator(String firstName, String lastName)
+ public Creator(String firstName, String lastName, String nameType)
{
this.firstName = firstName;
this.lastName = lastName;
+ this.nameType = nameType;
}
/**
Modified: trunk/src/main/java/au/csiro/doiclient/business/Description.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Description.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/main/java/au/csiro/doiclient/business/Description.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -1,5 +1,7 @@
package au.csiro.doiclient.business;
+import java.io.Serializable;
+
/**
* Class representing a Creator.
*
@@ -10,8 +12,11 @@
* @author Chris Trapani on 13/11/2018
* @version $Revision$ $Date$
*/
-public class Description
+public class Description implements Serializable
{
+ /** Generated serial version **/
+ private static final long serialVersionUID = 2792195337953631667L;
+
/**
* Description.
*/
Modified: trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -1,5 +1,7 @@
package au.csiro.doiclient.business;
+import java.io.Serializable;
+
/**
* Class representing a Creator.
*
@@ -10,8 +12,11 @@
* @author Chris Trapani on 13/11/2018
* @version $Revision$ $Date$
*/
-public class GeoLocation
+public class GeoLocation implements Serializable
{
+ /** Generated serial version **/
+ private static final long serialVersionUID = 4236374370542494432L;
+
/**
* Geo Location type
*/
Modified: trunk/src/main/java/au/csiro/doiclient/business/RelatedIdentifier.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/RelatedIdentifier.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/main/java/au/csiro/doiclient/business/RelatedIdentifier.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -1,5 +1,7 @@
package au.csiro.doiclient.business;
+import java.io.Serializable;
+
/**
* Class representing an Related identifier.
*
@@ -8,8 +10,11 @@
* @author Chris Trapani on 13/11/2018
* @version $Revision$ $Date$
*/
-public class RelatedIdentifier
+public class RelatedIdentifier implements Serializable
{
+ /** Generated serial version **/
+ private static final long serialVersionUID = -3661963648667782037L;
+
private String relatedIdentifierType;
private String relationType;
private String value;
Modified: trunk/src/main/java/au/csiro/doiclient/business/Subject.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Subject.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/main/java/au/csiro/doiclient/business/Subject.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -1,5 +1,7 @@
package au.csiro.doiclient.business;
+import java.io.Serializable;
+
/**
* Class representing a Creator.
*
@@ -10,8 +12,11 @@
* @author Chris Trapani on 13/11/2018
* @version $Revision$ $Date$
*/
-public class Subject
+public class Subject implements Serializable
{
+ /** Generated serial version **/
+ private static final long serialVersionUID = 8619853034995761718L;
+
private String subject;
private String subjectScheme;
private String schemeURI;
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -429,6 +429,7 @@
firstNode.getAffiliation());
detachExistingNodes(xPath, document);
+
for (int counter = 1; counter < creators.size(); counter++)
{
Element newCreatorNode = (Element) immutableclonedParentElement.clone();
@@ -436,7 +437,7 @@
Creator creator = creators.get(counter);
childElement.setText(stripNonValidXMLCharacters(creator.getCreatorName()));
-
+ childElement.setAttribute(DoiMetaDataGenerator.NAME_TYPE, creator.getNameType());
setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.GIVEN_NAME,
creator.getFirstName());
setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.FAMILY_NAME,
@@ -445,7 +446,6 @@
creator.getNameIdentifier());
setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.AFFILIATION,
creator.getAffiliation());
- newCreatorNode.setAttribute(DoiMetaDataGenerator.NAME_TYPE, creator.getNameType());
Element grandParent = baseElement.getParentElement();
grandParent.getParentElement().addContent(counter+1, newCreatorNode);
Modified: trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java
===================================================================
--- trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -1164,7 +1164,7 @@
Node node = (Node) nodes.item(i).getAttributes().item(j);
triple[j] = node.getNodeValue();
}
- properties.add(new AndsPidResponseProperty(Integer.valueOf(triple[0]), triple[1], triple[2]));
+ properties.add(new AndsPidResponseProperty(Integer.parseInt(triple[0]), triple[1], triple[2]));
}
return properties;
}
Modified: trunk/src/main/java/au/csiro/pidclient/AndsPidResponse.java
===================================================================
--- trunk/src/main/java/au/csiro/pidclient/AndsPidResponse.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/main/java/au/csiro/pidclient/AndsPidResponse.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -21,6 +21,8 @@
import java.util.List;
+import org.apache.commons.collections4.CollectionUtils;
+
import au.csiro.pidclient.business.AndsPidResponseProperty;
/**
@@ -127,12 +129,7 @@
*/
public String getHandle()
{
- for(String handle : this.getHandles())
- {
- // return the first element in this list in proper sequence.
- return handle;
- }
- return AndsPidResponse.NO_HANDLE_FOUND;
+ return CollectionUtils.isEmpty(handles) ? AndsPidResponse.NO_HANDLE_FOUND : this.getHandles().get(0);
}
/**
Modified: trunk/src/main/java/au/csiro/pidclient/CustomHttpsSocketFactory.java
===================================================================
--- trunk/src/main/java/au/csiro/pidclient/CustomHttpsSocketFactory.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/main/java/au/csiro/pidclient/CustomHttpsSocketFactory.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -66,11 +66,8 @@
return sslSocket;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.commons.httpclient.protocol.ProtocolSocketFactory#createSocket(java.lang.String, int,
- * java.net.InetAddress, int)
+ /**
+ * {@inheritDoc}
*/
public Socket createSocket(String host, int port, InetAddress localAddress, int localPort) throws IOException,
UnknownHostException
@@ -78,11 +75,8 @@
return acceptOnlyTLS12(base.createSocket(host, port, localAddress, localPort));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.commons.httpclient.protocol.ProtocolSocketFactory#createSocket(java.lang.String, int,
- * java.net.InetAddress, int, org.apache.commons.httpclient.params.HttpConnectionParams)
+ /**
+ * {@inheritDoc}
*/
public Socket createSocket(String host, int port, InetAddress localAddress, int localPort,
HttpConnectionParams params) throws IOException, UnknownHostException, ConnectTimeoutException
@@ -90,10 +84,8 @@
return acceptOnlyTLS12(base.createSocket(host, port, localAddress, localPort, params));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.commons.httpclient.protocol.ProtocolSocketFactory#createSocket(java.lang.String, int)
+ /**
+ * {@inheritDoc}
*/
public Socket createSocket(String host, int port) throws IOException, UnknownHostException
{
@@ -100,11 +92,8 @@
return acceptOnlyTLS12(base.createSocket(host, port));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory#createSocket(java.net.Socket,
- * java.lang.String, int, boolean)
+ /**
+ * {@inheritDoc}
*/
public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException,
UnknownHostException
Modified: trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
===================================================================
--- trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-12-11 03:31:27 UTC (rev 210)
+++ trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-12-11 04:34:52 UTC (rev 211)
@@ -151,12 +151,12 @@
c.setCreatorName("CSIRO");
c.setNameType("Organizational");
creators.add(c);
- creators.add(new Creator("David", "Phillips"));
- creators.add(new Creator("Rahul", "Gandhi"));
- creators.add(new Creator("Alison", "Chapman"));
- creators.add(new Creator("Matt", "Green"));
- creators.add(new Creator("Rahul", "Dravid"));
- creators.add(new Creator("John", "Smith"));
+ creators.add(new Creator("David", "Phillips", "Personal"));
+ creators.add(new Creator("Rahul", "Gandhi", "Personal"));
+ creators.add(new Creator("Alison", "Chapman", "Personal"));
+ creators.add(new Creator("Matt", "Green", "Personal"));
+ creators.add(new Creator("Rahul", "Dravid", "Personal"));
+ creators.add(new Creator("John", "Smith", "Personal"));
return creators;
}
@@ -367,7 +367,8 @@
}
catch (IllegalArgumentException ex)
{
- // This is expected
+ assertTrue(ex instanceof IllegalArgumentException);
+ assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
}
doiDTO = populateDummydoiDTO();
@@ -378,9 +379,10 @@
DoiMetaDataGenerator.createDoiMetaDataXML(doiDTO);
fail("Validation for Title passed even when we expected to fail");
}
- catch (IllegalArgumentException ex)
+ catch (Exception ex)
{
- // This is expected
+ assertTrue(ex instanceof IllegalArgumentException);
+ assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
}
doiDTO = populateDummydoiDTO();
@@ -393,7 +395,8 @@
}
catch (IllegalArgumentException ex)
{
- // This is expected
+ assertTrue(ex instanceof IllegalArgumentException);
+ assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
}
doiDTO = populateDummydoiDTO();
@@ -406,7 +409,8 @@
}
catch (IllegalArgumentException ex)
{
- // This is expected
+ assertTrue(ex instanceof IllegalArgumentException);
+ assertEquals(ex.getMessage(),"It is most likely that one parameter in DoiDTO is invalid");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-12-11 04:34:31
|
Revision: 210
http://sourceforge.net/p/andspidclient/code/210
Author: chris-trapani
Date: 2018-12-11 04:34:28 +0000 (Tue, 11 Dec 2018)
Log Message:
-----------
DMSTECH-9641 fix for nameType attribute
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-06 23:40:36 UTC (rev 209)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-11 04:34:28 UTC (rev 210)
@@ -429,21 +429,14 @@
firstNode.getAffiliation());
detachExistingNodes(xPath, document);
-
for (int counter = 1; counter < creators.size(); counter++)
{
Element newCreatorNode = (Element) immutableclonedParentElement.clone();
Element childElement = (Element) newCreatorNode.getChildren().get(0);
- final Creator creator = creators.get(counter);
+ Creator creator = creators.get(counter);
childElement.setText(stripNonValidXMLCharacters(creator.getCreatorName()));
- if (StringUtils.isNotEmpty(creator.getNameType()))
- {
- updateAttribute(document, nameSpace, element, DoiMetaDataGenerator.NAME_TYPE,
- creator.getNameType());
- }
-
setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.GIVEN_NAME,
creator.getFirstName());
setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.FAMILY_NAME,
@@ -452,7 +445,8 @@
creator.getNameIdentifier());
setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.AFFILIATION,
creator.getAffiliation());
-
+ newCreatorNode.setAttribute(DoiMetaDataGenerator.NAME_TYPE, creator.getNameType());
+
Element grandParent = baseElement.getParentElement();
grandParent.getParentElement().addContent(counter+1, newCreatorNode);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-12-06 23:41:20
|
Revision: 209
http://sourceforge.net/p/andspidclient/code/209
Author: chris-trapani
Date: 2018-12-06 23:41:18 +0000 (Thu, 06 Dec 2018)
Log Message:
-----------
Merge pull request #5 in APPS/ands-pid-client from bugfix/DMSTECH-9633- to master
* commit 'e6d4113777a3efe86efe5b63af5ad609753d355f':
revert
DMSTECH-9633: preserve dto order for contruibutors.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-12-06 23:41:04
|
Revision: 208
http://sourceforge.net/p/andspidclient/code/208
Author: chris-trapani
Date: 2018-12-06 23:41:02 +0000 (Thu, 06 Dec 2018)
Log Message:
-----------
revert
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-06 05:22:46 UTC (rev 207)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-06 23:41:02 UTC (rev 208)
@@ -509,7 +509,7 @@
baseElement.setAttribute(DoiMetaDataGenerator.DESCRIPTION_TYPE, firstNode.getDescriptionType());
}
- baseElement.getParentElement().addContent(counter+1, newNode);
+ baseElement.getParentElement().addContent(1, newNode);
}
}
else
@@ -634,7 +634,7 @@
clonedParentElement.detach();
Element grandParent = parent.getParentElement();
- grandParent.addContent(counter+1, clonedParentElement);
+ grandParent.addContent(1, clonedParentElement);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-12-06 23:40:49
|
Revision: 207
http://sourceforge.net/p/andspidclient/code/207
Author: chris-trapani
Date: 2018-12-06 23:40:47 +0000 (Thu, 06 Dec 2018)
Log Message:
-----------
DMSTECH-9633: preserve dto order for contruibutors.
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-02 23:21:16 UTC (rev 206)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-06 23:40:47 UTC (rev 207)
@@ -454,7 +454,7 @@
creator.getAffiliation());
Element grandParent = baseElement.getParentElement();
- grandParent.getParentElement().addContent(1, newCreatorNode);
+ grandParent.getParentElement().addContent(counter+1, newCreatorNode);
}
}
else
@@ -509,7 +509,7 @@
baseElement.setAttribute(DoiMetaDataGenerator.DESCRIPTION_TYPE, firstNode.getDescriptionType());
}
- baseElement.getParentElement().addContent(1, newNode);
+ baseElement.getParentElement().addContent(counter+1, newNode);
}
}
else
@@ -634,7 +634,7 @@
clonedParentElement.detach();
Element grandParent = parent.getParentElement();
- grandParent.addContent(1, clonedParentElement);
+ grandParent.addContent(counter+1, clonedParentElement);
}
}
Modified: trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
===================================================================
--- trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-12-02 23:21:16 UTC (rev 206)
+++ trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-12-06 23:40:47 UTC (rev 207)
@@ -147,16 +147,16 @@
private List<Creator> createDummyCreators()
{
List<Creator> creators = new ArrayList<Creator>();
- creators.add(new Creator("John", "Smith"));
- creators.add(new Creator("Matt", "Green"));
- creators.add(new Creator("Alison", "Chapman"));
- creators.add(new Creator("Rahul", "Gandhi"));
- creators.add(new Creator("Rahul", "Dravid"));
- creators.add(new Creator("David", "Phillips"));
Creator c = new Creator();
c.setCreatorName("CSIRO");
c.setNameType("Organizational");
creators.add(c);
+ creators.add(new Creator("David", "Phillips"));
+ creators.add(new Creator("Rahul", "Gandhi"));
+ creators.add(new Creator("Alison", "Chapman"));
+ creators.add(new Creator("Matt", "Green"));
+ creators.add(new Creator("Rahul", "Dravid"));
+ creators.add(new Creator("John", "Smith"));
return creators;
}
@@ -207,10 +207,10 @@
assertEquals("creatorName", ((Element) nodes.get(0)).getName());
assertEquals("CSIRO", ((Element) nodes.get(0)).getText());
assertEquals("Phillips, David", ((Element) nodes.get(1)).getText());
- assertEquals("Dravid, Rahul", ((Element) nodes.get(2)).getText());
- assertEquals("Gandhi, Rahul", ((Element) nodes.get(3)).getText());
- assertEquals("Chapman, Alison", ((Element) nodes.get(4)).getText());
- assertEquals("Green, Matt", ((Element) nodes.get(5)).getText());
+ assertEquals("Gandhi, Rahul", ((Element) nodes.get(2)).getText());
+ assertEquals("Chapman, Alison", ((Element) nodes.get(3)).getText());
+ assertEquals("Green, Matt", ((Element) nodes.get(4)).getText());
+ assertEquals("Dravid, Rahul", ((Element) nodes.get(5)).getText());
assertEquals("Smith, John", ((Element) nodes.get(6)).getText());
XPath resourceTypeXPath = XPath.newInstance(RESOURCETYPE_NAME_XPATH);
@@ -452,7 +452,7 @@
List<Creator> creators = dto.getCreators();
creators.remove(3);
creators.remove(4);
- dto.getCreators().get(0).setFirstName("changed");
+ dto.getCreators().get(1).setFirstName("changed");
dto.setCreators(creators);
@@ -488,10 +488,10 @@
assertEquals("creatorName", ((Element) nodes.get(0)).getName());
assertEquals("CSIRO", ((Element) nodes.get(0)).getText());
- assertEquals("Dravid, Rahul", ((Element) nodes.get(1)).getText());
- assertEquals("Chapman, Alison", ((Element) nodes.get(2)).getText());
+ assertEquals("Phillips, changed", ((Element) nodes.get(1)).getText());
+ assertEquals("Gandhi, Rahul", ((Element) nodes.get(2)).getText());
assertEquals("Green, Matt", ((Element) nodes.get(3)).getText());
- assertEquals("Smith, changed", ((Element) nodes.get(4)).getText());
+ assertEquals("Smith, John", ((Element) nodes.get(4)).getText());
assertEquals("creatorName", ((Element) nodes.get(0)).getName());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-12-02 23:21:35
|
Revision: 206
http://sourceforge.net/p/andspidclient/code/206
Author: chris-trapani
Date: 2018-12-02 23:21:32 +0000 (Sun, 02 Dec 2018)
Log Message:
-----------
Merge pull request #4 in APPS/ands-pid-client from feature/DMSTECH-9566 to master
* commit '7573721470fc5a2066a00e42d05dc7ce9e455a29':
unused import.
DMSTECH-9566: recreate doi xml metadata on update.
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/AndsDoiClient.java
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
Modified: trunk/src/main/java/au/csiro/doiclient/AndsDoiClient.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/AndsDoiClient.java 2018-11-29 02:41:24 UTC (rev 205)
+++ trunk/src/main/java/au/csiro/doiclient/AndsDoiClient.java 2018-12-02 23:21:32 UTC (rev 206)
@@ -46,7 +46,6 @@
import au.csiro.doiclient.business.DoiDTO;
import au.csiro.doiclient.utils.DoiMetaDataGenerator;
import au.csiro.doiclient.utils.HttpUtil;
-import au.csiro.pidclient.AndsPidClient.HandleType;
/**
* This is the main interface to the ANDS DOI Client library. It allows the caller to interact with the <a
@@ -318,7 +317,7 @@
params.put("url", url);
setDebug(params, debug);
- return executeMethod(params, mintMethodName, null, doiDTO);
+ return executeMethod(params, mintMethodName, doiDTO);
}
@@ -439,10 +438,8 @@
}
setDebug(params, debug);
- AndsDoiResponse existingMetaDataXML = requestMetaDataOfDOI(doi);
- return executeMethod(params, updateMethodName,
- existingMetaDataXML.getMessage(), doiDTO);
+ return executeMethod(params, updateMethodName, doiDTO);
}
/**
@@ -487,7 +484,7 @@
setDebug(params, debug);
- return executeMethod(params, methodName, null, null);
+ return executeMethod(params, methodName, null);
}
/**
@@ -547,7 +544,7 @@
params.put("doi", doi);
setDebug(params, debug);
- return executeMethod(params, methodName, null, null);
+ return executeMethod(params, methodName, null);
}
/**
@@ -615,7 +612,7 @@
params.put("doi", doi);
setDebug(params, debug);
- return executeMethod(params, doiMetadataRequestMethodName, null, null);
+ return executeMethod(params, doiMetadataRequestMethodName, null);
}
@@ -699,8 +696,6 @@
* the method to call.
* @param updateURL
* associated with a DOI that needs to be updated.
- * @param existingMetaDataXML
- * meta-data associated with a DOI as held by ANDS.
* @param doiDTO
* holds the objects for constructing / updating the meta-data XML.
* @return a formatted XML response.
@@ -710,7 +705,7 @@
* thrown when attempting to execute method call.
*/
private AndsDoiResponse executeMethod(Map<String,String> queryStringParams, String methodName,
- String existingMetaDataXML, DoiDTO doiDTO) throws HttpException, IOException
+ DoiDTO doiDTO) throws HttpException, IOException
{
String metaDataXML = null;
@@ -745,10 +740,9 @@
// Updates the meta-data xml with the parameters set in the DTO.
if (methodName.equals(updateMethodName) && (doiDTO != null))
{
- metaDataXML = DoiMetaDataGenerator.updateMetaDataXMLFromDTO(existingMetaDataXML, doiDTO);
+ metaDataXML = DoiMetaDataGenerator.generateMetaDataXMLFromDTO(doiDTO);
}
-
return doiRequest(url, metaDataXML, requestType);
}
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-11-29 02:41:24 UTC (rev 205)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-12-02 23:21:32 UTC (rev 206)
@@ -587,7 +587,14 @@
xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
Element theElement = (Element) xPath.selectSingleNode(document);
Attribute attr = theElement.getAttribute(name);
- attr.setValue(stripNonValidXMLCharacters(value));
+ if(attr == null)
+ {
+ theElement.setAttribute(new Attribute(name, value));
+ }
+ else
+ {
+ attr.setValue(stripNonValidXMLCharacters(value));
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-11-29 02:41:40
|
Revision: 205
http://sourceforge.net/p/andspidclient/code/205
Author: chris-trapani
Date: 2018-11-29 02:41:36 +0000 (Thu, 29 Nov 2018)
Log Message:
-----------
Merge pull request #3 in APPS/ands-pid-client from feature/DMSTECH-9566 to master
* commit '023e97bddb9b0a6e3fd2bb93381cea06afc69130':
handle null pointer.
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-11-22 03:35:49 UTC (rev 204)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-11-29 02:41:36 UTC (rev 205)
@@ -557,8 +557,11 @@
XPath xPath = XPath.newInstance(element);
xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
Element baseElement = (Element) xPath.selectSingleNode(document);
- baseElement.removeContent();
- baseElement.detach();
+ if (baseElement != null)
+ {
+ baseElement.removeContent();
+ baseElement.detach();
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-11-22 03:36:04
|
Revision: 204
http://sourceforge.net/p/andspidclient/code/204
Author: chris-trapani
Date: 2018-11-22 03:36:01 +0000 (Thu, 22 Nov 2018)
Log Message:
-----------
Merge pull request #2 in APPS/ands-pid-client from feature/DMSTECH-9566 to master
* commit 'fc07078abdfa3f2d6bfc0ebcb8eec5514f781853':
DMSTECH-9566: update artefact name
Modified Paths:
--------------
trunk/build.gradle
Modified: trunk/build.gradle
===================================================================
--- trunk/build.gradle 2018-11-21 04:40:27 UTC (rev 203)
+++ trunk/build.gradle 2018-11-22 03:36:01 UTC (rev 204)
@@ -25,7 +25,7 @@
jar {
manifest {
- attributes 'Implementation-Title': 'andspidclient', 'Implementation-Version': majorVersion + "."+ minorVersion
+ attributes 'Implementation-Title': 'ands-pid-client', 'Implementation-Version': majorVersion + "."+ minorVersion
}
// useful while debugging
from sourceSets.main.allSource
@@ -80,7 +80,7 @@
publishing {
publications {
mavenJava(MavenPublication) {
- artifactId 'andspidclient'
+ artifactId 'ands-pid-client'
from components.java
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-11-21 04:55:15
|
Revision: 198
http://sourceforge.net/p/andspidclient/code/198
Author: chris-trapani
Date: 2018-11-21 04:41:58 +0000 (Wed, 21 Nov 2018)
Log Message:
-----------
remove unused test class
Removed Paths:
-------------
trunk/src/test/java/au/csiro/pidclient/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-11-21 04:55:15
|
Revision: 197
http://sourceforge.net/p/andspidclient/code/197
Author: chris-trapani
Date: 2018-11-21 04:41:46 +0000 (Wed, 21 Nov 2018)
Log Message:
-----------
update gradle version
Modified Paths:
--------------
trunk/build.gradle
trunk/gradle/wrapper/gradle-wrapper.properties
Modified: trunk/build.gradle
===================================================================
--- trunk/build.gradle 2018-11-16 04:41:21 UTC (rev 196)
+++ trunk/build.gradle 2018-11-21 04:41:46 UTC (rev 197)
@@ -3,13 +3,13 @@
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
-group = 'au.csiro'
+group = 'net.sourceforge'
description = """ands-pid-client"""
ext {
majorVersion = 1
- minorVersion = 0
+ minorVersion = 1
}
dependencies {
compile group: 'commons-httpclient', name: 'commons-httpclient', version:'3.1'
@@ -25,7 +25,7 @@
jar {
manifest {
- attributes 'Implementation-Title': 'ands-pid-client', 'Implementation-Version': majorVersion + "."+ minorVersion
+ attributes 'Implementation-Title': 'andspidclient', 'Implementation-Version': majorVersion + "."+ minorVersion
}
// useful while debugging
from sourceSets.main.allSource
@@ -80,7 +80,7 @@
publishing {
publications {
mavenJava(MavenPublication) {
- artifactId 'ands-pid-client'
+ artifactId 'andspidclient'
from components.java
}
}
Modified: trunk/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- trunk/gradle/wrapper/gradle-wrapper.properties 2018-11-16 04:41:21 UTC (rev 196)
+++ trunk/gradle/wrapper/gradle-wrapper.properties 2018-11-21 04:41:46 UTC (rev 197)
@@ -1,6 +1,6 @@
-#Mon Nov 12 15:13:58 AEDT 2018
+#Mon Nov 19 11:36:41 AEDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-11-21 04:55:15
|
Revision: 196
http://sourceforge.net/p/andspidclient/code/196
Author: chris-trapani
Date: 2018-11-21 04:41:26 +0000 (Wed, 21 Nov 2018)
Log Message:
-----------
DMSTECH-9566: convert to gradle.
Add recommended DataCite field support
Modified Paths:
--------------
trunk/config/Code Format.xml
trunk/src/main/java/au/csiro/doiclient/AndsDoiClient.java
trunk/src/main/java/au/csiro/doiclient/AndsDoiResponse.java
trunk/src/main/java/au/csiro/doiclient/business/AndsDoiIdentity.java
trunk/src/main/java/au/csiro/doiclient/business/DoiDTO.java
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
trunk/src/main/java/au/csiro/doiclient/utils/DoiMetaDataGenerator.java
trunk/src/main/java/au/csiro/doiclient/utils/HttpUtil.java
trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java
trunk/src/main/java/au/csiro/pidclient/CustomHttpsSocketFactory.java
trunk/src/main/resources/DoiMetadataTemplate.xml
trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
trunk/src/test/java/au/csiro/pidclient/TestAndsPidClient.java
Added Paths:
-----------
trunk/.gradle/
trunk/bin/
trunk/build/
trunk/build.gradle
trunk/config/NOTICE.template
trunk/config/checkstyle/
trunk/config/checkstyle/checkstyle.xml
trunk/config/checkstyle/suppressions.xml
trunk/config/codetemplates.xml
trunk/config/findbugs/
trunk/config/findbugs/excludeFilter.xml
trunk/config/license-mappings.xml
trunk/config/pmd/
trunk/config/pmd/pmdRules.xml
trunk/config/pmd/pmdRulesMain.xml
trunk/config/pmd/pmdRulesTest.xml
trunk/gradle/
trunk/gradle/coverage-report.gradle
trunk/gradle/publish.gradle
trunk/gradle/report.gradle
trunk/gradle/version.properties.template
trunk/gradle/versioning.gradle
trunk/gradle/wrapper/
trunk/gradle/wrapper/gradle-wrapper.jar
trunk/gradle/wrapper/gradle-wrapper.properties
trunk/gradlew
trunk/gradlew.bat
trunk/settings.gradle
trunk/src/main/java/au/csiro/doiclient/business/Creator.java
trunk/src/main/java/au/csiro/doiclient/business/Description.java
trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
trunk/src/main/java/au/csiro/doiclient/business/RelatedIdentifier.java
trunk/src/main/java/au/csiro/doiclient/business/Subject.java
Removed Paths:
-------------
trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/.settings/org.maven.ide.eclipse.prefs
trunk/config/checkstyle_checks.xml
trunk/config/dist-assembly.xml
Property Changed:
----------------
trunk/
trunk/.settings/
trunk/config/
trunk/src/
trunk/src/main/
trunk/src/main/java/
trunk/src/main/java/au/
trunk/src/main/java/au/csiro/
trunk/src/main/java/au/csiro/doiclient/
trunk/src/main/java/au/csiro/doiclient/business/
trunk/src/main/java/au/csiro/doiclient/utils/
trunk/src/main/java/au/csiro/pidclient/
trunk/src/main/java/au/csiro/pidclient/business/
trunk/src/main/javadoc/
trunk/src/main/resources/
trunk/src/main/resources/schema/
trunk/src/main/resources/schema/include/
trunk/src/site/
trunk/src/site/apt/
trunk/src/test/
trunk/src/test/java/
trunk/src/test/java/au/
trunk/src/test/java/au/csiro/
trunk/src/test/java/au/csiro/doiclient/
trunk/src/test/java/au/csiro/doiclient/utils/
trunk/src/test/java/au/csiro/pidclient/
Index: trunk
===================================================================
--- trunk 2016-10-19 06:20:31 UTC (rev 195)
+++ trunk 2018-11-21 04:41:26 UTC (rev 196)
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
-target
+.project
+.classpath
Index: trunk/.gradle
===================================================================
--- trunk/.gradle 2016-10-19 06:20:31 UTC (rev 195)
+++ trunk/.gradle 2018-11-21 04:41:26 UTC (rev 196)
Property changes on: trunk/.gradle
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+.project
+.classpath
+*
Index: trunk/.settings
===================================================================
--- trunk/.settings 2016-10-19 06:20:31 UTC (rev 195)
+++ trunk/.settings 2018-11-21 04:41:26 UTC (rev 196)
Property changes on: trunk/.settings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+.project
+.classpath
+*
Deleted: trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/.settings/org.eclipse.wst.common.project.facet.core.xml 2016-10-19 06:20:31 UTC (rev 195)
+++ trunk/.settings/org.eclipse.wst.common.project.facet.core.xml 2018-11-21 04:41:26 UTC (rev 196)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <installed facet="jst.java" version="5.0"/>
-</faceted-project>
Deleted: trunk/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/.settings/org.maven.ide.eclipse.prefs 2016-10-19 06:20:31 UTC (rev 195)
+++ trunk/.settings/org.maven.ide.eclipse.prefs 2018-11-21 04:41:26 UTC (rev 196)
@@ -1,9 +0,0 @@
-#Fri Feb 05 11:27:47 EST 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
Index: trunk/bin
===================================================================
--- trunk/bin 2016-10-19 06:20:31 UTC (rev 195)
+++ trunk/bin 2018-11-21 04:41:26 UTC (rev 196)
Property changes on: trunk/bin
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+.project
+.classpath
+*
Index: trunk/build
===================================================================
--- trunk/build 2016-10-19 06:20:31 UTC (rev 195)
+++ trunk/build 2018-11-21 04:41:26 UTC (rev 196)
Property changes on: trunk/build
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+.project
+.classpath
+*
Added: trunk/build.gradle
===================================================================
--- trunk/build.gradle (rev 0)
+++ trunk/build.gradle 2018-11-21 04:41:26 UTC (rev 196)
@@ -0,0 +1,88 @@
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
+
+group = 'au.csiro'
+
+description = """ands-pid-client"""
+
+ext {
+ majorVersion = 1
+ minorVersion = 0
+}
+dependencies {
+ compile group: 'commons-httpclient', name: 'commons-httpclient', version:'3.1'
+ compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.7'
+ compile group: 'commons-lang', name: 'commons-lang', version:'2.4'
+ compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.0'
+ compile(group: 'org.jdom', name: 'jdom', version:'1.1.2') {
+ exclude(module: 'maven-cobertura-plugin')
+ exclude(module: 'maven-findbugs-plugin')
+ }
+ testCompile group: 'junit', name: 'junit', version:'3.8.1'
+}
+
+jar {
+ manifest {
+ attributes 'Implementation-Title': 'ands-pid-client', 'Implementation-Version': majorVersion + "."+ minorVersion
+ }
+ // useful while debugging
+ from sourceSets.main.allSource
+}
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+ mavenCentral()
+}
+
+
+apply from: 'gradle/versioning.gradle'
+
+
+//=====================================================================================================================
+//
+// Main artifact build configuration
+//
+//=====================================================================================================================
+
+jar.dependsOn makeVersionProps
+
+//=====================================================================================================================
+//
+// Eclipse Configuration
+//
+//=====================================================================================================================
+
+eclipse {
+ project {
+ natures 'org.springsource.ide.eclipse.gradle.core.nature'
+ }
+}
+
+//=====================================================================================================================
+//
+// Include other build files
+//
+//=====================================================================================================================
+
+// Produces pmd, findbugs and checkstyle reports.
+apply from: 'gradle/report.gradle'
+
+// Produces jacoco code coverage report.
+apply from: 'gradle/coverage-report.gradle'
+
+// We conditionally apply the publish script so that we don't need the properties for all builds.
+if (gradle.startParameter.taskNames.any{it =~ /publish/}) {
+ apply from: 'gradle/publish.gradle'
+ publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ artifactId 'ands-pid-client'
+ from components.java
+ }
+ }
+ }
+}
\ No newline at end of file
Index: trunk/config
===================================================================
--- trunk/config 2016-10-19 06:20:31 UTC (rev 195)
+++ trunk/config 2018-11-21 04:41:26 UTC (rev 196)
Property changes on: trunk/config
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.project
+.classpath
Modified: trunk/config/Code Format.xml
===================================================================
--- trunk/config/Code Format.xml 2016-10-19 06:20:31 UTC (rev 195)
+++ trunk/config/Code Format.xml 2018-11-21 04:41:26 UTC (rev 196)
@@ -1,287 +1,295 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2010, CSIRO Australia.
-
- 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.
-
--->
-
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="CSIRO" version="11">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="CSIRO" version="12">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
+<setting id="org.eclipse....
[truncated message content] |
|
From: <chr...@us...> - 2018-11-21 04:55:14
|
Revision: 203
http://sourceforge.net/p/andspidclient/code/203
Author: chris-trapani
Date: 2018-11-21 04:43:27 +0000 (Wed, 21 Nov 2018)
Log Message:
-----------
Merge pull request #1 in APPS/ands-pid-client from feature/DMSTECH-9566 to master
* commit '6e48509d96c192c7eb1f0d0dcf7564da06e5aa58':
set area for geolocation correctly. remove unused global on test class
update xml to look a bit better
peer review.
update file version annotations
remove unused test class
update gradle version
DMSTECH-9566: convert to gradle. Add recommended DataCite field support
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-11-21 04:55:14
|
Revision: 202
http://sourceforge.net/p/andspidclient/code/202
Author: chris-trapani
Date: 2018-11-21 04:43:12 +0000 (Wed, 21 Nov 2018)
Log Message:
-----------
set area for geolocation correctly.
remove unused global on test class
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
Modified: trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java 2018-11-20 23:25:44 UTC (rev 201)
+++ trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java 2018-11-21 04:43:12 UTC (rev 202)
@@ -44,16 +44,14 @@
* East
* @param w
* West
- * @param locationType
- * The location type
*/
- public GeoLocation(String n, String s, String e, String w, LocationType locationType)
+ public GeoLocation(String n, String s, String e, String w)
{
this.north = n;
this.east = e;
this.south = s;
this.west = w;
- this.locationType = locationType;
+ this.locationType = LocationType.AREA;
}
/**
@@ -63,14 +61,12 @@
* The latitude
* @param longitude
* The longitude
- * @param locationType
- * The location type
*/
- public GeoLocation(String latitude, String longitude, LocationType locationType)
+ public GeoLocation(String latitude, String longitude)
{
this.latitude = latitude;
this.longitude = longitude;
- this.locationType = locationType;
+ this.locationType = LocationType.POINT;
}
public LocationType getLocationType()
Modified: trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
===================================================================
--- trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-11-20 23:25:44 UTC (rev 201)
+++ trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-11-21 04:43:12 UTC (rev 202)
@@ -74,9 +74,6 @@
* Constant giving the xPath of the subject type
*/
private static final String SUBJECT_XPATH = "/xsi:resource/xsi:subjects/xsi:subject";
-
- /** Constant giving the path to the meta-data template **/
- String metadataTemplatePath = "DoiMetadataTemplate.xml";
/**
* Populates a DTO with values that will passed on the DOIMetaDataTemplate.
@@ -114,14 +111,14 @@
// add geo points
List<GeoLocation> geoLocations = new ArrayList<>();
- GeoLocation gl = new GeoLocation("-35.307380", "149.098210", GeoLocation.LocationType.POINT);
+ GeoLocation gl = new GeoLocation("-35.307380", "149.098210");
geoLocations.add(gl);
- GeoLocation gl1 = new GeoLocation("-37.307380", "155.098210", GeoLocation.LocationType.POINT);
+ GeoLocation gl1 = new GeoLocation("-37.307380", "155.098210");
geoLocations.add(gl1);
// add geo area
- GeoLocation gl2 = new GeoLocation("-16.0", "-22.0", "145.0", "139.7", GeoLocation.LocationType.AREA);
+ GeoLocation gl2 = new GeoLocation("-16.0", "-22.0", "145.0", "139.7");
geoLocations.add(gl2);
doiDTO.setGeoLocations(geoLocations);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-11-21 04:55:14
|
Revision: 201
http://sourceforge.net/p/andspidclient/code/201
Author: chris-trapani
Date: 2018-11-21 04:42:59 +0000 (Wed, 21 Nov 2018)
Log Message:
-----------
update xml to look a bit better
Modified Paths:
--------------
trunk/src/main/resources/DoiMetadataTemplate.xml
Modified: trunk/src/main/resources/DoiMetadataTemplate.xml
===================================================================
--- trunk/src/main/resources/DoiMetadataTemplate.xml 2018-11-20 06:31:05 UTC (rev 200)
+++ trunk/src/main/resources/DoiMetadataTemplate.xml 2018-11-21 04:42:59 UTC (rev 201)
@@ -22,8 +22,8 @@
<creators>
<creator>
<creatorName nameType="Personal">Schimanski, Alexander</creatorName>
- <givenName>Elizabeth</givenName>
- <familyName>Miller</familyName>
+ <givenName>Alexander</givenName>
+ <familyName>Schimanski</familyName>
<nameIdentifier schemeURI="http://orcid.org/" nameIdentifierScheme="ORCID">0000-0001-5000-0007</nameIdentifier>
<affiliation>DataCite</affiliation>
</creator>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-11-21 04:55:14
|
Revision: 200
http://sourceforge.net/p/andspidclient/code/200
Author: chris-trapani
Date: 2018-11-21 04:42:41 +0000 (Wed, 21 Nov 2018)
Log Message:
-----------
peer review.
Modified Paths:
--------------
trunk/config/NOTICE.template
trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
Removed Paths:
-------------
trunk/config/license-mappings.xml
Modified: trunk/config/NOTICE.template
===================================================================
--- trunk/config/NOTICE.template 2018-11-19 01:26:31 UTC (rev 199)
+++ trunk/config/NOTICE.template 2018-11-21 04:42:41 UTC (rev 200)
@@ -1,5 +1,5 @@
CASDA Commons
-Copyright (c) 2014, Commonwealth Scientific and Industrial Research Organisation (CSIRO) ABN 41 687 119 230.
+Copyright (c) 2018, Commonwealth Scientific and Industrial Research Organisation (CSIRO) ABN 41 687 119 230.
This project includes:
#GENERATED_NOTICES#
\ No newline at end of file
Deleted: trunk/config/license-mappings.xml
===================================================================
--- trunk/config/license-mappings.xml 2018-11-19 01:26:31 UTC (rev 199)
+++ trunk/config/license-mappings.xml 2018-11-21 04:42:41 UTC (rev 200)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<license-lookup xmlns="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup https://source.jasig.org/schemas/maven-notice-plugin/license-lookup/license-lookup-v1.0.xsd">
- <artifact>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- <license>Apache License, Version 2.0</license>
- </artifact>
- <artifact>
- <groupId>au.csiro</groupId>
- <artifactId>atnf-ivoa-tools</artifactId>
- <version>1.0.1</version>
- <license>Apache License, Version 2.0</license>
- </artifact>
- <artifact>
- <groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.1</version>
- <license>Apache License, Version 2.0</license>
- </artifact>
- <artifact>
- <groupId>imagej</groupId>
- <artifactId>ij</artifactId>
- <version>1.47d</version>
- <license>Public Domain</license>
- </artifact>
- <artifact>
- <groupId>nom.tam</groupId>
- <artifactId>fits</artifactId>
- <version>0.9.100</version>
- <license>Public Domain</license>
- </artifact>
- <artifact>
- <groupId>ojdbc6</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.2.0.3.0</version>
- <license>Oracle Technology Network Development and Distribution License</license>
- </artifact>
- <artifact>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.3.1</version>
- <license>Apache License, Version 2.0</license>
- </artifact>
- <artifact>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-odm</artifactId>
- <version>1.3.1.RELEASE</version>
- <license>Apache License, Version 2.0</license>
- </artifact>
- <artifact>
- <groupId>tomcat</groupId>
- <artifactId>naming-resources</artifactId>
- <version>5.0.28</version>
- <license>Apache License, Version 2.0</license>
- </artifact>
-</license-lookup>
Modified: trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java 2018-11-19 01:26:31 UTC (rev 199)
+++ trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java 2018-11-21 04:42:41 UTC (rev 200)
@@ -44,13 +44,16 @@
* East
* @param w
* West
+ * @param locationType
+ * The location type
*/
- public GeoLocation(String n, String s, String e, String w)
+ public GeoLocation(String n, String s, String e, String w, LocationType locationType)
{
this.north = n;
this.east = e;
this.south = s;
this.west = w;
+ this.locationType = locationType;
}
/**
@@ -60,11 +63,14 @@
* The latitude
* @param longitude
* The longitude
+ * @param locationType
+ * The location type
*/
- public GeoLocation(String latitude, String longitude)
+ public GeoLocation(String latitude, String longitude, LocationType locationType)
{
this.latitude = latitude;
this.longitude = longitude;
+ this.locationType = locationType;
}
public LocationType getLocationType()
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-11-19 01:26:31 UTC (rev 199)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-11-21 04:42:41 UTC (rev 200)
@@ -145,9 +145,7 @@
{
if (CollectionUtils.isNotEmpty(relatedIdentifiers))
{
- XPath xPath = XPath.newInstance(element);
- xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
- Element baseElement = (Element) xPath.selectSingleNode(document);
+ Element baseElement = getElement(document, nameSpace, element);
Element relatedIdentifiersElement = baseElement.getParentElement();
relatedIdentifiersElement.getContent().clear();
relatedIdentifiersElement.addContent(baseElement);
@@ -211,9 +209,8 @@
{
if (CollectionUtils.isNotEmpty(subjects))
{
- XPath xPath = XPath.newInstance(element);
- xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
- Element baseElement = (Element) xPath.selectSingleNode(document);
+ Element baseElement = getElement(document, nameSpace, element);
+
Element relatedIdentifiersElement = baseElement.getParentElement();
relatedIdentifiersElement.getContent().clear();
relatedIdentifiersElement.addContent(baseElement);
@@ -227,7 +224,7 @@
final Subject s = subjects.get(counter);
- updateSubjectElement(baseElement, s);
+ updateSubjectElement(newNode, s);
baseElement.getParentElement().addContent(1, newNode);
}
@@ -239,6 +236,26 @@
}
}
+ /**
+ * Gets an element by name.
+ *
+ * @param document
+ * The xml document
+ * @param nameSpace
+ * The namespace the element belongs to
+ * @param element
+ * The name of the element to retrieve.
+ * @return The element if found.
+ * @throws JDOMException
+ * On error.
+ */
+ private static Element getElement(Document document, String nameSpace, String element) throws JDOMException
+ {
+ XPath xPath = XPath.newInstance(element);
+ xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
+ return (Element) xPath.selectSingleNode(document);
+ }
+
private static void updateSubjectElement(Element baseElement, final Subject firstNode)
{
baseElement.setText(stripNonValidXMLCharacters(firstNode.getSubject()));
@@ -283,6 +300,7 @@
XPath xPath = XPath.newInstance(element);
xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
Element baseElement = (Element) xPath.selectSingleNode(document);
+
final GeoLocation firstNode = geoLocations.get(0);
Element geoLocationsElement = baseElement.getParentElement();
geoLocationsElement.getContent().clear();
@@ -390,6 +408,7 @@
XPath xPath = XPath.newInstance(element);
xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
Element baseElement = (Element) xPath.selectSingleNode(document);
+
final Creator firstNode = creators.get(0);
final Element immutableclonedParentElement = (Element) baseElement.getParentElement().clone();
@@ -464,9 +483,8 @@
{
if (CollectionUtils.isNotEmpty(descriptions))
{
- XPath xPath = XPath.newInstance(element);
- xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
- Element baseElement = (Element) xPath.selectSingleNode(document);
+ Element baseElement = getElement(document, nameSpace, element);
+
Element descriptionNode = baseElement.getParentElement();
descriptionNode.getContent().clear();
descriptionNode.addContent(baseElement);
@@ -586,10 +604,10 @@
public static void updateElementValues(Document document, String nameSpace, String element, List<String> values)
throws JDOMException
{
-
XPath xPath = XPath.newInstance(element);
xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
Element baseElement = (Element) xPath.selectSingleNode(document);
+
baseElement.setText(stripNonValidXMLCharacters(values.get(0)));
detachExistingNodes(xPath, document);
Modified: trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
===================================================================
--- trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-11-19 01:26:31 UTC (rev 199)
+++ trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-11-21 04:42:41 UTC (rev 200)
@@ -111,23 +111,20 @@
List<Description> descriptions = new ArrayList<>();
descriptions.add(desc);
doiDTO.setDescriptions(descriptions);
-
+
// add geo points
List<GeoLocation> geoLocations = new ArrayList<>();
- GeoLocation gl = new GeoLocation("-35.307380", "149.098210");
- gl.setLocationType(GeoLocation.LocationType.POINT);
+ GeoLocation gl = new GeoLocation("-35.307380", "149.098210", GeoLocation.LocationType.POINT);
geoLocations.add(gl);
-
- GeoLocation gl1 = new GeoLocation("-37.307380", "155.098210");
- gl1.setLocationType(GeoLocation.LocationType.POINT);
+
+ GeoLocation gl1 = new GeoLocation("-37.307380", "155.098210", GeoLocation.LocationType.POINT);
geoLocations.add(gl1);
// add geo area
- GeoLocation gl2 = new GeoLocation("-16.0", "-22.0", "145.0", "139.7");
- gl2.setLocationType(GeoLocation.LocationType.AREA);
+ GeoLocation gl2 = new GeoLocation("-16.0", "-22.0", "145.0", "139.7", GeoLocation.LocationType.AREA);
geoLocations.add(gl2);
doiDTO.setGeoLocations(geoLocations);
-
+
// subjects
List<Subject> subjects = new ArrayList<>();
Subject s = new Subject();
@@ -291,14 +288,14 @@
@SuppressWarnings("rawtypes")
List subjectNodes = subjectsXpath.selectNodes(document);
assertEquals(2, subjectNodes.size());
- assertEquals("subject1", ((Element)subjectNodes.get(0)).getText());
- assertEquals("subject", ((Element)subjectNodes.get(1)).getText());
- assertEquals("subjectScheme1", ((Element)subjectNodes.get(0)).getAttributeValue("subjectScheme"));
- assertEquals("subjectScheme", ((Element)subjectNodes.get(1)).getAttributeValue("subjectScheme"));
- assertEquals("schemeURI1", ((Element)subjectNodes.get(0)).getAttributeValue("schemeURI"));
- assertEquals("schemeURI", ((Element)subjectNodes.get(1)).getAttributeValue("schemeURI"));
- assertEquals("valueUri1", ((Element)subjectNodes.get(0)).getAttributeValue("valueURI"));
- assertEquals("valueUri", ((Element)subjectNodes.get(1)).getAttributeValue("valueURI"));
+ assertEquals("subject", ((Element)subjectNodes.get(0)).getText());
+ assertEquals("subject1", ((Element)subjectNodes.get(1)).getText());
+ assertEquals("subjectScheme", ((Element)subjectNodes.get(0)).getAttributeValue("subjectScheme"));
+ assertEquals("subjectScheme1", ((Element)subjectNodes.get(1)).getAttributeValue("subjectScheme"));
+ assertEquals("schemeURI", ((Element)subjectNodes.get(0)).getAttributeValue("schemeURI"));
+ assertEquals("schemeURI1", ((Element)subjectNodes.get(1)).getAttributeValue("schemeURI"));
+ assertEquals("valueUri", ((Element)subjectNodes.get(0)).getAttributeValue("valueURI"));
+ assertEquals("valueUri1", ((Element)subjectNodes.get(1)).getAttributeValue("valueURI"));
}
/**
@@ -562,14 +559,14 @@
@SuppressWarnings("rawtypes")
List subjectNodes = subjectsXpath.selectNodes(document);
assertEquals(2, subjectNodes.size());
- assertEquals("updatedSubject1", ((Element)subjectNodes.get(0)).getText());
- assertEquals("updatedSubject", ((Element)subjectNodes.get(1)).getText());
- assertEquals("subjectScheme1", ((Element)subjectNodes.get(0)).getAttributeValue("subjectScheme"));
- assertEquals("subjectScheme", ((Element)subjectNodes.get(1)).getAttributeValue("subjectScheme"));
- assertEquals("schemeURI1", ((Element)subjectNodes.get(0)).getAttributeValue("schemeURI"));
- assertEquals("schemeURI", ((Element)subjectNodes.get(1)).getAttributeValue("schemeURI"));
- assertEquals("valueUri1", ((Element)subjectNodes.get(0)).getAttributeValue("valueURI"));
- assertEquals("valueUri", ((Element)subjectNodes.get(1)).getAttributeValue("valueURI"));
+ assertEquals("updatedSubject", ((Element)subjectNodes.get(0)).getText());
+ assertEquals("updatedSubject1", ((Element)subjectNodes.get(1)).getText());
+ assertEquals("subjectScheme", ((Element)subjectNodes.get(0)).getAttributeValue("subjectScheme"));
+ assertEquals("subjectScheme1", ((Element)subjectNodes.get(1)).getAttributeValue("subjectScheme"));
+ assertEquals("schemeURI", ((Element)subjectNodes.get(0)).getAttributeValue("schemeURI"));
+ assertEquals("schemeURI1", ((Element)subjectNodes.get(1)).getAttributeValue("schemeURI"));
+ assertEquals("valueUri", ((Element)subjectNodes.get(0)).getAttributeValue("valueURI"));
+ assertEquals("valueUri1", ((Element)subjectNodes.get(1)).getAttributeValue("valueURI"));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2018-11-21 04:55:14
|
Revision: 199
http://sourceforge.net/p/andspidclient/code/199
Author: chris-trapani
Date: 2018-11-21 04:42:25 +0000 (Wed, 21 Nov 2018)
Log Message:
-----------
update file version annotations
Modified Paths:
--------------
trunk/src/main/java/au/csiro/doiclient/AndsDoiClient.java
trunk/src/main/java/au/csiro/doiclient/AndsDoiResponse.java
trunk/src/main/java/au/csiro/doiclient/business/AndsDoiIdentity.java
trunk/src/main/java/au/csiro/doiclient/business/Creator.java
trunk/src/main/java/au/csiro/doiclient/business/Description.java
trunk/src/main/java/au/csiro/doiclient/business/DoiDTO.java
trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
trunk/src/main/java/au/csiro/doiclient/business/RelatedIdentifier.java
trunk/src/main/java/au/csiro/doiclient/business/Subject.java
trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
trunk/src/main/java/au/csiro/doiclient/utils/DoiMetaDataGenerator.java
trunk/src/main/java/au/csiro/doiclient/utils/HttpUtil.java
trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java
trunk/src/main/java/au/csiro/pidclient/CustomHttpsSocketFactory.java
trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
Modified: trunk/src/main/java/au/csiro/doiclient/AndsDoiClient.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/AndsDoiClient.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/AndsDoiClient.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -90,7 +90,7 @@
*
* @author Robert Bridle on 05/02/2010
* @author John Page on 03/03/2012
- * @version $Revision: 180 $Date: $
+ * @version $Revision$ $Date$
*/
public class AndsDoiClient
{
Modified: trunk/src/main/java/au/csiro/doiclient/AndsDoiResponse.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/AndsDoiResponse.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/AndsDoiResponse.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -23,7 +23,7 @@
*
* @author John Page on 06/03/2012
*
- * @version $Revision: 171 $ $Date: 2012-08-02 12:17:06 +1000 (Thu, 02 Aug 2012) $
+ * @version $Revision$ $Date$
*/
public class AndsDoiResponse
{
Modified: trunk/src/main/java/au/csiro/doiclient/business/AndsDoiIdentity.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/AndsDoiIdentity.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/business/AndsDoiIdentity.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -25,7 +25,7 @@
*
* @author John Page on 03/03/2012
*
- * @version $Revision: 142 $Date: $
+ * @version $Revision$ $Date$
*/
public class AndsDoiIdentity
{
Modified: trunk/src/main/java/au/csiro/doiclient/business/Creator.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/business/Creator.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -10,7 +10,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author Chris Trapani on 13/11/2018
- * @version $Revision: 191 $Date: $
+ * @version $Revision$ $Date$
*/
public class Creator
{
Modified: trunk/src/main/java/au/csiro/doiclient/business/Description.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Description.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/business/Description.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -8,7 +8,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author Chris Trapani on 13/11/2018
- * @version $Revision: 191 $Date: $
+ * @version $Revision$ $Date$
*/
public class Description
{
Modified: trunk/src/main/java/au/csiro/doiclient/business/DoiDTO.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/DoiDTO.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/business/DoiDTO.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -28,7 +28,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author John Page on 03/03/2012
- * @version $Revision: 191 $Date: $
+ * @version $Revision$ $Date$
*/
public class DoiDTO implements Serializable
{
Modified: trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -8,7 +8,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author Chris Trapani on 13/11/2018
- * @version $Revision: 191 $Date: $
+ * @version $Revision$ $Date$
*/
public class GeoLocation
{
Modified: trunk/src/main/java/au/csiro/doiclient/business/RelatedIdentifier.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/RelatedIdentifier.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/business/RelatedIdentifier.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -6,7 +6,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author Chris Trapani on 13/11/2018
- * @version $Revision: 191 $Date: $
+ * @version $Revision$ $Date$
*/
public class RelatedIdentifier
{
Modified: trunk/src/main/java/au/csiro/doiclient/business/Subject.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/Subject.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/business/Subject.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -8,7 +8,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author Chris Trapani on 13/11/2018
- * @version $Revision: 191 $Date: $
+ * @version $Revision$ $Date$
*/
public class Subject
{
Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -50,7 +50,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author Martin Pienaar on 22/07/2012
- * @version $Revision: 191 $ $Date: 2016-10-10 17:54:28 +1100 (Mon, 10 Oct 2016) $
+ * @version $Revision$ $Date$
*/
public class ConverterUtils
{
Modified: trunk/src/main/java/au/csiro/doiclient/utils/DoiMetaDataGenerator.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/DoiMetaDataGenerator.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/utils/DoiMetaDataGenerator.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -40,7 +40,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author John Page on 03/03/2011
- * @version $Revision: 191 $Date: $
+ * @version $Revision$ $Date$
*/
public class DoiMetaDataGenerator
{
Modified: trunk/src/main/java/au/csiro/doiclient/utils/HttpUtil.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/HttpUtil.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/doiclient/utils/HttpUtil.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -30,7 +30,7 @@
* All rights reserved.
*
* @author Simon Bear on 15/05/2012
- * @version $Revision: 155 $ $Date: 2012-05-16 12:25:34 +1000 (Wed, 16 May 2012) $
+ * @version $Revision$ $Date$
*/
public class HttpUtil
{
Modified: trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java
===================================================================
--- trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -89,7 +89,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author Robert Bridle on 05/02/2010
- * @version $Revision: 7131 $ $Date: 2010-06-09 14:25:15 +1000 (Wed, 09 Jun 2010) $
+ * @version $Revision$ $Date$
*/
public class AndsPidClient
{
Modified: trunk/src/main/java/au/csiro/pidclient/CustomHttpsSocketFactory.java
===================================================================
--- trunk/src/main/java/au/csiro/pidclient/CustomHttpsSocketFactory.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/main/java/au/csiro/pidclient/CustomHttpsSocketFactory.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -33,7 +33,7 @@
* Copyright 2016, CSIRO Australia All rights reserved.
*
* @author John Page on 18/02/2016
- * @version $Revision: 181 $ $Date: 2016-02-19 13:40:28 +1100 (Fri, 19 Feb 2016) $
+ * @version $Revision$ $Date$
*/
public class CustomHttpsSocketFactory implements SecureProtocolSocketFactory
{
Modified: trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
===================================================================
--- trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-11-19 00:44:47 UTC (rev 198)
+++ trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java 2018-11-21 04:42:25 UTC (rev 199)
@@ -36,7 +36,7 @@
* Copyright 2012, CSIRO Australia All rights reserved.
*
* @author John Page on 6/03/2012
- * @version $Revision: 192 $Date: $
+ * @version $Revision$ $Date$
*/
public class TestDoiMetaDataGenerator extends TestCase
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@us...> - 2016-10-19 06:20:34
|
Revision: 195
http://sourceforge.net/p/andspidclient/code/195
Author: csirobuilduser
Date: 2016-10-19 06:20:31 +0000 (Wed, 19 Oct 2016)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2016-10-19 06:20:25 UTC (rev 194)
+++ trunk/pom.xml 2016-10-19 06:20:31 UTC (rev 195)
@@ -52,7 +52,7 @@
<groupId>net.sourceforge.andspidclient</groupId>
<artifactId>ands-pid-client</artifactId>
<packaging>jar</packaging>
- <version>1.0.33</version>
+ <version>1.0.34-SNAPSHOT</version>
<name>ands-pid-client</name>
<description>A generic client library for accessing the ANDS Persistent Identifier and the DOI services. See the Javadoc report for full details on usage.</description>
<url>http://andspidclient.sourceforge.net/</url>
@@ -61,9 +61,9 @@
<url>https://sourceforge.net/apps/trac/andspidclient/</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/andspidclient/code/tags/ands-pid-client-1.0.33</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/andspidclient/code/tags/ands-pid-client-1.0.33</developerConnection>
- <url>http://svn.code.sf.net/p/viewvc/andspidclient/tags/ands-pid-client-1.0.33</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/andspidclient/code/trunk</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/andspidclient/code/trunk</developerConnection>
+ <url>http://svn.code.sf.net/p/viewvc/andspidclient/trunk</url>
</scm>
<distributionManagement>
<site>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
