Commit c65615d8 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Renamed private-rows-extensions -> private-rows-extension

parent 4e22221a
...@@ -2,3 +2,5 @@ ...@@ -2,3 +2,5 @@
/private-rows-extensions/target/ /private-rows-extensions/target/
/private-rows-extensions/nb-configuration.xml /private-rows-extensions/nb-configuration.xml
/war/*.war /war/*.war
/private-rows-extension/nbproject/
/private-rows-extension/target/
...@@ -18,9 +18,9 @@ build_extension_build_env: ...@@ -18,9 +18,9 @@ build_extension_build_env:
refs: refs:
- master - master
changes: changes:
- private-rows-extensions/Dockerfile-build-env - private-rows-extension/Dockerfile-build-env
script: script:
- cd private-rows-extensions - cd private-rows-extension
- docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}" - 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 build -t "${CI_REGISTRY_IMAGE}/extension_build_env" . -f Dockerfile-build-env
- docker push "${CI_REGISTRY_IMAGE}/extension_build_env" - docker push "${CI_REGISTRY_IMAGE}/extension_build_env"
...@@ -64,11 +64,11 @@ build_extension: ...@@ -64,11 +64,11 @@ build_extension:
script: script:
- cd vollt - cd vollt
- gradle jar - gradle jar
- cd ../private-rows-extensions - cd ../private-rows-extension
- mvn clean package - mvn clean package
artifacts: artifacts:
paths: paths:
- private-rows-extensions/target/private-rows-extensions-*.jar - private-rows-extension/target/private-rows-extension-*.jar
expire_in: 7 days expire_in: 7 days
build_war: build_war:
......
<?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>
...@@ -2,7 +2,7 @@ ...@@ -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"> <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> <modelVersion>4.0.0</modelVersion>
<groupId>it.inaf.ia2</groupId> <groupId>it.inaf.ia2</groupId>
<artifactId>private-rows-extensions</artifactId> <artifactId>private-rows-extension</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
......
...@@ -6,7 +6,7 @@ rm tap.war ...@@ -6,7 +6,7 @@ rm tap.war
unzip "$base_war" -d vollt unzip "$base_war" -d vollt
cp tap.properties vollt/WEB-INF/classes/tap.properties cp tap.properties vollt/WEB-INF/classes/tap.properties
cp web.xml vollt/WEB-INF/ 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 cd vollt
zip -r -u ../tap.war * zip -r -u ../tap.war *
cd .. cd ..
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment