Changeset 4651

Timestamp:

03/07/14 15:38:44 (11 years ago)

Author:

Twan Goosen

Message:

VLO version property gets set build time and is included in footer of page

Location:

vlo/branches/vlo-3.0/vlo-web-app

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.html (modified) (1 diff)
• src/main/resources/application.properties (added)

vlo/branches/vlo-3.0/vlo-web-app/pom.xml

@@ -143 +143 @@
         <resources>
             <resource>
-                <filtering>false</filtering>
+                <filtering>true</filtering>
                 <directory>src/main/resources</directory>
             </resource>
@@ -225 +225 @@
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.google.code.maven-svn-revision-number-plugin</groupId>
+                <artifactId>svn-revision-number-maven-plugin</artifactId>
+                <version>1.13</version> <!-- please use the latest version -->
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <entries>
+                        <entry>
+                            <path>${project.basedir}</path>
+                            <prefix>vlo</prefix>
+                            <depth>infinity</depth>
+                            <reportUnversioned>true</reportUnversioned>
+                            <reportIgnored>false</reportIgnored>
+                            <reportOutOfDate>false</reportOutOfDate>
+                        </entry>
+                    </entries>
+                </configuration>
+            </plugin>
         </plugins>
     </build>

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

@@ -46 +46 @@
         // register the resource of field names (used by eu.clarin.cmdi.vlo.wicket.componentsSolrFieldNameLabel)
         getResourceSettings().getStringResourceLoaders().add(new BundleStringResourceLoader("fieldNames"));
-        
+        // register the resource of application properties (version information filtered at build time)
+        getResourceSettings().getStringResourceLoaders().add(new BundleStringResourceLoader("application"));
+
         // Record (query result) page. E.g. /vlo/record?docId=abc123
         // (cannot encode docId in path because it contains a slash)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.html

@@ -119 +119 @@
 
             <div id="footer">
-                CLARIN VLO version 3.0 | <a href="#">help</a> | <a href="#">about</a> | <a href="http://www.dcarter.co.uk">design by dcarter</a>
+                CLARIN VLO version <wicket:message key="vlo.version" /> | <a href="#">help</a> | <a href="#">about</a> | <a href="http://www.dcarter.co.uk">design by dcarter</a>
             </div>
         </div>