Author: rfeng
Date: Mon Sep 17 17:37:51 2007
New Revision: 576636
URL: http://svn.apache.org/viewvc?rev=576636&view=rev
Log:
Fix the regression caused by 576625 (I missed a few files in the merge)
Modified:
incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
incubator/tuscany/branches/sca-java-1.0/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
incubator/tuscany/branches/sca-java-1.0/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
Modified:
incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java?rev=576636&r1=576635&r2=576636&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
Mon Sep 17 17:37:51 2007
@@ -63,7 +63,7 @@
public static void shutdownOSGiRuntime() {
try {
- OSGiRuntime.getRuntime().shutdown();
+ OSGiRuntime.stop();
} catch (Exception e) {
// Ignore
Modified:
incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java?rev=576636&r1=576635&r2=576636&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
Mon Sep 17 17:37:51 2007
@@ -61,7 +61,7 @@
public static void shutdownOSGiRuntime() {
try {
- OSGiRuntime.getRuntime().shutdown();
+ OSGiRuntime.stop();
} catch (Exception e) {
// Ignore
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java?rev=576636&r1=576635&r2=576636&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
Mon Sep 17 17:37:51 2007
@@ -103,14 +103,15 @@
//Load a class on demand
Class clazz = null;
- if (unresolved == resolved || resolved == null) {
- try {
- clazz =
Class.forName(((ClassReference)unresolved).getClassName(), true,
classLoader.get());
- } catch (ClassNotFoundException e) {
- //we will later try to delegate to imported model resolvers
+ try {
+ clazz = Class.forName(((ClassReference)unresolved).getClassName(),
true, classLoader.get());
+ } catch (ClassNotFoundException e) {
+ //we will later try to delegate to imported model resolvers
+ if (osgiResolver != null) {
+ resolved = osgiResolver.resolveModel(modelClass, unresolved);
+ clazz = ((ClassReference)resolved).getJavaClass();
}
- } else
- clazz = ((ClassReference)resolved).getJavaClass();
+ }
if (clazz != null) {
//if we load the class
@@ -123,12 +124,6 @@
} else {
//delegate resolution of the class
resolved = this.resolveImportedModel((ClassReference)unresolved);
- if (unresolved == resolved || resolved == null) {
- if (osgiResolver != null) {
- resolved = osgiResolver.resolveModel(modelClass,
unresolved);
- }
- }
-
return modelClass.cast(resolved);
}
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java?rev=576636&r1=576635&r2=576636&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
Mon Sep 17 17:37:51 2007
@@ -34,7 +34,7 @@
public abstract BundleContext getBundleContext();
- public abstract void shutdown() throws Exception;
+ protected abstract void shutdown() throws Exception;
public abstract boolean supportsBundleFragments();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
