You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/11/24 19:17:04 UTC

svn commit: r1038743 - in /geronimo/daytrader/branches/2.1/modules/web: pom.xml src/main/resources/ src/main/resources/tradeversion.html src/main/webapp/docs/tradeversion.html

Author: xiaming
Date: Wed Nov 24 18:17:03 2010
New Revision: 1038743

URL: http://svn.apache.org/viewvc?rev=1038743&view=rev
Log:
DAYTRADER-81 fix version issue

Added:
    geronimo/daytrader/branches/2.1/modules/web/src/main/resources/
    geronimo/daytrader/branches/2.1/modules/web/src/main/resources/tradeversion.html   (with props)
Removed:
    geronimo/daytrader/branches/2.1/modules/web/src/main/webapp/docs/tradeversion.html
Modified:
    geronimo/daytrader/branches/2.1/modules/web/pom.xml

Modified: geronimo/daytrader/branches/2.1/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/web/pom.xml?rev=1038743&r1=1038742&r2=1038743&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/web/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/modules/web/pom.xml Wed Nov 24 18:17:03 2010
@@ -93,6 +93,18 @@
         -->
     </dependencies>
     <build>
+    	<resources>
+        	<resource>
+                <directory>
+                    ${basedir}/src/main/resources
+                </directory>
+                <targetPath>${project.build.directory}/${project.artifactId}-${project.version}/docs</targetPath>
+                <filtering>true</filtering>                            
+                <includes>
+                    <include>**/tradeversion.html</include>
+                </includes>
+            </resource>                
+        </resources>
         <plugins>
             <!-- Removed per DATRADER-7 due to interop issues on commercial AppServers
             <plugin>
@@ -135,7 +147,7 @@
                             <includes>
                                 <include>web.xml</include>
                             </includes>
-                        </resource>
+                        </resource>                        
                     </resources>
                     <!--                        
                     HACK: Include legal files explicity, otherwise they will
@@ -151,10 +163,28 @@
                                 <include>META-INF/NOTICE*</include>
                                 <include>META-INF/DISCLAIMER*</include>
                             </includes>
-                        </resource>
+                        </resource>                        
                     </webResources>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <configuration>
+                  <format>{0,date,yyyy/MM/dd}</format>
+                  <items>
+                    <item>timestamp</item>
+                  </items>
+                </configuration>
+                <executions>
+                  <execution>
+                    <phase>validate</phase>
+                    <goals>
+                      <goal>create</goal>
+                    </goals>
+                  </execution>
+                </executions>
+             </plugin>
         </plugins>
     </build>
 </project>

Added: geronimo/daytrader/branches/2.1/modules/web/src/main/resources/tradeversion.html
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/web/src/main/resources/tradeversion.html?rev=1038743&view=auto
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/web/src/main/resources/tradeversion.html (added)
+++ geronimo/daytrader/branches/2.1/modules/web/src/main/resources/tradeversion.html Wed Nov 24 18:17:03 2010
@@ -0,0 +1,24 @@
+<!--
+   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>
+<TITLE>DayTrader Version</TITLE>
+<BODY>
+DayTrader Performance Benchmark Sample - ${pom.version}
+<BR>Build Date: ${buildNumber}
+<BR>Open <a href="https://issues.apache.org/jira/browse/DAYTRADER" target="_blank">JIRA</a> if any comments or bugs found.</A>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/branches/2.1/modules/web/src/main/resources/tradeversion.html
------------------------------------------------------------------------------
    svn:eol-style = native