tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r831077 - in /tuscany/java/sca/modules/extensibility: META-INF/MANIFEST.MF src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
Date Thu, 29 Oct 2009 20:18:58 GMT
Author: rfeng
Date: Thu Oct 29 20:18:58 2009
New Revision: 831077

URL: http://svn.apache.org/viewvc?rev=831077&view=rev
Log:
Fix the MF to trigger initialization of ServiceDiscovery

Modified:
    tuscany/java/sca/modules/extensibility/META-INF/MANIFEST.MF
    tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java

Modified: tuscany/java/sca/modules/extensibility/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility/META-INF/MANIFEST.MF?rev=831077&r1=831076&r2=831077&view=diff
==============================================================================
--- tuscany/java/sca/modules/extensibility/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/extensibility/META-INF/MANIFEST.MF Thu Oct 29 20:18:58 2009
@@ -1,6 +1,4 @@
 Manifest-Version: 1.0
-Tuscany-Comment1: Export the META-INF.services under an "internal" attribute 
- so that it can be seen only by the bundle itself without following the DynamicImport-Package
* 
 Export-Package: org.apache.tuscany.sca.core;version="2.0.0";
  uses:="org.apache.tuscany.sca.extensibility",
  org.apache.tuscany.sca.extensibility;version="2.0.0"
@@ -16,6 +14,7 @@
 Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.extensibility;version="2.0.0"
+DynamicImport-Package: org.apache.tuscany.sca.extensibility.equinox 
 Bundle-SymbolicName: org.apache.tuscany.sca.extensibility
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6

Modified: tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java?rev=831077&r1=831076&r2=831077&view=diff
==============================================================================
--- tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
(original)
+++ tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
Thu Oct 29 20:18:58 2009
@@ -101,7 +101,7 @@
             // Dynamically load an extension point class declared under META-INF/services
             try {
                 ServiceDeclaration extensionPointDeclaration =
-                    ServiceDiscovery.getInstance().getServiceDeclaration(extensionPointType);
+                    getServiceDiscovery().getServiceDeclaration(extensionPointType);
                 if (extensionPointDeclaration != null) {
                     extensionPoint = newInstance(this, extensionPointDeclaration);
                     // Cache the loaded extension point



Mime
View raw message