diff -r 955225d42c55 core.startup/apichanges.xml --- a/core.startup/apichanges.xml Fri Sep 02 13:42:39 2011 +0200 +++ b/core.startup/apichanges.xml Fri Sep 02 16:22:52 2011 +0200 @@ -56,6 +56,21 @@ + + + netbeans.productversion property + + + + + +

+ New property + netbeans.productversion + is available. +

+
+
netbeans.bootdelegation property diff -r 955225d42c55 core.startup/arch.xml --- a/core.startup/arch.xml Fri Sep 02 13:42:39 2011 +0200 +++ b/core.startup/arch.xml Fri Sep 02 16:22:52 2011 +0200 @@ -643,6 +643,12 @@ can be accessed. Available since version 1.26.

+ +

+ This property includes the display name presented to the user as Product Version + in the About dialog box and in the log file. +

+

diff -r 955225d42c55 core.startup/manifest.mf --- a/core.startup/manifest.mf Fri Sep 02 13:42:39 2011 +0200 +++ b/core.startup/manifest.mf Fri Sep 02 16:22:52 2011 +0200 @@ -3,5 +3,5 @@ OpenIDE-Module-Localizing-Bundle: org/netbeans/core/startup/Bundle.properties OpenIDE-Module-Layer: org/netbeans/core/startup/layer.xml OpenIDE-Module-Provides: org.openide.modules.InstalledFileLocator -OpenIDE-Module-Specification-Version: 1.34 +OpenIDE-Module-Specification-Version: 1.35 diff -r 955225d42c55 core.startup/src/org/netbeans/core/startup/TopLogging.java --- a/core.startup/src/org/netbeans/core/startup/TopLogging.java Fri Sep 02 13:42:39 2011 +0200 +++ b/core.startup/src/org/netbeans/core/startup/TopLogging.java Fri Sep 02 16:22:52 2011 +0200 @@ -260,6 +260,7 @@ String buildNumber = System.getProperty ("netbeans.buildnumber"); // NOI18N String currentVersion = NbBundle.getMessage(TopLogging.class, "currentVersion", buildNumber ); + System.setProperty("netbeans.productversion", currentVersion); // NOI18N ps.print(" Product Version = " + currentVersion); // NOI18N for (File cluster : clusters) { // also print Hg ID if available; more precise File buildInfo = new File(cluster, "build_info"); // NOI18N diff -r 955225d42c55 core.startup/test/unit/src/org/netbeans/core/startup/NbProductVersionTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core.startup/test/unit/src/org/netbeans/core/startup/NbProductVersionTest.java Fri Sep 02 16:22:52 2011 +0200 @@ -0,0 +1,55 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2011 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development and + * Distribution License("CDDL") (collectively, the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy of + * the License at http://www.netbeans.org/cddl-gplv2.html or + * nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific language + * governing permissions and limitations under the License. When distributing + * the software, include this License Header Notice in each file and include + * the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided by + * Oracle in the GPL Version 2 section of the License file that accompanied + * this code. If applicable, add the following below the License Header, with + * the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you do not indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to its + * licensees as provided above. However, if you add GPL Version 2 code and + * therefore, elected the GPL Version 2 license, then the option applies only + * if the new code is made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2010 Sun Microsystems, Inc. + */ +package org.netbeans.core.startup; + +/** + * + * @author Antonin Nebuzelsky + */ +public class NbProductVersionTest extends NbInstallerTestBase { + + public NbProductVersionTest(String n) { + super(n); + } + + public void testNetBeansProductVersion() throws Exception { + TopLogging.initialize(); + String prop = System.getProperty("netbeans.productversion"); + assertNotNull(prop); + } +}