You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by st...@apache.org on 2013/02/07 13:36:27 UTC
svn commit: r1443443 - in /geronimo/xbean/trunk:
maven-xbean-plugin/src/main/java/org/apache/xbean/maven/ xbean-blueprint/
xbean-bundleutils/ xbean-finder/
xbean-naming/src/test/java/org/apache/xbean/naming/global/
xbean-reflect/src/main/java/org/apach...
Author: struberg
Date: Thu Feb 7 12:36:26 2013
New Revision: 1443443
URL: http://svn.apache.org/viewvc?rev=1443443&view=rev
Log:
XBEAN-239 fixed OSGi jdk14 issue
txs to rmannibucau for the patch!
Modified:
geronimo/xbean/trunk/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java
geronimo/xbean/trunk/xbean-blueprint/pom.xml
geronimo/xbean/trunk/xbean-bundleutils/pom.xml
geronimo/xbean/trunk/xbean-finder/pom.xml
geronimo/xbean/trunk/xbean-naming/src/test/java/org/apache/xbean/naming/global/GlobalContextManagerTest.java
geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/URLEditor.java
Modified: geronimo/xbean/trunk/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java?rev=1443443&r1=1443442&r2=1443443&view=diff
==============================================================================
--- geronimo/xbean/trunk/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java (original)
+++ geronimo/xbean/trunk/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java Thu Feb 7 12:36:26 2013
@@ -275,9 +275,8 @@ public class XBeanMojo extends AbstractM
}
}
- URLClassLoader appClassloader = new URLClassLoader(urls.toArray(new URL[urls.size()]),
+ return new URLClassLoader(urls.toArray(new URL[urls.size()]),
this.getClass().getClassLoader());
- return appClassloader;
} catch (MalformedURLException e) {
throw new MojoExecutionException(
"Error during setting up classpath", e);
Modified: geronimo/xbean/trunk/xbean-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/pom.xml?rev=1443443&r1=1443442&r2=1443443&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-blueprint/pom.xml Thu Feb 7 12:36:26 2013
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
Modified: geronimo/xbean/trunk/xbean-bundleutils/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-bundleutils/pom.xml?rev=1443443&r1=1443442&r2=1443443&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-bundleutils/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-bundleutils/pom.xml Thu Feb 7 12:36:26 2013
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/xbean/trunk/xbean-finder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/pom.xml?rev=1443443&r1=1443442&r2=1443443&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder/pom.xml Thu Feb 7 12:36:26 2013
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/xbean/trunk/xbean-naming/src/test/java/org/apache/xbean/naming/global/GlobalContextManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-naming/src/test/java/org/apache/xbean/naming/global/GlobalContextManagerTest.java?rev=1443443&r1=1443442&r2=1443443&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-naming/src/test/java/org/apache/xbean/naming/global/GlobalContextManagerTest.java (original)
+++ geronimo/xbean/trunk/xbean-naming/src/test/java/org/apache/xbean/naming/global/GlobalContextManagerTest.java Thu Feb 7 12:36:26 2013
@@ -31,6 +31,7 @@ import java.util.HashMap;
*/
public class GlobalContextManagerTest extends AbstractContextTest {
public void testNoGlobalContextSet() throws Exception {
+ GlobalContextManager.setGlobalContext(null); // force reset since in java 7 order is not guaranteed
Hashtable env = new Hashtable();
env.put(Context.INITIAL_CONTEXT_FACTORY, GlobalContextManager.class.getName());
Modified: geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/URLEditor.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/URLEditor.java?rev=1443443&r1=1443442&r2=1443443&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/URLEditor.java (original)
+++ geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/URLEditor.java Thu Feb 7 12:36:26 2013
@@ -62,7 +62,7 @@ public class URLEditor extends AbstractC
try {
// The file class has direct support for returning as a URL, but the Javadoc
- // for File.toURL() recommends converting the File object to a URI first
+ // for File.toURI().toURL() recommends converting the File object to a URI first
// so that untranslatable characters get handled correctly.
return new File(text).toURI().toURL();
} catch (MalformedURLException e) {