src: move nfs4 client code into basic-client module

Motivation: The nfsv4 client code is for testing purposes only. In addition it adds an extra dependency which is not required by server part. Modification: move nfs4 client code into basic-client module. Result: reduced transient dependency and testing code from the core components. Acked-by: Albert Rossi Target: master
dCache · Jul 7, 2020 · 34156a6 · 34156a6
1 parent 53e8c14
commit 34156a6
Show file tree

Hide file tree

Showing 27 changed files with 16 additions and 34 deletions.
diff --git a/basic-client/pom.xml b/basic-client/pom.xml
@@ -58,8 +58,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
+            <groupId>org.jline</groupId>
+            <artifactId>jline</artifactId>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/...rg/dcache/nfs/v4/client/FileIoDevice.java → ...rg/dcache/nfs/v4/client/FileIoDevice.java b/...rg/dcache/nfs/v4/client/FileIoDevice.java → ...rg/dcache/nfs/v4/client/FileIoDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2014 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify

diff --git a/...ache/nfs/v4/client/GetDeviceListStub.java → ...ache/nfs/v4/client/GetDeviceListStub.java b/...ache/nfs/v4/client/GetDeviceListStub.java → ...ache/nfs/v4/client/GetDeviceListStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2017 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify

diff --git a/...ache/nfs/v4/client/GetdeviceinfoStub.java → ...ache/nfs/v4/client/GetdeviceinfoStub.java b/...ache/nfs/v4/client/GetdeviceinfoStub.java → ...ache/nfs/v4/client/GetdeviceinfoStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2014 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify

diff --git a/...g/dcache/nfs/v4/client/LayoutgetStub.java → ...g/dcache/nfs/v4/client/LayoutgetStub.java b/...g/dcache/nfs/v4/client/LayoutgetStub.java → ...g/dcache/nfs/v4/client/LayoutgetStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2014 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify

diff --git a/...n/java/org/dcache/nfs/v4/client/Main.java → ...n/java/org/dcache/nfs/v4/client/Main.java b/...n/java/org/dcache/nfs/v4/client/Main.java → ...n/java/org/dcache/nfs/v4/client/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2019 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -54,6 +54,7 @@
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.COMPOUND4res;
 import org.dcache.nfs.ChimeraNFSException;
+import org.dcache.nfs.v4.CompoundBuilder;
 import org.dcache.nfs.v4.Stateids;
 import org.dcache.nfs.v4.xdr.clientid4;
 import org.dcache.nfs.v4.xdr.deviceid4;

diff --git a/...java/org/dcache/nfs/v4/client/Stripe.java → ...java/org/dcache/nfs/v4/client/Stripe.java b/...java/org/dcache/nfs/v4/client/Stripe.java → ...java/org/dcache/nfs/v4/client/Stripe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2018 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify

diff --git a/...a/org/dcache/nfs/v4/client/StripeMap.java → ...a/org/dcache/nfs/v4/client/StripeMap.java b/...a/org/dcache/nfs/v4/client/StripeMap.java → ...a/org/dcache/nfs/v4/client/StripeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2012 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify

diff --git a/...client/nfs4_prot_NFS4_PROGRAM_Client.java → ...client/nfs4_prot_NFS4_PROGRAM_Client.java b/...client/nfs4_prot_NFS4_PROGRAM_Client.java → ...client/nfs4_prot_NFS4_PROGRAM_Client.java
diff --git a/core/pom.xml b/core/pom.xml
@@ -66,10 +66,6 @@
             <artifactId>jimfs</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jline</groupId>
-            <artifactId>jline</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/...dcache/nfs/v4/client/CompoundBuilder.java → ...va/org/dcache/nfs/v4/CompoundBuilder.java b/...dcache/nfs/v4/client/CompoundBuilder.java → ...va/org/dcache/nfs/v4/CompoundBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2019 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  * details); if not, write to the Free Software Foundation, Inc.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-package org.dcache.nfs.v4.client;
+package org.dcache.nfs.v4;
 
 import org.dcache.nfs.v4.xdr.layoutreturn_file4;
 import org.dcache.nfs.v4.xdr.nfs_fh4;

