From 78ab0e203f04f62305086828aba6a417f83845ec Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 28 Jul 2022 14:35:46 +0200 Subject: [PATCH] removed maven-resources plugin declaration from pom. Fix copyTest Junit --- distro/CHANGELOG | 16 ----- distro/LICENSE | 2 - distro/MAINTAINERS | 1 - distro/README | Bin 1515 -> 0 bytes distro/changelog.xml | 55 --------------- distro/descriptor.xml | 32 --------- distro/profile.xml | 25 ------- distro/svnpath.txt | 1 - pom.xml | 64 ++++++++---------- .../storageclient/test/CopyTest.java | 1 + 10 files changed, 31 insertions(+), 166 deletions(-) delete mode 100644 distro/CHANGELOG delete mode 100644 distro/LICENSE delete mode 100644 distro/MAINTAINERS delete mode 100644 distro/README delete mode 100644 distro/changelog.xml delete mode 100644 distro/descriptor.xml delete mode 100644 distro/profile.xml delete mode 100644 distro/svnpath.txt diff --git a/distro/CHANGELOG b/distro/CHANGELOG deleted file mode 100644 index 49759c5..0000000 --- a/distro/CHANGELOG +++ /dev/null @@ -1,16 +0,0 @@ -v 2.2.0 (21-04-2015) - * change smp protocol -v 2.1.0 (01-04-2014) - * support MongoDB backend with authentication -v 2.0.1 (29-05-2013) - * bug fix incident: connection pending #606 -v 2.0.0 (19-05-2013) - * added move, copy and link operations - *FWS integration -v 1.0.2 (15-01-2013) - * Integration with new gCube release 2.12.0 version system -v 1.0.1 (11-10-2012) - * added VOLATILE area -v. 1.0.0 (04-05-2012) - * First release - diff --git a/distro/LICENSE b/distro/LICENSE deleted file mode 100644 index 7bca8c8..0000000 --- a/distro/LICENSE +++ /dev/null @@ -1,2 +0,0 @@ -${gcube.license} - diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS deleted file mode 100644 index 05abbd7..0000000 --- a/distro/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -* Roberto Cirillo (roberto.cirillo@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" diff --git a/distro/README b/distro/README deleted file mode 100644 index 01364909a470c33cee0e4adb91913ee14a7750fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1515 zcmbtUL2p_y3`Ux?1HZzmIJDDvyH`7`1rA6pngF$jX@`)Qht<4E` zhl6>UoFP}{zYoYk9M8?Y$?ki&?ClnbtQo3^`zrzQ-J%Kz0TH55UXn$qX&SiDE9FYG zzAS!M_5#Ss4+>z2QAf|uu=LzGG3Fr7M+`;7?Iy*Q=Wrh0PcZch@ zOudi$FF%y2L~CUtDb8AzS&y(n#-H`rKzDeO?Ys`0#yIK0+YzUL{4(IzI2zo@WUXI! zt3{I5YtIqRBY2xi5tcI$+Axg25{CF!K8$sA5l=JNht5z4NmcW z`<}&gM;cv_@8=<%*IOm{W!x%m#=$o61et6=sZg!!h+GAD_6aH_i-&|)3;TFu-HivM c$!zq(t|~g651mfutK5%r+cO>A4DUyO0N{(WCjbBd diff --git a/distro/changelog.xml b/distro/changelog.xml deleted file mode 100644 index b7f6766..0000000 --- a/distro/changelog.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - Added HomeLibrary wrapper configuration for the new preproduction infrastructure - Added new Costants class for Junit package - - - Constants definition moved on storage-manager-core Castants class - Added new Costants class for Junit package - - - Added new JUnit Test classes - update JUnit Test Classes - delete old method for retrieving remote phrase used by old smp protocol classes - - - - dinamically load "write concern"" and ""read preference" options - add method for decrypt an id - - - dinamically load smpConnection handler - add method for decrypt an id - - - update JUnit test for smp uri without payload - - - change smp protocol - - - support MongoDB backend with authentication - - - Integration with new gCube release 3.0.0 version system - Java7 refactoring - - - Integration with new gCube release 2.15.0 version system - bugfix on pending connections - - - Integration with new gCube release 2.14.0 version system - FWS integration - added move, copy and link operations - - - Integration with new gCube release 2.12.0 version system - - - Added VOLATILE area - - - First Release - - diff --git a/distro/descriptor.xml b/distro/descriptor.xml deleted file mode 100644 index e395580..0000000 --- a/distro/descriptor.xml +++ /dev/null @@ -1,32 +0,0 @@ - - servicearchive - - tar.gz - - / - - - ${distroDirectory} - / - true - - README - LICENSE - changelog.xml - profile.xml - - 755 - true - - - - - target/${build.finalName}.${project.packaging} - /${artifactId} - - - - \ No newline at end of file diff --git a/distro/profile.xml b/distro/profile.xml deleted file mode 100644 index 83f8c3d..0000000 --- a/distro/profile.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Service - - ${description} - ContentManagement - ${artifactId} - 1.0.0 - - - ${artifactId} - ${version} - - ${groupId} - ${artifactId} - ${version} - - - ${build.finalName}.jar - - - - - diff --git a/distro/svnpath.txt b/distro/svnpath.txt deleted file mode 100644 index edacb04..0000000 --- a/distro/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -${scm.url} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 02dc130..8871f9e 100644 --- a/pom.xml +++ b/pom.xml @@ -68,10 +68,6 @@ org.slf4j slf4j-api - - org.slf4j - slf4j-api - org.slf4j @@ -85,34 +81,34 @@ 1.8 - - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - - copy-profile - install - - copy-resources - - - target - - - ${distroDirectory} - true - - profile.xml - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/gcube/contentmanager/storageclient/test/CopyTest.java b/src/test/java/org/gcube/contentmanager/storageclient/test/CopyTest.java index 8357ecb..5af26bf 100644 --- a/src/test/java/org/gcube/contentmanager/storageclient/test/CopyTest.java +++ b/src/test/java/org/gcube/contentmanager/storageclient/test/CopyTest.java @@ -148,6 +148,7 @@ public class CopyTest { File f =new File(newFilePath2); System.out.println("path new File downloaded: "+f.getAbsolutePath()); assertTrue(f.exists()); + // check if the remote file is a dog assertEquals(dogSize, f.length()); // removeCopiedFile(remoteCopyPath, "test/copyDir/");