From f6fa277e37b6b8d7d45b9a23b6a62300c6626bb7 Mon Sep 17 00:00:00 2001
From: Thorsten Vitt <thorsten.vitt@uni-wuerzburg.de>
Date: Mon, 23 Sep 2013 12:53:02 +0200
Subject: [PATCH] Added configuration for tgbackend2
---
pom.xml | 26 +++++++++++++++++++++++++-
src/main/webapp/WEB-INF/beans.xml | 6 +++---
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4ea0927..dd50323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,12 @@
<spring-version>3.2.2.RELEASE</spring-version>
<tei-xsl-version>6.17</tei-xsl-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <!-- The following properties are used for configuring the
+ web service and can be overridden in profiles -->
<aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published>
+ <aggregator.textgridrep.default>https://www.textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
+ <aggregator.textgridrep.dev>https://www.textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
</properties>
<repositories>
@@ -415,7 +420,7 @@
</plugins>
</build>
<properties>
- <aggregator.endpoint.published>http://test1.digital-humanities.de/aggregator</aggregator.endpoint.published>
+ <aggregator.endpoint.published>http://test1.digital-humanities.de/services/aggregator</aggregator.endpoint.published>
</properties>
</profile>
<profile>
@@ -436,6 +441,25 @@
<aggregator.endpoint.published>https://textgridlab.org/1.0/aggregator</aggregator.endpoint.published>
</properties>
</profile>
+ <profile>
+ <id>tgbackend2</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <configuration>
+ <url>http://tgbackend2.gwdg.de:8080/manager</url>
+ <server>tgbackend2</server>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <aggregator.endpoint.published>http://textgridrep.de/beta-es/services/aggregator</aggregator.endpoint.published>
+ <aggregator.textgridrep.default>http://tgbackend-2.gwdg.de/confserv</aggregator.textgridrep.default>
+ </properties>
+ </profile>
<profile>
<id>authtests</id>
<activation>
diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml
index 35a8ae9..13ed357 100644
--- a/src/main/webapp/WEB-INF/beans.xml
+++ b/src/main/webapp/WEB-INF/beans.xml
@@ -19,10 +19,10 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<bean class="org.springframework.beans.factory.config.PreferencesPlaceholderConfigurer"/>
<bean id="stable-repo" class="info.textgrid.services.aggregator.TextGridRepProvider">
- <property name="CONF_ENDPOINT" value="https://www.textgridlab.org/1.0/confserv"/>
+ <property name="CONF_ENDPOINT" value="${aggregator.textgridrep.default}"/>
</bean>
<bean id="dev-repo" class="info.textgrid.services.aggregator.TextGridRepProvider">
- <property name="CONF_ENDPOINT" value="https://www.textgridlab.org/dev/confserv"/>
+ <property name="CONF_ENDPOINT" value="${aggregator.textgridrep.dev}"/>
</bean>
@@ -52,7 +52,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
</jaxrs:providers>
</jaxrs:server>
- <jaxrs:server id="services-dev" address="/dev">
+ <jaxrs:server id="services-dev" address="/dev" publishedEndpointUrl="${aggregator.endpoint.published}/dev">
<jaxrs:serviceBeans>
<!-- bean class="info.textgrid.services.aggregator.HelloWorld" / -->
<bean class="info.textgrid.services.aggregator.teicorpus.TEICorpus" scope="singleton">
--
GitLab