diff --git a/core/src/test/java/org/dcache/nfs/v4/NFS4ClientTest.java b/core/src/test/java/org/dcache/nfs/v4/NFS4ClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2018 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -39,7 +39,6 @@
 import org.dcache.nfs.v4.xdr.seqid4;
 import org.dcache.nfs.v4.xdr.state_owner4;
 import static org.dcache.nfs.v4.NfsTestUtils.generateRpcCall;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;

diff --git a/core/src/test/java/org/dcache/nfs/v4/NfsTestUtils.java b/core/src/test/java/org/dcache/nfs/v4/NfsTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2019 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationCREATE_SESSIONTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationCREATE_SESSIONTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2017 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -19,7 +19,6 @@
  */
 package org.dcache.nfs.v4;
 
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.COMPOUND4res;
 import org.dcache.nfs.v4.xdr.sequenceid4;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationEXCHANGE_IDTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationEXCHANGE_IDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2018 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -19,7 +19,6 @@
  */
 package org.dcache.nfs.v4;
 
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.nfs_argop4;
 import org.dcache.nfs.v4.xdr.state_protect_how4;
 import org.dcache.nfs.v4.xdr.nfs4_prot;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationGETXATTRTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationGETXATTRTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.COMPOUND4res;
 import org.dcache.nfs.v4.xdr.nfs_fh4;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationLAYOUTCOMMITTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationLAYOUTCOMMITTest.java
@@ -9,7 +9,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.COMPOUND4res;
 import org.dcache.nfs.v4.xdr.layouttype4;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationLAYOUTERRORTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationLAYOUTERRORTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import org.dcache.nfs.status.NotSuppException;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.device_error4;
 import org.dcache.nfs.vfs.VirtualFileSystem;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationLAYOUTSTATSTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationLAYOUTSTATSTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import org.dcache.nfs.status.NotSuppException;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.deviceid4;
 import org.dcache.nfs.v4.xdr.io_info4;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationLISTXATTRSTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationLISTXATTRSTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.COMPOUND4res;
 import org.dcache.nfs.v4.xdr.nfs_fh4;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationLOCKUTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationLOCKUTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import org.dcache.nfs.status.InvalException;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.nfs_lock_type4;
 import org.junit.Test;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationOPENTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationOPENTest.java
@@ -11,7 +11,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.COMPOUND4res;
 import org.dcache.nfs.v4.xdr.layouttype4;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationREADDIRTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationREADDIRTest.java
@@ -17,7 +17,6 @@
 import org.dcache.nfs.v4.xdr.nfs4_prot;
 import org.dcache.nfs.v4.xdr.nfs_resop4;
 import org.dcache.nfs.v4.xdr.verifier4;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.vfs.DirectoryEntry;
 import org.dcache.nfs.vfs.DirectoryStream;
 import org.dcache.nfs.vfs.FileHandle;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationREADTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationREADTest.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.net.UnknownHostException;
 import org.dcache.nfs.ChimeraNFSException;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.nfs_fh4;
 import org.dcache.nfs.vfs.Inode;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationREMOVEXATTRTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationREMOVEXATTRTest.java
@@ -1,7 +1,6 @@
 package org.dcache.nfs.v4;
 
 import java.io.IOException;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.COMPOUND4res;
 import org.dcache.nfs.v4.xdr.nfs_fh4;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationSETXATTRTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationSETXATTRTest.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import org.dcache.nfs.status.BadXdrException;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.nfs_fh4;
 import org.dcache.nfs.v4.xdr.setxattr_option4;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationWRITETest.java b/core/src/test/java/org/dcache/nfs/v4/OperationWRITETest.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.net.UnknownHostException;
 import org.dcache.nfs.ChimeraNFSException;
-import org.dcache.nfs.v4.client.CompoundBuilder;
 import org.dcache.nfs.v4.xdr.COMPOUND4args;
 import org.dcache.nfs.v4.xdr.nfs_fh4;
 import org.dcache.nfs.vfs.Inode;