Initial migration to Maven layout

MichelHeon · Nov 27, 2017 · 927f021 · 927f021
1 parent cffd94e
commit 927f021
Show file tree

Hide file tree

Showing 37 changed files with 292 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,21 @@
-.project
+/.build/
+/deploy.properties
+/build.properties
+/runtime.properties
+/ontology/public/catalog-v0001.xml
+
+rdf/auth/firsttime/test-user-model.owl
+utilities/solrtester/.work
+utilities/rdbmigration/.work
+
+**/.idea
+**/*.iml
+**/target
+
+**/overlays
+
+# Eclipse artifacts
+**/.settings
+**/.classpath
+**/.project
+**/bin/
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,209 @@
+<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>org.vivoweb</groupId>
+    <artifactId>vitro-languages</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Vitro Lanugages</name>
+    <description>Vitro Languages</description>
+    <url>http://vivoweb.org/</url>
+
+    <licenses>
+        <license>
+            <name>BSD 3-Clause License</name>
+            <url>https://raw.github.com/vivo-project/VIVO/develop/LICENSE</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Graham Triggs</name>
+            <email>[email protected]</email>
+            <organization>DuraSpace</organization>
+            <organizationUrl>http://vivoweb.org/</organizationUrl>
+        </developer>
+        <developer>
+            <name>Jim Blake</name>
+            <email>[email protected]</email>
+            <organization>Cornell University Library</organization>
+            <organizationUrl>https://github.com/j2blake</organizationUrl>
+        </developer>
+        <developer>
+            <name>John Fereira</name>
+            <email>[email protected]</email>
+            <organization>Cornell University</organization>
+            <organizationUrl>https://github.com/fereira</organizationUrl>
+        </developer>
+    </developers>
+
+    <!--
+       The SCM repository location is used by Continuum to update against
+       when changes have occurred.  This spawns a new build cycle and releases
+       snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:git:[email protected]:vivo-project/Vitro-languages.git</connection>
+        <developerConnection>scm:git:[email protected]:vivo-project/Vitro-languages.git</developerConnection>
+        <url>[email protected]:vivo-project/Vitro-languages.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <vitro-version>${project.version}</vitro-version>
+        <vivo-dir>${basedir}</vivo-dir>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
+        <build.timestamp>${maven.build.timestamp}</build.timestamp>
+        <maven-site-plugin.skip>false</maven-site-plugin.skip>
+        <stagingBase>/</stagingBase>
+    </properties>
+
+    <modules>
+        <module>webapp</module>
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <!-- plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <quiet>true</quiet>
+                            <additionalparam>${javadoc.opts}</additionalparam>
+                        </configuration>
+                    </plugin -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>buildnumber-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>create</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <doCheck>false</doCheck>
+                            <doUpdate>false</doUpdate>
+                            <shortRevisionLength>7</shortRevisionLength>
+                            <revisionOnScmFailure>Detached</revisionOnScmFailure>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.5.5</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.0.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.2.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.9.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>buildnumber-maven-plugin</artifactId>
+                    <version>1.4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <version>1.6.3</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <distributionManagement>
+        <site>
+            <id>vivo-project</id>
+            <url>https://vivo-project.github.io/</url>
+        </site>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+</project>
diff --git a/update-versions.sh b/update-versions.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if  [ -z "$1" ]
+  then
+    echo 'New version number required eg. 1.9.0-rc1'
+    exit 1
+fi
+
+mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1
+cd installer
+mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1
+cd ..
diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -0,0 +1,50 @@
+<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>org.vivoweb</groupId>
+    <artifactId>vitro-languages-webapp</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>org.vivoweb</groupId>
+        <artifactId>vitro-languages</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <name>Vitro Languages for Web App</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+                    <archiveClasses>false</archiveClasses>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>overlays</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/vitro-1.6/en_US/i18n/all_en_US.properties → ...src/main/webapp/i18n/all_en_US.properties b/vitro-1.6/en_US/i18n/all_en_US.properties → ...src/main/webapp/i18n/all_en_US.properties
diff --git a/vitro-1.6/es/i18n/all_es.properties → ...pp/src/main/webapp/i18n/all_es.properties b/vitro-1.6/es/i18n/all_es.properties → ...pp/src/main/webapp/i18n/all_es.properties
diff --git a/vitro-1.6/pt_BR/i18n/all_pt_BR.properties → ...src/main/webapp/i18n/all_pt_BR.properties b/vitro-1.6/pt_BR/i18n/all_pt_BR.properties → ...src/main/webapp/i18n/all_pt_BR.properties
diff --git a/...emplates/freemarker/search-help_en_US.ftl → ...emplates/freemarker/search-help_en_US.ftl b/...emplates/freemarker/search-help_en_US.ftl → ...emplates/freemarker/search-help_en_US.ftl
diff --git a/...s/templates/freemarker/search-help_es.ftl → ...p/templates/freemarker/search-help_es.ftl b/...s/templates/freemarker/search-help_es.ftl → ...p/templates/freemarker/search-help_es.ftl
diff --git a/...emplates/freemarker/search-help_pt_BR.ftl → ...emplates/freemarker/search-help_pt_BR.ftl b/...emplates/freemarker/search-help_pt_BR.ftl → ...emplates/freemarker/search-help_pt_BR.ftl
diff --git a/...templates/freemarker/termsOfUse_en_US.ftl → ...templates/freemarker/termsOfUse_en_US.ftl b/...templates/freemarker/termsOfUse_en_US.ftl → ...templates/freemarker/termsOfUse_en_US.ftl
diff --git a/...es/templates/freemarker/termsOfUse_es.ftl → ...pp/templates/freemarker/termsOfUse_es.ftl b/...es/templates/freemarker/termsOfUse_es.ftl → ...pp/templates/freemarker/termsOfUse_es.ftl
diff --git a/...templates/freemarker/termsOfUse_pt_BR.ftl → ...templates/freemarker/termsOfUse_pt_BR.ftl b/...templates/freemarker/termsOfUse_pt_BR.ftl → ...templates/freemarker/termsOfUse_pt_BR.ftl
diff --git a/...r/userAccounts-acctCreatedEmail_en_US.ftl → ...r/userAccounts-acctCreatedEmail_en_US.ftl b/...r/userAccounts-acctCreatedEmail_en_US.ftl → ...r/userAccounts-acctCreatedEmail_en_US.ftl
diff --git a/...rker/userAccounts-acctCreatedEmail_es.ftl → ...rker/userAccounts-acctCreatedEmail_es.ftl b/...rker/userAccounts-acctCreatedEmail_es.ftl → ...rker/userAccounts-acctCreatedEmail_es.ftl
diff --git a/...r/userAccounts-acctCreatedEmail_pt_BR.ftl → ...r/userAccounts-acctCreatedEmail_pt_BR.ftl b/...r/userAccounts-acctCreatedEmail_pt_BR.ftl → ...r/userAccounts-acctCreatedEmail_pt_BR.ftl
diff --git a/...ts-acctCreatedExternalOnlyEmail_en_US.ftl → ...ts-acctCreatedExternalOnlyEmail_en_US.ftl b/...ts-acctCreatedExternalOnlyEmail_en_US.ftl → ...ts-acctCreatedExternalOnlyEmail_en_US.ftl
diff --git a/...ounts-acctCreatedExternalOnlyEmail_es.ftl → ...ounts-acctCreatedExternalOnlyEmail_es.ftl b/...ounts-acctCreatedExternalOnlyEmail_es.ftl → ...ounts-acctCreatedExternalOnlyEmail_es.ftl
diff --git a/...ts-acctCreatedExternalOnlyEmail_pt_BR.ftl → ...ts-acctCreatedExternalOnlyEmail_pt_BR.ftl b/...ts-acctCreatedExternalOnlyEmail_pt_BR.ftl → ...ts-acctCreatedExternalOnlyEmail_pt_BR.ftl
diff --git a/...counts-confirmEmailChangedEmail_en_US.ftl → ...counts-confirmEmailChangedEmail_en_US.ftl b/...counts-confirmEmailChangedEmail_en_US.ftl → ...counts-confirmEmailChangedEmail_en_US.ftl
diff --git a/...rAccounts-confirmEmailChangedEmail_es.ftl → ...rAccounts-confirmEmailChangedEmail_es.ftl b/...rAccounts-confirmEmailChangedEmail_es.ftl → ...rAccounts-confirmEmailChangedEmail_es.ftl
diff --git a/...counts-confirmEmailChangedEmail_pt_BR.ftl → ...counts-confirmEmailChangedEmail_pt_BR.ftl b/...counts-confirmEmailChangedEmail_pt_BR.ftl → ...counts-confirmEmailChangedEmail_pt_BR.ftl
diff --git a/...Accounts-firstTimeExternalEmail_en_US.ftl → ...Accounts-firstTimeExternalEmail_en_US.ftl b/...Accounts-firstTimeExternalEmail_en_US.ftl → ...Accounts-firstTimeExternalEmail_en_US.ftl
diff --git a/...serAccounts-firstTimeExternalEmail_es.ftl → ...serAccounts-firstTimeExternalEmail_es.ftl b/...serAccounts-firstTimeExternalEmail_es.ftl → ...serAccounts-firstTimeExternalEmail_es.ftl
diff --git a/...Accounts-firstTimeExternalEmail_pt_BR.ftl → ...Accounts-firstTimeExternalEmail_pt_BR.ftl b/...Accounts-firstTimeExternalEmail_pt_BR.ftl → ...Accounts-firstTimeExternalEmail_pt_BR.ftl
diff --git a/...erAccounts-passwordCreatedEmail_en_US.ftl → ...erAccounts-passwordCreatedEmail_en_US.ftl b/...erAccounts-passwordCreatedEmail_en_US.ftl → ...erAccounts-passwordCreatedEmail_en_US.ftl
diff --git a/.../userAccounts-passwordCreatedEmail_es.ftl → .../userAccounts-passwordCreatedEmail_es.ftl b/.../userAccounts-passwordCreatedEmail_es.ftl → .../userAccounts-passwordCreatedEmail_es.ftl
diff --git a/...erAccounts-passwordCreatedEmail_pt_BR.ftl → ...erAccounts-passwordCreatedEmail_pt_BR.ftl b/...erAccounts-passwordCreatedEmail_pt_BR.ftl → ...erAccounts-passwordCreatedEmail_pt_BR.ftl
diff --git a/...unts-passwordResetCompleteEmail_en_US.ftl → ...unts-passwordResetCompleteEmail_en_US.ftl b/...unts-passwordResetCompleteEmail_en_US.ftl → ...unts-passwordResetCompleteEmail_en_US.ftl
diff --git a/...ccounts-passwordResetCompleteEmail_es.ftl → ...ccounts-passwordResetCompleteEmail_es.ftl b/...ccounts-passwordResetCompleteEmail_es.ftl → ...ccounts-passwordResetCompleteEmail_es.ftl
diff --git a/...unts-passwordResetCompleteEmail_pt_BR.ftl → ...unts-passwordResetCompleteEmail_pt_BR.ftl b/...unts-passwordResetCompleteEmail_pt_BR.ftl → ...unts-passwordResetCompleteEmail_pt_BR.ftl
diff --git a/...ounts-passwordResetPendingEmail_en_US.ftl → ...ounts-passwordResetPendingEmail_en_US.ftl b/...ounts-passwordResetPendingEmail_en_US.ftl → ...ounts-passwordResetPendingEmail_en_US.ftl
diff --git a/...Accounts-passwordResetPendingEmail_es.ftl → ...Accounts-passwordResetPendingEmail_es.ftl b/...Accounts-passwordResetPendingEmail_es.ftl → ...Accounts-passwordResetPendingEmail_es.ftl
diff --git a/...ounts-passwordResetPendingEmail_pt_BR.ftl → ...ounts-passwordResetPendingEmail_pt_BR.ftl b/...ounts-passwordResetPendingEmail_pt_BR.ftl → ...ounts-passwordResetPendingEmail_pt_BR.ftl
diff --git a/webapp/src/main/webapp/themes/vitro/i18n/images/select_locale_en_US.gif b/webapp/src/main/webapp/themes/vitro/i18n/images/select_locale_en_US.gif
diff --git a/webapp/src/main/webapp/themes/vitro/i18n/images/select_locale_es.png b/webapp/src/main/webapp/themes/vitro/i18n/images/select_locale_es.png
diff --git a/...pt_BR/i18n/images/select_locale_pt_BR.gif → ...vitro/i18n/images/select_locale_pt_BR.gif b/...pt_BR/i18n/images/select_locale_pt_BR.gif → ...vitro/i18n/images/select_locale_pt_BR.gif