Skip to content
Snippets Groups Projects
Commit e46d8135 authored by Stefan E. Funk's avatar Stefan E. Funk
Browse files

Minor weglass changes 

- removed tgsearch.war as config value fot jetty
- increased version
- changed deb profile to dhrep.deb
- changed path to webapp from textgrid to dhrep
parent 16694221
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
oaipmh-core/pom.xml
+ 150
− 150
View file @ e46d8135
<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>
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>2.1.7-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
<version>2.1.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>DARIAHDE :: OAI-PMH :: Core</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgcrud-common</artifactId>
<version>${tgcrud.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
</dependency>
<dependency>
<groupId>info.textgrid.utils</groupId>
<artifactId>httpclients</artifactId>
<version>${textgrid.httpclients.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>nexus.snapshots</id>
<name>DARIA nexus public Repository</name>
<url>http://dev.dariah.eu/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>oaipmhDCSchema-xjc</id>
<goals>
<goal>xjc</goal>
</goals>
<configuration>
<schemaFile>oai_dc.xsd</schemaFile>
<packageName>info.textgrid.middleware.oaidc</packageName>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>oai_dc.xsd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/xjc1</generateDirectory>
<staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
<clearOutputDir>false</clearOutputDir>
</configuration>
</execution>
<execution>
<id>oaipmhSchema-xjc</id>
<goals>
<goal>xjc</goal>
</goals>
<configuration>
<schemaFile>oai_pmh.xsd</schemaFile>
<packageName>info.textgrid.middleware.oaipmh</packageName>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>oai_pmh.xsd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/xjc2</generateDirectory>
<staleFile>${project.build.directory}/jaxb2/.oaipmhSchemaXjcStaleFlag</staleFile>
<clearOutputDir>false</clearOutputDir>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
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>
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>2.1.8-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
<version>2.1.8-SNAPSHOT</version>
<packaging>jar</packaging>
<name>DARIAHDE :: OAI-PMH DataProvider :: Core</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgcrud-common</artifactId>
<version>${tgcrud.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
</dependency>
<dependency>
<groupId>info.textgrid.utils</groupId>
<artifactId>httpclients</artifactId>
<version>${textgrid.httpclients.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>nexus.snapshots</id>
<name>DARIAH Nexus public Repository</name>
<url>http://dev.dariah.eu/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>oaipmhDCSchema-xjc</id>
<goals>
<goal>xjc</goal>
</goals>
<configuration>
<schemaFile>oai_dc.xsd</schemaFile>
<packageName>info.textgrid.middleware.oaidc</packageName>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>oai_dc.xsd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/xjc1</generateDirectory>
<staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
<clearOutputDir>false</clearOutputDir>
</configuration>
</execution>
<execution>
<id>oaipmhSchema-xjc</id>
<goals>
<goal>xjc</goal>
</goals>
<configuration>
<schemaFile>oai_pmh.xsd</schemaFile>
<packageName>info.textgrid.middleware.oaipmh</packageName>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>oai_pmh.xsd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/xjc2</generateDirectory>
<staleFile>${project.build.directory}/jaxb2/.oaipmhSchemaXjcStaleFlag</staleFile>
<clearOutputDir>false</clearOutputDir>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
oaipmh-webapp/pom.xml
+ 6
− 22
View file @ e46d8135
......@@ -4,27 +4,17 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>2.1.7-SNAPSHOT</version>
<version>2.1.8-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId>
<packaging>war</packaging>
<version>2.1.7-SNAPSHOT</version>
<name>DARIAHDE :: OAI-PMH :: Webapp</name>
<version>2.1.8-SNAPSHOT</version>
<name>DARIAHDE :: OAI-PMH DataProvider :: Webapp</name>
<url>http://maven.apache.org</url>
<profiles>
<profile>
<id>public</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<webxml.file>web.xml</webxml.file>
<finalName.war>tgoaipmh</finalName.war>
</properties>
</profile>
<profile>
<id>textgrid.deb</id>
<id>dhrep.deb</id>
<build>
<plugins>
<plugin>
......@@ -45,7 +35,7 @@
<src>${project.build.directory}/${project.build.finalName}</src>
<mapper>
<type>perm</type>
<prefix>/var/textgrid/webapps/${project.build.finalName}</prefix>
<prefix>/var/dhrep/webapps/${project.build.finalName}</prefix>
<user>root</user>
<group>tomcat7</group>
<filemode>755</filemode>
......@@ -89,7 +79,7 @@
</dependency>
</dependencies>
<build>
<finalName>tgoaipmh</finalName>
<finalName>oaipmh</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......@@ -104,12 +94,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.0.7.v20131107</version>
<configuration>
<scanIntervalSeconds>1</scanIntervalSeconds>
<webAppConfig>
<contextPath>tgsearch-public.war</contextPath>
</webAppConfig>
</configuration>
</plugin>
</plugins>
</build>
......
pom.xml
+ 2
− 2
View file @ e46d8135
......@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId>
<version>2.1.7-SNAPSHOT</version>
<version>2.1.8-SNAPSHOT</version>
<packaging>pom</packaging>
<name>DARIAHDE :: OAI-PMH</name>
<name>DARIAHDE :: OAI-PMH DataProvider</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.0.3</cxf.version>
......
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