move application.properties with filtering to have runtime info to webapp-common...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1229119 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-common/pom.xml b/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
index 0ab71e5eb73322706e8dc858562f9c4b9c1c22eb..8ca867cb3106f159a00a7a896393861c0ee07840 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
@@ -17,7 +17,8 @@
   ~ specific language governing permissions and limitations\r
   ~ under the License.\r
   -->\r
-<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">\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
   <modelVersion>4.0.0</modelVersion>\r
   <parent>\r
     <groupId>org.apache.archiva</groupId>\r
@@ -226,4 +227,72 @@
     </plugins>\r
   </build>\r
 \r
+  <profiles>\r
+    <profile>\r
+      <id>svn-buildnumber</id>\r
+      <activation>\r
+        <file>\r
+          <exists>.svn</exists>\r
+        </file>\r
+      </activation>\r
+      <build>\r
+        <plugins>\r
+          <plugin>\r
+            <groupId>org.codehaus.mojo</groupId>\r
+            <artifactId>buildnumber-maven-plugin</artifactId>\r
+            <executions>\r
+              <execution>\r
+                <phase>generate-resources</phase>\r
+                <goals>\r
+                  <goal>create</goal>\r
+                </goals>\r
+              </execution>\r
+            </executions>\r
+            <configuration>\r
+              <doCheck>false</doCheck>\r
+              <doUpdate>false</doUpdate>\r
+              <providerImplementations>\r
+                <svn>javasvn</svn>\r
+              </providerImplementations>\r
+            </configuration>\r
+          </plugin>\r
+        </plugins>\r
+      </build>\r
+    </profile>\r
+    <profile>\r
+      <id>non-canonical-buildnumber</id>\r
+      <activation>\r
+        <file>\r
+          <missing>.svn</missing>\r
+        </file>\r
+      </activation>\r
+      <build>\r
+        <plugins>\r
+          <plugin>\r
+            <groupId>org.codehaus.mojo</groupId>\r
+            <artifactId>buildnumber-maven-plugin</artifactId>\r
+            <executions>\r
+              <execution>\r
+                <phase>generate-resources</phase>\r
+                <goals>\r
+                  <goal>create</goal>\r
+                </goals>\r
+              </execution>\r
+            </executions>\r
+            <configuration>\r
+              <doCheck>false</doCheck>\r
+              <doUpdate>false</doUpdate>\r
+              <format>NON-CANONICAL_{0,date,yyyy-MM-dd_HH-mm}_{1}</format>\r
+              <items>\r
+                <item>timestamp</item>\r
+                <item>${user.name}</item>\r
+              </items>\r
+            </configuration>\r
+          </plugin>\r
+        </plugins>\r
+      </build>\r
+    </profile>\r
+  </profiles>\r
+\r
+\r
 </project>\r

diff --git a/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/application.properties b/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/application.properties
new file mode 100644 (file)
index 0000000..12806aa
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-common/src/main/filtered-resources/application.properties
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+user.agent=Apache Archiva/${project.version}
+archiva.version=${project.version}
+archiva.buildNumber=${buildNumber}
+archiva.timestamp=${timestamp}

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 7a0a1cd435afb6fe579ee980bbaeb570c359bc43..9b61bef2418e3527937ebd87b464f86442e3bd0c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -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>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
deleted file mode 100644 (file)
index 12806aa..0000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-user.agent=Apache Archiva/${project.version}
-archiva.version=${project.version}
-archiva.buildNumber=${buildNumber}
-archiva.timestamp=${timestamp}