Skip to content

Commit 01776ee

Browse files
awoodsAndrew WoodsWilliam Wellinglb-ov
authored
Enable war deployment model (#197)
* Add 'home' files into build war artifact Related to: https://jira.lyrasis.org/browse/VIVO-1443 * Disable copying exploded war to Tomcat dir - hardcode vivo.all.log file name - must now set system property: -Dvivo-dir=/opt/vivo/home/ Related to: https://jira.lyrasis.org/browse/VIVO-1443 * Ensure build does not remove and re-add VIVO_HOME/rdf Related to: https://jira.lyrasis.org/browse/VIVO-1443 * Remove unnecessary profile from installer/pom.xml Related to: https://jira.lyrasis.org/browse/VIVO-1443 * Rename example config files to have 'default' prefix Related to: https://jira.lyrasis.org/browse/VIVO-1443 * Require common properties to be in JNDI Properties include: - vitro/home - vitro/appName - vitro/rootUserAddress - vitro/defaultNamespace Related to: https://jira.lyrasis.org/browse/VIVO-1443 * VIVO-1443: app name (#2) * Non-functional change to comment in example.applicationSetup.n3 Related to: https://jira.lyrasis.org/browse/VIVO-1741 * Update orcidConfirm.ftl (#199) * remove example-settings.xml * simplify war name and afford override during build * default app name to vivo and pass into context.xml Co-authored-by: Andrew Woods <awoods@duraspace.org> Co-authored-by: L.O <53535673+lb-ov@users.noreply.github.com> Co-authored-by: Andrew Woods <awoods@duraspace.org> Co-authored-by: William Welling <wwelling@library.tamu.edu> Co-authored-by: L.O <53535673+lb-ov@users.noreply.github.com>
1 parent c54f8a1 commit 01776ee

File tree

10 files changed

+134
-276
lines changed

10 files changed

+134
-276
lines changed

‎home/src/main/resources/config/example.applicationSetup.n3 ‎home/src/main/resources/config/default.applicationSetup.n3

File renamed without changes.

‎home/src/main/resources/config/example.runtime.properties ‎home/src/main/resources/config/default.runtime.properties

+4-26
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,6 @@
1919
# BASIC PROPERTIES
2020
# -----------------------------------------------------------------------------
2121

22-
#
23-
# This namespace will be used when generating URIs for objects created in the
24-
# editor. In order to serve linked data, the default namespace must be composed
25-
# as follows (optional elements in parentheses):
26-
#
27-
# scheme + server_name (+ port) (+ servlet_context) + "/individual/"
28-
#
29-
# For example, Cornell's default namespace is:
30-
#
31-
# http://vivo.cornell.edu/individual/
32-
#
33-
Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
34-
35-
#
36-
# The email address of the root user for the VIVO application. The password
37-
# for this user is initially set to "rootPassword", but you will be asked to
38-
# change the password the first time you log in.
39-
#
40-
rootUser.emailAddress = vivo_root@mydomain.edu
41-
42-
4322
#
4423
# Argon2 password hashing parameters for time, memory and parallelism required to
4524
# compute a hash.
@@ -79,13 +58,12 @@ email.replyTo = vivoAdmin@mydomain.edu
7958
#
8059
# URL of Solr context used in local VIVO search. This will usually consist of:
8160
# scheme + server_name + port + vivo_webapp_name + "solr"
82-
# In the standard installation, the Solr context will be on the same server as VIVO,
83-
# and in the same Tomcat instance. The path will be the VIVO webapp.name (specified
84-
# in build.properties) + "solr"
61+
# In the standard installation, the Solr context will be on the same server as VIVO
62+
# as a standalone service.
8563
# Example:
86-
# vitro.local.solr.url = http://localhost:8080/vivosolr
64+
# vitro.local.solr.url = http://localhost:8983/solr/vivocore
8765
#
88-
vitro.local.solr.url = http://localhost:8080/vivosolr
66+
vitro.local.solr.url = http://localhost:8983/solr/vivocore
8967

9068

9169
# -----------------------------------------------------------------------------

‎installer/example-settings.xml

-21
This file was deleted.

‎installer/home/pom.xml

+13-69
Original file line numberDiff line numberDiff line change
@@ -23,80 +23,24 @@
2323
<default-theme>wilma</default-theme>
2424
</properties>
2525

26-
<profiles>
27-
<profile>
28-
<id>install</id>
29-
<activation>
30-
<property><name>vivo-dir</name></property>
31-
</activation>
32-
<build>
33-
<plugins>
34-
<plugin>
35-
<artifactId>maven-assembly-plugin</artifactId>
36-
<configuration>
37-
<descriptors>
38-
<descriptor>src/main/assembly/home.xml</descriptor>
39-
</descriptors>
40-
<appendAssemblyId>false</appendAssemblyId>
41-
</configuration>
42-
<executions>
43-
<execution>
44-
<phase>package</phase>
45-
<goals>
46-
<goal>single</goal>
47-
</goals>
48-
</execution>
49-
</executions>
50-
</plugin>
51-
<plugin>
52-
<artifactId>maven-antrun-plugin</artifactId>
53-
<executions>
54-
<execution>
55-
<id>remove-webapp</id>
56-
<phase>verify</phase>
57-
<goals>
58-
<goal>run</goal>
59-
</goals>
60-
<configuration>
61-
<target>
62-
<delete dir="${vivo-dir}/rdf" />
63-
</target>
64-
</configuration>
65-
</execution>
66-
</executions>
67-
</plugin>
68-
<plugin>
69-
<artifactId>maven-resources-plugin</artifactId>
70-
<executions>
71-
<execution>
72-
<id>install</id>
73-
<phase>install</phase>
74-
<goals>
75-
<goal>copy-resources</goal>
76-
</goals>
77-
<configuration>
78-
<outputDirectory>${vivo-dir}</outputDirectory>
79-
<resources>
80-
<resource>
81-
<directory>${project.build.directory}/${project.build.finalName}</directory>
82-
</resource>
83-
</resources>
84-
</configuration>
85-
</execution>
86-
</executions>
87-
</plugin>
88-
</plugins>
89-
</build>
90-
</profile>
91-
</profiles>
92-
9326
<build>
9427
<plugins>
9528
<plugin>
96-
<artifactId>maven-install-plugin</artifactId>
29+
<artifactId>maven-assembly-plugin</artifactId>
9730
<configuration>
98-
<skip>true</skip>
31+
<descriptors>
32+
<descriptor>src/main/assembly/home.xml</descriptor>
33+
</descriptors>
34+
<appendAssemblyId>false</appendAssemblyId>
9935
</configuration>
36+
<executions>
37+
<execution>
38+
<phase>package</phase>
39+
<goals>
40+
<goal>single</goal>
41+
</goals>
42+
</execution>
43+
</executions>
10044
</plugin>
10145
</plugins>
10246
</build>

‎installer/home/src/main/assembly/home.xml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<id>home</id>
55
<formats>
66
<format>dir</format>
7+
<format>tar</format>
78
</formats>
89
<includeBaseDirectory>false</includeBaseDirectory>
910
<dependencySets>

‎installer/pom.xml

+1-51
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<name>VIVO Installer</name>
1414

1515
<properties>
16+
<app-name>vivo</app-name>
1617
<vitro-version>${project.version}</vitro-version>
1718
<maven-site-plugin.skip>true</maven-site-plugin.skip>
1819
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -28,12 +29,6 @@
2829
<encoding>UTF-8</encoding>
2930
</configuration>
3031
</plugin>
31-
<plugin>
32-
<artifactId>maven-install-plugin</artifactId>
33-
<configuration>
34-
<skip>true</skip>
35-
</configuration>
36-
</plugin>
3732
<plugin>
3833
<groupId>org.apache.maven.plugins</groupId>
3934
<artifactId>maven-gpg-plugin</artifactId>
@@ -157,12 +152,6 @@
157152
</execution>
158153
</executions>
159154
</plugin>
160-
<plugin>
161-
<artifactId>maven-dependency-plugin</artifactId>
162-
<configuration>
163-
<skip>true</skip>
164-
</configuration>
165-
</plugin>
166155
<plugin>
167156
<artifactId>maven-resources-plugin</artifactId>
168157
<version>2.6</version>
@@ -186,45 +175,6 @@
186175
</execution>
187176
</executions>
188177
</plugin>
189-
<plugin>
190-
<artifactId>maven-war-plugin</artifactId>
191-
<executions>
192-
<execution>
193-
<id>default-war</id>
194-
<phase/>
195-
</execution>
196-
</executions>
197-
</plugin>
198-
</plugins>
199-
</build>
200-
</profile>
201-
<profile>
202-
<id>install</id>
203-
<activation>
204-
<property><name>vivo-dir</name></property>
205-
</activation>
206-
<build>
207-
<plugins>
208-
<plugin>
209-
<artifactId>maven-enforcer-plugin</artifactId>
210-
<executions>
211-
<execution>
212-
<id>enforce-properties</id>
213-
<phase>validate</phase>
214-
<goals>
215-
<goal>enforce</goal>
216-
</goals>
217-
<configuration>
218-
<rules>
219-
<requireProperty>
220-
<property>app-name</property>
221-
<message>You must provide an application name (app-name)</message>
222-
</requireProperty>
223-
</rules>
224-
</configuration>
225-
</execution>
226-
</executions>
227-
</plugin>
228178
</plugins>
229179
</build>
230180
</profile>

0 commit comments

Comments
 (0)