From 0f5df4dab904c03dc0def5b535a4812693bc7983 Mon Sep 17 00:00:00 2001
From: Thomas Watson
Date: Sat, 3 Mar 2012 07:26:12 -0600
Subject: Bug 373161 - [R5] update OSGi constants, API and javadoc.

---
 .../org/osgi/framework/namespace/IdentityNamespace.java    | 14 +++++++-------
 .../src/org/osgi/framework/wiring/BundleCapability.java    |  2 +-
 .../osgi/src/org/osgi/framework/wiring/BundleWire.java     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/IdentityNamespace.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/IdentityNamespace.java
index fc8adc7ae..48664b1dd 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/IdentityNamespace.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/IdentityNamespace.java
@@ -108,26 +108,26 @@ public final class IdentityNamespace extends Namespace {
 	 * The capability attribute that contains a human readable copyright notice
 	 * for the resource. See the {@code Bundle-Copyright} manifest header.
 	 */
-	public final String			CAPABILITY_COPYRIGHT_ATTRIBUTE		= "copyright";
+	public static final String	CAPABILITY_COPYRIGHT_ATTRIBUTE		= "copyright";
 
 	/**
 	 * The capability attribute that contains a human readable description for
 	 * the resource. See the {@code Bundle-Description} manifest header.
 	 */
-	public final String			CAPABILITY_DESCRIPTION_ATTRIBUTE	= "description";
+	public static final String	CAPABILITY_DESCRIPTION_ATTRIBUTE	= "description";
 
 	/**
 	 * The capability attribute that contains the URL to documentation for the
 	 * resource. See the {@code Bundle-DocURL} manifest header.
 	 */
-	public final String			CAPABILITY_DOCUMENTATION_ATTRIBUTE	= "documentation";
+	public static final String	CAPABILITY_DOCUMENTATION_ATTRIBUTE	= "documentation";
 
 	/**
 	 * The capability attribute that contains the URL to the license for the
 	 * resource. See the {@name} portion of the {@code Bundle-License}
 	 * manifest header.
 	 */
-	public final String			CAPABILITY_LICENSE_ATTRIBUTE		= "license";
+	public static final String	CAPABILITY_LICENSE_ATTRIBUTE		= "license";
 
 	/**
 	 * The requirement directive that classifies the relationship with another
@@ -136,7 +136,7 @@ public final class IdentityNamespace extends Namespace {
 	 * @see #CLASSIFIER_SOURCES
 	 * @see #CLASSIFIER_JAVADOC
 	 */
-	public final String			REQUIREMENT_CLASSIFIER_DIRECTIVE	= "classifier";
+	public static final String	REQUIREMENT_CLASSIFIER_DIRECTIVE	= "classifier";
 
 	/**
 	 * The attribute value identifying the resource
@@ -146,7 +146,7 @@ public final class IdentityNamespace extends Namespace {
 	 * @see #REQUIREMENT_CLASSIFIER_DIRECTIVE
 	 */
 
-	public final String			CLASSIFIER_SOURCES					= "sources";
+	public static final String	CLASSIFIER_SOURCES					= "sources";
 	/**
 	 * The attribute value identifying the resource
 	 * {@link #REQUIREMENT_CLASSIFIER_DIRECTIVE classifier} as an archive
@@ -154,7 +154,7 @@ public final class IdentityNamespace extends Namespace {
 	 * 
 	 * @see #REQUIREMENT_CLASSIFIER_DIRECTIVE
 	 */
-	public final String			CLASSIFIER_JAVADOC					= "javadoc";
+	public static final String	CLASSIFIER_JAVADOC					= "javadoc";
 
 	private IdentityNamespace() {
 		// empty
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java
index 6ef74f1b5..eacfd606b 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2012). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java
index f1e239aaa..e95bd614c 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2011, 2012). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
-- 
cgit v1.2.3