You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/01/27 10:12:18 UTC
svn commit: r903575 - in /tuscany/sca-java-2.x/trunk/modules/core-spi: ./
src/main/java/org/apache/tuscany/sca/runtime/
src/main/resources/org/apache/tuscany/sca/runtime/
src/test/java/org/apache/tuscany/sca/runtime/
Author: antelder
Date: Wed Jan 27 09:12:18 2010
New Revision: 903575
URL: http://svn.apache.org/viewvc?rev=903575&view=rev
Log:
Update the Version to include the version and build time
Added:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties
- copied, changed from r903569, tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/core-spi-messages.properties
Removed:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/core-spi-messages.properties
Modified:
tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml?rev=903575&r1=903574&r2=903575&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml Wed Jan 27 09:12:18 2010
@@ -98,9 +98,11 @@
<phase>process-resources</phase>
<configuration>
<tasks>
+ <filter token="version" value="${pom.version}"/>
<filter token="svnRevision" value="${sources.version}"/>
+ <filter token="buildtime" value="${build.timestamp}"/>
<copy toDir="${basedir}/target/classes/org/apache/tuscany/sca/runtime" overwrite="true"
- filtering="on" file="${basedir}/src/main/resources/org/apache/tuscany/sca/runtime/core-spi-messages.properties"/>
+ filtering="on" file="${basedir}/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties"/>
</tasks>
</configuration>
<goals>
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java?rev=903575&r1=903574&r2=903575&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java Wed Jan 27 09:12:18 2010
@@ -23,13 +23,25 @@
public class Version {
+ public static final String VERSION;
public static final String REVISION;
+ public static final String BUILDTIME;
static {
- ResourceBundle rb = ResourceBundle.getBundle("org/apache/tuscany/sca/runtime/core-spi-messages");
+ ResourceBundle rb = ResourceBundle.getBundle("org/apache/tuscany/sca/runtime/revision");
+ VERSION = rb.getString("version");
REVISION = rb.getString("revision");
+ BUILDTIME = rb.getString("buildtime");
}
+ public static String getVersion() {
+ return VERSION;
+ }
+
public static String getRevsion() {
return REVISION;
}
+
+ public static String getBuildTime() {
+ return BUILDTIME;
+ }
}
Copied: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties (from r903569, tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/core-spi-messages.properties)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties?p2=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties&p1=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/core-spi-messages.properties&r1=903569&r2=903575&rev=903575&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/core-spi-messages.properties (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties Wed Jan 27 09:12:18 2010
@@ -21,7 +21,9 @@
#-- Don't edit these. They're updated from the build, see the
# buildnumber-maven-plugin in this modules pom.xml
+version=@version@
revision=@svnRevision@
+buildtime=@buildtime@
#----------------------
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java?rev=903575&r1=903574&r2=903575&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java Wed Jan 27 09:12:18 2010
@@ -27,7 +27,10 @@
@Test
public void testRevision() {
// Doesn't test much, just that it has been initilized to a number
+ System.out.println(Version.getVersion() + " " + Version.getRevsion() + " " + Version.getBuildTime());
+ Integer.parseInt(Version.getVersion());
Integer.parseInt(Version.getRevsion());
+ Integer.parseInt(Version.getBuildTime());
}
}