Author: mickw
Date: 2006-04-06 14:26:18 +0200 (Thu, 06 Apr 2006)
New Revision: 2733
Removed:
trunk/profiles.xml
Modified:
trunk/
trunk/pom.xml
Log:
keep profiles inside the pom. no other way to alter finalName on profile basis.
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- velocity.log
maven.log
target
.checkstyle
.classpath
.project
*.ipr
*.iws
*.iml
build.properties
.settings
+ velocity.log
maven.log
target
target/generated-sources
.checkstyle
.classpath
.project
*.ipr
*.iws
*.iml
build.properties
.settings
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2006-04-06 12:00:03 UTC (rev 2732)
+++ trunk/pom.xml 2006-04-06 12:26:18 UTC (rev 2733)
@@ -59,7 +59,7 @@
<site>
<id>dev443</id>
<name>Schibsted Søk's Development Websites</name>
-
<url>file://localhost/www/schibstedsok/data/httpd/dev.schibstedsok.no_443/htdocs/maven/sites/search-front-html</url>
+
<url>scp://localhost/www/schibstedsok/data/httpd/dev.schibstedsok.no_443/htdocs/maven/sites/search-front-html</url>
</site>
</distributionManagement>
@@ -99,7 +99,6 @@
</developers>
<build>
- <finalName>ROOT</finalName>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
@@ -187,7 +186,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <!-- sure fire plugin failes for locale "no" -->
+ <!-- sure fire plugin failes for locale "no" -->
<locales>en</locales>
</configuration>
</plugin>
@@ -203,6 +202,147 @@
</plugins>
</build>
+ <profiles>
+
+ <!-- DEVELOPMENT PROFILE -->
+ <profile>
+ <id>development</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <finalName>ROOT</finalName>
+ </build>
+ <properties>
+
+ <!-- The default Site -->
+ <sesam.site.default>localhost:8080</sesam.site.default>
+
+ <!-- QR Servers -->
+
+ <queryServerURL.1>http://localhost:15100</queryServerURL.1>
+ <queryServerURL.2>http://localhost:15200</queryServerURL.2>
+
<queryServerURL.3>http://cobraprod.bos3.fasstsearch.net:15100</queryServerURL.3>
+
+ <!-- Log4j -->
+
+ <log.directory>./logs</log.directory>
+ <log.file>sesam.develop</log.file>
+ <log.level>DEBUG</log.level>
+
+ <!-- Token Evaluator -->
+
+ <tokenevaluator.host>localhost</tokenevaluator.host>
+ <tokenevaluator.port>15400</tokenevaluator.port>
+
+ <!-- Linkpulse -->
+
+ <tokenevaluator.linkpulse>false</tokenevaluator.linkpulse>
+
<tokenevaluator.linkpulseToUrl>http://go.sesam.no/</tokenevaluator.linkpulseToUrl>
+
<tokenevaluator.linkpulseSesam>http://localhost:8080/search-front-html/search/</tokenevaluator.linkpulseSesam>
+
+ <!-- Mail -->
+
+ <mail.smtp.host>ssmail.schibstedsok.no</mail.smtp.host>
+
+ </properties>
+ </profile>
+
+ <!-- TEST PROFILE -->
+ <profile>
+ <id>test</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <finalName>ROOT.test</finalName>
+ </build>
+ <properties>
+ <!-- The default Site -->
+
<sesam.site.default>bleedingsearch.schibstedsok.no</sesam.site.default>
+
+ <!-- QR Servers -->
+
+ <queryServerURL.1>http://10.16.195.250:15100</queryServerURL.1>
+ <queryServerURL.2>http://10.16.195.249:15300</queryServerURL.2>
+
<queryServerURL.3>http://cobraprod.bos3.fasstsearch.net:15100</queryServerURL.3>
+
+ <!-- Log4j -->
+
+ <log.directory>/var/log/tomcat/bleedingsearch</log.directory>
+ <log.file>sesam</log.file>
+ <log.level>DEBUG</log.level>
+
+ <!-- Token Evaluator -->
+
+ <tokenevaluator.host>10.16.195.250</tokenevaluator.host>
+ <tokenevaluator.port>15200</tokenevaluator.port>
+
+ <!-- Linkpulse -->
+
+ <tokenevaluator.linkpulse>true</tokenevaluator.linkpulse>
+
<tokenevaluator.linkpulseToUrl>http://go.sesam.no/</tokenevaluator.linkpulseToUrl>
+
+ <!-- Mail -->
+
+ <mail.smtp.host>ssmail.schibstedsok.no</mail.smtp.host>
+
+ <!-- Trade doubler -->
+
+
<tradedoubler.context.url>http://www.sesam.no</tradedoubler.context.url>
+ <tradedoubler.form.action>$$url</tradedoubler.form.action>
+
+ </properties>
+ </profile>
+
+ <!-- PRODUCTION PROFILE -->
+ <profile>
+ <id>production</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <finalName>ROOT.production</finalName>
+ </build>
+ <properties>
+ <!-- The default Site -->
+ <sesam.site.default>sesam.no</sesam.site.default>
+
+ <!-- QR Servers -->
+
+ <queryServerURL.1>http://10.16.195.250:15100</queryServerURL.1>
+ <queryServerURL.2>http://10.16.195.249:15300</queryServerURL.2>
+
<queryServerURL.3>http://cobraprod.bos3.fasstsearch.net:15100</queryServerURL.3>
+
+ <!-- Log4j -->
+
+ <log.directory>/var/log/tomcat/www.sesam.no</log.directory>
+ <log.file>sesam</log.file>
+ <log.level>INFO</log.level>
+
+ <!-- Token Evaluator -->
+
+ <tokenevaluator.host>10.16.195.250</tokenevaluator.host>
+ <tokenevaluator.port>15200</tokenevaluator.port>
+
+ <!-- Linkpulse -->
+
+ <tokenevaluator.linkpulse>true</tokenevaluator.linkpulse>
+
<tokenevaluator.linkpulseToUrl>http://go.sesam.no/</tokenevaluator.linkpulseToUrl>
+
+ <!-- Mail -->
+
+ <mail.smtp.host>ssmail.schibstedsok.no</mail.smtp.host>
+
+ <!-- Trade doubler -->
+
+
<tradedoubler.context.url>http://www.sesam.no</tradedoubler.context.url>
+ <tradedoubler.form.action>$$url</tradedoubler.form.action>
+
+ </properties>
+ </profile>
+ </profiles>
+
<repositories>
<repository>
<id>Sesam</id>
@@ -427,19 +567,19 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
- <!--
- Uncomment when
- http://jira.codehaus.org/browse/MEV-362
- is resolved
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- </plugin>
- -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
+ </plugin>
+ <!--
+ Uncomment when
+ http://jira.codehaus.org/browse/MEV-362
+ is resolved
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>changelog-maven-plugin</artifactId>
+ </plugin>
+ -->
</plugins>
</reporting>
Deleted: trunk/profiles.xml
===================================================================
--- trunk/profiles.xml 2006-04-06 12:00:03 UTC (rev 2732)
+++ trunk/profiles.xml 2006-04-06 12:26:18 UTC (rev 2733)
@@ -1,135 +0,0 @@
-<profiles>
-
- <!-- DEVELOPMENT PROFILE -->
-
- <profile>
- <id>development</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <properties>
-
- <!-- The default Site -->
- <sesam.site.default>localhost:8080</sesam.site.default>
-
- <!-- QR Servers -->
-
- <queryServerURL.1>http://localhost:15100</queryServerURL.1>
- <queryServerURL.2>http://localhost:15200</queryServerURL.2>
-
<queryServerURL.3>http://cobraprod.bos3.fasstsearch.net:15100</queryServerURL.3>
-
- <!-- Log4j -->
-
- <log.directory>./logs</log.directory>
- <log.file>sesam.develop</log.file>
- <log.level>DEBUG</log.level>
-
- <!-- Token Evaluator -->
-
- <tokenevaluator.host>localhost</tokenevaluator.host>
- <tokenevaluator.port>15400</tokenevaluator.port>
-
- <!-- Linkpulse -->
-
- <tokenevaluator.linkpulse>false</tokenevaluator.linkpulse>
-
<tokenevaluator.linkpulseToUrl>http://go.sesam.no/</tokenevaluator.linkpulseToUrl>
-
<tokenevaluator.linkpulseSesam>http://localhost:8080/search-front-html/search/</tokenevaluator.linkpulseSesam>
-
- <!-- Mail -->
-
- <mail.smtp.host>ssmail.schibstedsok.no</mail.smtp.host>
-
- </properties>
- </profile>
-
- <!-- TEST PROFILE -->
-
- <profile>
- <id>test</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <!-- The default Site -->
-
<sesam.site.default>bleedingsearch.schibstedsok.no</sesam.site.default>
-
- <!-- QR Servers -->
-
- <queryServerURL.1>http://10.16.195.250:15100</queryServerURL.1>
- <queryServerURL.2>http://10.16.195.249:15300</queryServerURL.2>
-
<queryServerURL.3>http://cobraprod.bos3.fasstsearch.net:15100</queryServerURL.3>
-
- <!-- Log4j -->
-
- <log.directory>/var/log/tomcat/bleedingsearch</log.directory>
- <log.file>sesam</log.file>
- <log.level>DEBUG</log.level>
-
- <!-- Token Evaluator -->
-
- <tokenevaluator.host>10.16.195.250</tokenevaluator.host>
- <tokenevaluator.port>15200</tokenevaluator.port>
-
- <!-- Linkpulse -->
-
- <tokenevaluator.linkpulse>true</tokenevaluator.linkpulse>
-
<tokenevaluator.linkpulseToUrl>http://go.sesam.no/</tokenevaluator.linkpulseToUrl>
-
- <!-- Mail -->
-
- <mail.smtp.host>ssmail.schibstedsok.no</mail.smtp.host>
-
- <!-- Trade doubler -->
-
-
<tradedoubler.context.url>http://www.sesam.no</tradedoubler.context.url>
- <tradedoubler.form.action>$$url</tradedoubler.form.action>
-
- </properties>
- </profile>
-
- <!-- PRODUCTION PROFILE -->
-
- <profile>
- <id>production</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <!-- The default Site -->
- <sesam.site.default>sesam.no</sesam.site.default>
-
- <!-- QR Servers -->
-
- <queryServerURL.1>http://10.16.195.250:15100</queryServerURL.1>
- <queryServerURL.2>http://10.16.195.249:15300</queryServerURL.2>
-
<queryServerURL.3>http://cobraprod.bos3.fasstsearch.net:15100</queryServerURL.3>
-
- <!-- Log4j -->
-
- <log.directory>/var/log/tomcat/www.sesam.no</log.directory>
- <log.file>sesam</log.file>
- <log.level>INFO</log.level>
-
- <!-- Token Evaluator -->
-
- <tokenevaluator.host>10.16.195.250</tokenevaluator.host>
- <tokenevaluator.port>15200</tokenevaluator.port>
-
- <!-- Linkpulse -->
-
- <tokenevaluator.linkpulse>true</tokenevaluator.linkpulse>
-
<tokenevaluator.linkpulseToUrl>http://go.sesam.no/</tokenevaluator.linkpulseToUrl>
-
- <!-- Mail -->
-
- <mail.smtp.host>ssmail.schibstedsok.no</mail.smtp.host>
-
- <!-- Trade doubler -->
-
-
<tradedoubler.context.url>http://www.sesam.no</tradedoubler.context.url>
- <tradedoubler.form.action>$$url</tradedoubler.form.action>
-
- </properties>
- </profile>
-</profiles>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
