Author: simonetripodi
Date: Sun Jan 15 15:51:26 2012
New Revision: 1231691
URL: http://svn.apache.org/viewvc?rev=1231691&view=rev
Log:
filtered web resources without the need to plug the antrun plugin
Modified:
incubator/any23/trunk/service/pom.xml
incubator/any23/trunk/service/src/main/webapp/resources/form.html
Modified: incubator/any23/trunk/service/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/any23/trunk/service/pom.xml?rev=1231691&r1=1231690&r2=1231691&view=diff
==============================================================================
--- incubator/any23/trunk/service/pom.xml (original)
+++ incubator/any23/trunk/service/pom.xml Sun Jan 15 15:51:26 2012
@@ -73,30 +73,6 @@
<plugins>
<plugin>
- <!-- Sets the correct Any23 version within the main page file. -->
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
- <target>
- <replace
file="${project.build.directory}/${project.build.finalName}/resources/form.html">
- <replacefilter>
- <replacetoken>@any23.version@</replacetoken>
- <replacevalue>${project.version}</replacevalue>
- </replacefilter>
- </replace>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
@@ -147,8 +123,18 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven.war.plugin.version}</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/webapp/resources</directory>
+ <targetPath>/resources</targetPath>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -162,10 +148,18 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven.war.plugin.version}</version>
<configuration>
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/webapp/resources</directory>
+ <targetPath>/resources</targetPath>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
<archive>
<manifest>
<addClasspath>true</addClasspath>
Modified: incubator/any23/trunk/service/src/main/webapp/resources/form.html
URL:
http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/webapp/resources/form.html?rev=1231691&r1=1231690&r2=1231691&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/webapp/resources/form.html (original)
+++ incubator/any23/trunk/service/src/main/webapp/resources/form.html Sun Jan
15 15:51:26 2012
@@ -1,10 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd";>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<html xml:lang="en"
xmlns="http://www.w3.org/1999/xhtml";
xmlns:dc="http://purl.org/dc/elements/1.1/";>
<head>
- <title>Any23: Anything To Triples</title>
+ <title>Apache Any23: Anything To Triples - Service
((${implementation.build}; ${maven.build.timestamp}))</title>
<style type="text/css">
body { padding: 1.2em 2em; font-family:arial; font-size:12px}
th { text-align: left; }
@@ -271,7 +287,7 @@ Content-Length: 174
<a href="http://developers.any23.org/service.html";
target="_blank">Any23 Service</a>.
</p>
<hr />
- <p><b>Any23 [email protected]@</b></p>
+ <p><b>Apache Any23 v.${project.version}</b></p>
<p><a href="http://code.google.com/p/any23/"; target="_blank">Any23 project
homepage</a> | Hosted at <a href="http://deri.ie/"; target="_blank">DERI, NUI
Galway</a></p>
<div id="sPopup-fix">
<p>
