Skip to content
This repository has been archived by the owner on Dec 16, 2022. It is now read-only.

add non xml file in example pds4 package, upgrade pds4 example to 1.14 #111

Closed
wants to merge 8 commits into from
Closed

add non xml file in example pds4 package, upgrade pds4 example to 1.14 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e0060a
add non xml file in example pds4 package, upgrade pds4 example to 1.14
Dec 16, 2020
5241f10
update test package collection and harvest version
Dec 21, 2020
4a0033d
update doc with simplified harvest example configuration
Dec 21, 2020
acf18dc
add data to test file, upgraded harvest
Jan 4, 2021
fea5dd6
remove property from pom, does not work on github action
Jan 4, 2021
108401b
re-add project.basedir in groovy script reference
Jan 4, 2021
48c0c0d
add explicit maven phases in ci
Jan 4, 2021
7234f09
update test page in doc
Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/stable-cicd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
uses: NASA-PDS/roundup-action@master
with:
assembly: stable
maven-stable-artifact-phases: clean,install,site,deploy
env:
ossrh_username: ${{secrets.OSSRH_USERNAME}}
ossrh_password: ${{secrets.OSSRH_PASSWORD}}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/unstable-cicd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
uses: NASA-PDS/roundup-action@master
with:
assembly: unstable
maven-stable-artifact-phases: clean,install,site,deploy
env:
ossrh_username: ${{secrets.OSSRH_USERNAME}}
ossrh_password: ${{secrets.OSSRH_PASSWORD}}
Expand Down
27 changes: 21 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.

<groupId>gov.nasa.pds</groupId>
<artifactId>pds-registry-app</artifactId>
<version>0.2.2</version>
<version>0.2.4</version>
<packaging>jar</packaging>

<name>Registry Application</name>
Expand All @@ -54,7 +54,7 @@ POSSIBILITY OF SUCH DAMAGE.

<properties>
<registry.version>4.0.2</registry.version>
<harvest.version>3.3.1</harvest.version>
<harvest.version>3.3.3</harvest.version>
</properties>

<build>
Expand Down Expand Up @@ -103,14 +103,29 @@ POSSIBILITY OF SUCH DAMAGE.
<goal>wget</goal>
</goals>
<configuration>
<url>https://pds.nasa.gov/datastandards/documents/examples/v1/DPH_Examples_V11300.zip</url>
<url>https://pds.nasa.gov/datastandards/documents/examples/v1/DPH_Examples_V11400.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}</outputDirectory>
<md5>471c865358aae0e69216738607186ab3</md5>
<outputDirectory>${project.build.directory}/v11400</outputDirectory>
<md5>f63879feecf50fc60e083b92c3f6354b</md5>
</configuration>
</execution>
</executions>
</plugin>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>execute</goal>
</goals>
</execution>
</executions>
<configuration>
<source>${project.basedir}/src/main/script/truncate_test_data_files.gvy</source>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions src/main/assembly/tar-assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<lineEnding>keep</lineEnding>
</fileSet>
<fileSet>
<directory>target/V11300</directory>
<directory>target/V11400</directory>
<outputDirectory>test</outputDirectory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/Table_Character_draft1.xml</exclude>
</excludes>
<fileMode>664</fileMode>
<lineEnding>keep</lineEnding>
</fileSet>
Expand Down
10 changes: 5 additions & 5 deletions src/main/assembly/zip-assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<lineEnding>keep</lineEnding>
</fileSet>
<fileSet>
<directory>target/V11300</directory>
<directory>target/V11400</directory>
<outputDirectory>test</outputDirectory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/Table_Character_draft1.xml</exclude>
</excludes>
<fileMode>664</fileMode>
<lineEnding>keep</lineEnding>
</fileSet>
Expand Down Expand Up @@ -92,4 +92,4 @@
<filtered>true</filtered>
</file>
</files>
</assembly>
</assembly>
12 changes: 2 additions & 10 deletions src/site/xdoc/install/test.xml.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,14 @@ Specify the top level directory / bundle for Harvest to crawl for products to re
</directories>
]]></source>

<p>Remove also the following section, the configuration will not work on the example given below otherwise:</p>

<source><![CDATA[
<fileInfo processDataFiles="true" storeLabels="false">
<fileRef replacePrefix="/C:/tmp/" with="/"/>
</fileInfo>
]]></source>

<p>See details on the harvest configuration on <a href="../operate/harvest.html">operate harvest</a></p>

<p>We now need an <b>output directory</b> where the registry records will be created, for example, on unix, <i>~/tmp</i></p>


<p>At last, <b>run</b> the harvest command</p>
<source>
harvest -c &lt;path to the package&gt;/harvest-$context.get("harvest.version")/conf/examples/minimal.xml -o ~/tmp
harvest -c &lt;path to the package&gt;/harvest-$context.get("harvest.version")/conf/examples/registry.xml -o ~/tmp
</source>

</subsection>
Expand All @@ -101,7 +93,7 @@ registry-manager load-data -file ~/tmp
</subsection>

<subsection name="query the registry">
<p>Open in your browser: <a href="http://localhost:9200/registry/_search?q=*">http://localhost:9200/registry/_search?q=*</a></p>
<p>Open in your browser: <a target="_blank" href="http://localhost:9200/registry/_search?q=*">http://localhost:9200/registry/_search?q=*</a></p>
</subsection>


Expand Down