You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/09 13:44:19 UTC
svn commit: r1229119 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-webapp-common/ archiva-webapp-common/src/main/filtered-resources/
archiva-webapp/ archiva-webapp/src/main/filtered-resources/
Author: olamy
Date: Mon Jan 9 12:44:19 2012
New Revision: 1229119
URL: http://svn.apache.org/viewvc?rev=1229119&view=rev
Log:
move application.properties with filtering to have runtime info to webapp-common to use it in webapp-js too
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/application.properties (contents, props changed)
- copied, changed from r1229118, archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml?rev=1229119&r1=1229118&r2=1229119&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml Mon Jan 9 12:44:19 2012
@@ -17,7 +17,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.archiva</groupId>
@@ -226,4 +227,72 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>svn-buildnumber</id>
+ <activation>
+ <file>
+ <exists>.svn</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <providerImplementations>
+ <svn>javasvn</svn>
+ </providerImplementations>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>non-canonical-buildnumber</id>
+ <activation>
+ <file>
+ <missing>.svn</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>NON-CANONICAL_{0,date,yyyy-MM-dd_HH-mm}_{1}</format>
+ <items>
+ <item>timestamp</item>
+ <item>${user.name}</item>
+ </items>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
</project>
Copied: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/application.properties (from r1229118, archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/application.properties?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/application.properties&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties&r1=1229118&r2=1229119&rev=1229119&view=diff
==============================================================================
(empty)
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/application.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/application.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1229119&r1=1229118&r2=1229119&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Jan 9 12:44:19 2012
@@ -1355,70 +1355,7 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>svn-buildnumber</id>
- <activation>
- <file>
- <exists>.svn</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- <providerImplementations>
- <svn>javasvn</svn>
- </providerImplementations>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>non-canonical-buildnumber</id>
- <activation>
- <file>
- <missing>.svn</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- <format>NON-CANONICAL_{0,date,yyyy-MM-dd_HH-mm}_{1}</format>
- <items>
- <item>timestamp</item>
- <item>${user.name}</item>
- </items>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+
<profile>
<!-- olamy profile to test tomcat plugin dev -->
<id>tdev</id>