openejb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r454528 - in /incubator/openejb/trunk/openejb3/container/openejb-core: ./ src/main/java/org/apache/openejb/alt/config/rules/ src/main/java/org/apache/openejb/alt/util/resources/ src/main/java/org/apache/openejb/util/resources/ src/main/reso...
Date Mon, 09 Oct 2006 21:46:38 GMT
Author: jlaskowski
Date: Mon Oct  9 14:46:37 2006
New Revision: 454528

URL: http://svn.apache.org/viewvc?view=rev&rev=454528
Log:
Move *.properties to src/main/resources
Enable filtering on src/main/resources

Added:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/config/
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/config/rules/
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/config/rules/Messages.properties
      - copied unchanged from r454216, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/Messages.properties
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/util/
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/util/resources/
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/util/resources/Messages.properties
      - copied unchanged from r450758, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/util/resources/Messages.properties
Removed:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/Messages.properties
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/util/resources/Messages.properties
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/resources/Messages.properties
Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=454528&r1=454527&r2=454528
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Mon Oct  9 14:46:37 2006
@@ -31,6 +31,12 @@
   <packaging>jar</packaging>
   <name>OpenEJB :: Container :: Core</name>
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -57,20 +63,13 @@
             </goals>
             <configuration>
               <tasks>
-                <tstamp/>
-                <replace file="target/classes/openejb-version.properties"
-                         token="@VERSION-REPLACED-BY-MAVEN@" value="3.0-incubating-SNAPSHOT"/>
+                <tstamp>
+                  <format property="TSTAMP" pattern="hh:mm" />
+                </tstamp>
                 <replace file="target/classes/openejb-version.properties"
                          token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}"/>
                 <replace file="target/classes/openejb-version.properties"
                          token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}"/>
-
-                <!-- Add *.properties files -->
-                <copy todir="target/classes">
-                  <fileset dir="src/main/java">
-                    <include name="**/*.properties"/>
-                  </fileset>
-                </copy>
               </tasks>
             </configuration>
           </execution>

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties?view=diff&rev=454528&r1=454527&r2=454528
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties
Mon Oct  9 14:46:37 2006
@@ -1,5 +1,5 @@
 copyright=Copyright 1999-2006 (C) Apache OpenEJB Project, All Rights Reserved.
 url=http://incubator.apache.org/openejb
-version=@VERSION-REPLACED-BY-MAVEN@
+version=${pom.version}
 date=@DATE-REPLACED-BY-MAVEN@
 time=@TIME-REPLACED-BY-MAVEN@



Mime
View raw message