Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2013-03-18 19:11:39 +0000
committerThomas Watson2013-03-18 19:11:39 +0000
commit3d64df184a8f9dfc304a0312da0d5c1301ce5aee (patch)
tree4cab1a96257f225221ecbdd4164b118ab2a16c9a /bundles/org.eclipse.osgi
parent91cf75ccec56a443223b19c6ec14f577d8f0a0fe (diff)
parentaf3b5254ab86d60d44812ec0409ec23cfa7dc328 (diff)
downloadrt.equinox.framework-3d64df184a8f9dfc304a0312da0d5c1301ce5aee.tar.gz
rt.equinox.framework-3d64df184a8f9dfc304a0312da0d5c1301ce5aee.tar.xz
rt.equinox.framework-3d64df184a8f9dfc304a0312da0d5c1301ce5aee.zip
Merge branch 'master' into twatson/containerMerge
Diffstat (limited to 'bundles/org.eclipse.osgi')
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases1
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java6
-rw-r--r--bundles/org.eclipse.osgi/pom.xml2
-rw-r--r--bundles/org.eclipse.osgi/supplement/pom.xml2
4 files changed, 6 insertions, 5 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases
index 0aff94e32..e317d61a2 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases
@@ -42,5 +42,6 @@ WindowsVista WinVista "Windows Vista" Win32 # Microsoft
Windows2008 "Windows 2008" "Windows Server 2008" Win2008 Win32 # Microsoft
WindowsServer2008 "Windows 2008" "Windows Server 2008" Win2008 Win32 # Microsoft
WindowsServer2008R2 "Windows 2008 R2" "Windows Server 2008 R2" Win2008R2 Win32 # Microsoft
+WindowsServer2012 "Windows 2012" "Windows Server 2012" Win2012 Win32 # Microsoft
Windows7 "Windows 7" Win7 Win32 # Microsoft
Windows8 "Windows 8" Win8 Win32 # Microsoft \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
index bf86fdc99..39fa49cca 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
@@ -327,7 +327,7 @@ public class BundleLoader implements ModuleLoader {
result = source.loadClass(name);
if (result != null)
return result;
- throw new ClassNotFoundException(name);
+ throw new ClassNotFoundException(name + " cannot be found by " + this); //$NON-NLS-1$
}
// 4) search the required bundles
source = findRequiredSource(pkgName, null);
@@ -347,7 +347,7 @@ public class BundleLoader implements ModuleLoader {
if (result != null)
return result;
// must throw CNFE if dynamic import source does not have the class
- throw new ClassNotFoundException(name);
+ throw new ClassNotFoundException(name + " cannot be found by " + this); //$NON-NLS-1$
}
}
@@ -373,7 +373,7 @@ public class BundleLoader implements ModuleLoader {
} catch (ClassNotFoundException e) {
// we want to generate our own exception below
}
- throw new ClassNotFoundException(name);
+ throw new ClassNotFoundException(name + " cannot be found by " + this); //$NON-NLS-1$
}
@SuppressWarnings("unchecked")
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index 1a439455c..823800f6f 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -20,7 +20,7 @@
<version>3.8.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
- <groupId>org.eclipse.equinox.framework</groupId>
+ <groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml
index 38c9681e7..42cf0e4b7 100644
--- a/bundles/org.eclipse.osgi/supplement/pom.xml
+++ b/bundles/org.eclipse.osgi/supplement/pom.xml
@@ -22,7 +22,7 @@
<relativePath>../../../</relativePath>
</parent>
- <groupId>org.eclipse.equinox.framework</groupId>
+ <groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.supplement</artifactId>
<version>1.5.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

Back to the top