From c65615d89eb00e40d31a10ba1bd6acb8b491ff18 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Fri, 26 Mar 2021 12:50:31 +0100
Subject: [PATCH] Renamed private-rows-extensions -> private-rows-extension

---
 .gitignore                                     |  2 ++
 .gitlab-ci.yml                                 |  8 ++++----
 .../Dockerfile-build-env                       |  0
 private-rows-extension/nb-configuration.xml    | 18 ++++++++++++++++++
 .../pom.xml                                    |  2 +-
 .../java/it/inaf/ia2/vollt/CustomJobOwner.java |  0
 .../inaf/ia2/vollt/CustomUserIdentifier.java   |  0
 .../ia2/vollt/PrivateRowsQueryExecutor.java    |  0
 .../vollt/PrivateRowsQueryExecutorTest.java    |  0
 war/fill-war.sh                                |  2 +-
 10 files changed, 26 insertions(+), 6 deletions(-)
 rename {private-rows-extensions => private-rows-extension}/Dockerfile-build-env (100%)
 create mode 100644 private-rows-extension/nb-configuration.xml
 rename {private-rows-extensions => private-rows-extension}/pom.xml (97%)
 rename {private-rows-extensions => private-rows-extension}/src/main/java/it/inaf/ia2/vollt/CustomJobOwner.java (100%)
 rename {private-rows-extensions => private-rows-extension}/src/main/java/it/inaf/ia2/vollt/CustomUserIdentifier.java (100%)
 rename {private-rows-extensions => private-rows-extension}/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java (100%)
 rename {private-rows-extensions => private-rows-extension}/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java (100%)

diff --git a/.gitignore b/.gitignore
index 2638c1d..a5f4d3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /private-rows-extensions/target/
 /private-rows-extensions/nb-configuration.xml
 /war/*.war
+/private-rows-extension/nbproject/
+/private-rows-extension/target/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3fb433a..101f532 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,9 +18,9 @@ build_extension_build_env:
     refs:
       - master
     changes:
-      - private-rows-extensions/Dockerfile-build-env
+      - private-rows-extension/Dockerfile-build-env
   script:
-    - cd private-rows-extensions
+    - cd private-rows-extension
     - docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
     - docker build -t "${CI_REGISTRY_IMAGE}/extension_build_env" . -f Dockerfile-build-env
     - docker push "${CI_REGISTRY_IMAGE}/extension_build_env"
@@ -64,11 +64,11 @@ build_extension:
   script:
     - cd vollt
     - gradle jar
-    - cd ../private-rows-extensions
+    - cd ../private-rows-extension
     - mvn clean package
   artifacts:
     paths:
-      - private-rows-extensions/target/private-rows-extensions-*.jar
+      - private-rows-extension/target/private-rows-extension-*.jar
     expire_in: 7 days
 
 build_war:
diff --git a/private-rows-extensions/Dockerfile-build-env b/private-rows-extension/Dockerfile-build-env
similarity index 100%
rename from private-rows-extensions/Dockerfile-build-env
rename to private-rows-extension/Dockerfile-build-env
diff --git a/private-rows-extension/nb-configuration.xml b/private-rows-extension/nb-configuration.xml
new file mode 100644
index 0000000..a65c451
--- /dev/null
+++ b/private-rows-extension/nb-configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+        <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
+    </properties>
+</project-shared-configuration>
diff --git a/private-rows-extensions/pom.xml b/private-rows-extension/pom.xml
similarity index 97%
rename from private-rows-extensions/pom.xml
rename to private-rows-extension/pom.xml
index e478a51..2003e6b 100644
--- a/private-rows-extensions/pom.xml
+++ b/private-rows-extension/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>it.inaf.ia2</groupId>
-    <artifactId>private-rows-extensions</artifactId>
+    <artifactId>private-rows-extension</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
diff --git a/private-rows-extensions/src/main/java/it/inaf/ia2/vollt/CustomJobOwner.java b/private-rows-extension/src/main/java/it/inaf/ia2/vollt/CustomJobOwner.java
similarity index 100%
rename from private-rows-extensions/src/main/java/it/inaf/ia2/vollt/CustomJobOwner.java
rename to private-rows-extension/src/main/java/it/inaf/ia2/vollt/CustomJobOwner.java
diff --git a/private-rows-extensions/src/main/java/it/inaf/ia2/vollt/CustomUserIdentifier.java b/private-rows-extension/src/main/java/it/inaf/ia2/vollt/CustomUserIdentifier.java
similarity index 100%
rename from private-rows-extensions/src/main/java/it/inaf/ia2/vollt/CustomUserIdentifier.java
rename to private-rows-extension/src/main/java/it/inaf/ia2/vollt/CustomUserIdentifier.java
diff --git a/private-rows-extensions/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java b/private-rows-extension/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java
similarity index 100%
rename from private-rows-extensions/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java
rename to private-rows-extension/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java
diff --git a/private-rows-extensions/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java b/private-rows-extension/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java
similarity index 100%
rename from private-rows-extensions/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java
rename to private-rows-extension/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java
diff --git a/war/fill-war.sh b/war/fill-war.sh
index d5c2656..2c8b048 100755
--- a/war/fill-war.sh
+++ b/war/fill-war.sh
@@ -6,7 +6,7 @@ rm tap.war
 unzip "$base_war" -d vollt
 cp tap.properties vollt/WEB-INF/classes/tap.properties
 cp web.xml vollt/WEB-INF/
-cp ../private-rows-extensions/target/private-rows-extensions-*.jar vollt/WEB-INF/lib/
+cp ../private-rows-extension/target/private-rows-extension-*.jar vollt/WEB-INF/lib/
 cd vollt
 zip -r -u ../tap.war *
 cd ..
-- 
GitLab