Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 83D5FFF38 for ; Wed, 17 Jul 2013 08:15:36 +0000 (UTC) Received: (qmail 87928 invoked by uid 500); 17 Jul 2013 08:15:36 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 87887 invoked by uid 500); 17 Jul 2013 08:15:33 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 87854 invoked by uid 99); 17 Jul 2013 08:15:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jul 2013 08:15:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jul 2013 08:15:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AAC3123888A6; Wed, 17 Jul 2013 08:14:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1504040 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Descriptors.java Date: Wed, 17 Jul 2013 08:14:59 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130717081459.AAC3123888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Wed Jul 17 08:14:59 2013 New Revision: 1504040 URL: http://svn.apache.org/r1504040 Log: OAK-906: Add the REP_VERSION_DESC descriptor Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Descriptors.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Descriptors.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Descriptors.java?rev=1504040&r1=1504039&r2=1504040&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Descriptors.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Descriptors.java Wed Jul 17 08:14:59 2013 @@ -19,8 +19,11 @@ package org.apache.jackrabbit.oak.jcr; +import java.io.IOException; +import java.io.InputStream; import java.util.HashMap; import java.util.Map; +import java.util.Properties; import javax.jcr.PropertyType; import javax.jcr.Repository; @@ -74,6 +77,7 @@ import static javax.jcr.Repository.QUERY import static javax.jcr.Repository.REP_NAME_DESC; import static javax.jcr.Repository.REP_VENDOR_DESC; import static javax.jcr.Repository.REP_VENDOR_URL_DESC; +import static javax.jcr.Repository.REP_VERSION_DESC; import static javax.jcr.Repository.SPEC_NAME_DESC; import static javax.jcr.Repository.SPEC_VERSION_DESC; import static javax.jcr.Repository.WRITE_SUPPORTED; @@ -231,10 +235,13 @@ public class Descriptors { falseValue, true, true)); put(new Descriptor( REP_NAME_DESC, - valueFactory.createValue("Apache Jackrabbit Oak JCR implementation"), true, true)); + valueFactory.createValue("Apache Jackrabbit Oak"), true, true)); + put(new Descriptor( + REP_VERSION_DESC, + valueFactory.createValue(getVersion()), true, true)); put(new Descriptor( REP_VENDOR_DESC, - valueFactory.createValue("Apache Software Foundation"), true, true)); + valueFactory.createValue("The Apache Software Foundation"), true, true)); put(new Descriptor( REP_VENDOR_URL_DESC, valueFactory.createValue("http://www.apache.org/"), true, true)); @@ -249,6 +256,25 @@ public class Descriptors { trueValue, true, true)); } + private String getVersion() { + InputStream stream = Descriptors.class.getResourceAsStream( + "/META-INF/maven/org.apache.jackrabbit/oak-jcr/pom.properties"); + if (stream != null) { + try { + try { + Properties properties = new Properties(); + properties.load(stream); + return properties.getProperty("version"); + } finally { + stream.close(); + } + } catch (IOException e) { + // ignore + } + } + return "SNAPSHOT"; + } + public Descriptors(ValueFactory valueFactory, Iterable descriptors) { this(valueFactory);