Author: berndf
Date: Wed Aug 25 10:55:46 2010
New Revision: 989005
URL: http://svn.apache.org/viewvc?rev=989005&view=rev
Log:
VYSPER-202: make version numbering more visible
Added:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/Version.java
Modified:
mina/vysper/trunk/server/core/pom.xml
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
mina/vysper/trunk/server/pom.xml
Modified: mina/vysper/trunk/server/core/pom.xml
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/pom.xml?rev=989005&r1=989004&r2=989005&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/pom.xml (original)
+++ mina/vysper/trunk/server/core/pom.xml Wed Aug 25 10:55:46 2010
@@ -28,7 +28,28 @@
<name>Apache Vysper Core</name>
<version>0.6-SNAPSHOT</version>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>write-project-properties</goal>
+ </goals>
+ <configuration>
+
<outputFile>${project.build.outputDirectory}/org/apache/vysper/xmpp/server/vysperserver.properties
+ </outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.vysper</groupId>
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java?rev=989005&r1=989004&r2=989005&view=diff
==============================================================================
---
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
(original)
+++
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
Wed Aug 25 10:55:46 2010
@@ -24,6 +24,7 @@ import org.apache.vysper.xmpp.modules.co
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.server.ServerRuntimeContext;
import org.apache.vysper.xmpp.server.SessionContext;
+import org.apache.vysper.xmpp.server.Version;
import org.apache.vysper.xmpp.stanza.IQStanza;
import org.apache.vysper.xmpp.stanza.IQStanzaType;
import org.apache.vysper.xmpp.stanza.Stanza;
@@ -36,7 +37,7 @@ import org.apache.vysper.xmpp.stanza.Sta
@SpecCompliant(spec = "xep-0092", status =
SpecCompliant.ComplianceStatus.FINISHED, coverage =
SpecCompliant.ComplianceCoverage.COMPLETE)
public class SoftwareVersionIQHandler extends DefaultIQHandler {
- public static final String VYSPER_RELEASE = "0.6-SNAPSHOT";
+ public static final String VYSPER_RELEASE = Version.getVersion();
public static final String OS_VERSION = System.getProperty("os.name",
"undetermined") + " "
+ System.getProperty("os.arch", "") + " " +
System.getProperty("os.version", "");
Added:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/Version.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/Version.java?rev=989005&view=auto
==============================================================================
---
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/Version.java
(added)
+++
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/Version.java
Wed Aug 25 10:55:46 2010
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package org.apache.vysper.xmpp.server;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * Provides the version of this release of the Vysper server
+ *
+ * Code taken from FtpServer
+ *
+ * @author <a href="http://mina.apache.org";>Apache MINA Project</a>
+ */
+public class Version {
+
+ /**
+ * Get the version of this FtpServer
+ * @return The current version
+ */
+ public static String getVersion() {
+ Properties props = new Properties();
+ InputStream in = null;
+
+ try {
+ in =
Version.class.getClassLoader().getResourceAsStream("org/apache/vysper/xmpp/server/vysperserver.properties");
+ props.load(in);
+ return props.getProperty("vysper.server.version");
+ } catch (IOException e) {
+ throw new RuntimeException("Failed to read version", e);
+ } finally {
+ IOUtils.closeQuietly(in);
+ }
+ }
+}
Modified: mina/vysper/trunk/server/pom.xml
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/pom.xml?rev=989005&r1=989004&r2=989005&view=diff
==============================================================================
--- mina/vysper/trunk/server/pom.xml (original)
+++ mina/vysper/trunk/server/pom.xml Wed Aug 25 10:55:46 2010
@@ -45,4 +45,10 @@
</modules>
</profile>
</profiles>
+
+ <properties>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
+ <vysper.server.version>${project.version}</vysper.server.version>
+ </properties>
</project>
