Author: rfeng
Date: Fri Mar 6 18:16:45 2009
New Revision: 751018
URL: http://svn.apache.org/viewvc?rev=751018&view=rev
Log:
Work in progress, not compiling yet
Added:
tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory
Removed:
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/
Modified:
tuscany/java/sca/modules/implementation-osgi/pom.xml
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationActivator.java
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
Modified: tuscany/java/sca/modules/implementation-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/pom.xml?rev=751018&r1=751017&r2=751018&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-osgi/pom.xml Fri Mar 6 18:16:45
2009
@@ -106,6 +106,13 @@
<artifactId>tuscany-databinding</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java?rev=751018&r1=751017&r2=751018&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
(original)
+++
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
Fri Mar 6 18:16:45 2009
@@ -90,14 +90,6 @@
return bundleVersion;
}
- public String[] getImports() {
- return imports;
- }
-
- public String[] getClassList() {
- return classList;
- }
-
public FactoryExtensionPoint getModelFactories() {
return modelFactories;
}
@@ -127,11 +119,11 @@
return true;
}
- public Bundle getOSGiBundle() {
+ public Bundle getBundle() {
return osgiBundle;
}
- public void setOSGiBundle(Bundle osgiBundle) {
+ public void setBundle(Bundle osgiBundle) {
this.osgiBundle = osgiBundle;
}
Modified:
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationActivator.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationActivator.java?rev=751018&r1=751017&r2=751018&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationActivator.java
(original)
+++
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationActivator.java
Fri Mar 6 18:16:45 2009
@@ -33,4 +33,8 @@
bundleContext = context;
}
+ public static BundleContext getBundleContext() {
+ return bundleContext;
+ }
+
}
Modified:
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java?rev=751018&r1=751017&r2=751018&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
(original)
+++
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
Fri Mar 6 18:16:45 2009
@@ -26,7 +26,6 @@
import org.apache.tuscany.sca.databinding.DataBinding;
import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.implementation.osgi.context.OSGiAnnotations;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
@@ -42,7 +41,6 @@
private DataBindingExtensionPoint registry;
private Operation operation;
- private OSGiAnnotations osgiAnnotations;
/**
* @param registry
@@ -56,7 +54,6 @@
OSGiImplementationProvider provider,
RuntimeComponentService service) {
super(operation, provider, service);
- this.osgiAnnotations = osgiAnnotations;
this.registry = registry;
this.operation = operation;
}
Modified:
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java?rev=751018&r1=751017&r2=751018&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
(original)
+++
tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
Fri Mar 6 18:16:45 2009
@@ -22,6 +22,7 @@
import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import static org.apache.tuscany.sca.assembly.xml.Constants.SCA11_TUSCANY_NS;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -29,7 +30,6 @@
import java.util.StringTokenizer;
import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -42,7 +42,6 @@
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import
org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -53,6 +52,7 @@
import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
+import
org.apache.tuscany.sca.implementation.osgi.runtime.OSGiImplementationActivator;
import org.apache.tuscany.sca.interfacedef.Interface;
import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
@@ -63,6 +63,8 @@
import org.apache.tuscany.sca.monitor.Problem.Severity;
import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Version;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -78,26 +80,21 @@
*/
public class OSGiImplementationProcessor implements
StAXArtifactProcessor<OSGiImplementation> {
- public static final QName IMPLEMENTATION_OSGI = new
QName(Constants.SCA10_TUSCANY_NS, "implementation.osgi");
+ public static final QName IMPLEMENTATION_OSGI = new
QName(SCA11_TUSCANY_NS, "implementation.osgi");
private static final String BUNDLE_SYMBOLICNAME = "bundleSymbolicName";
private static final String BUNDLE_VERSION = "bundleVersion";
private static final String CLASSES = "classes";
private static final String IMPORTS = "imports";
- private static final QName PROPERTIES_QNAME = new
QName(Constants.SCA10_TUSCANY_NS, "properties");
- private static final QName PROPERTY_QNAME = new
QName(Constants.SCA10_TUSCANY_NS, "property");
+ private static final QName PROPERTIES_QNAME = new QName(SCA11_TUSCANY_NS,
"properties");
+ private static final QName PROPERTY_QNAME = new QName(SCA11_TUSCANY_NS,
"property");
private JavaInterfaceFactory javaInterfaceFactory;
private AssemblyFactory assemblyFactory;
private FactoryExtensionPoint modelFactories;
private Monitor monitor;
- private static final DocumentBuilderFactory domFactory =
DocumentBuilderFactory.newInstance();
- static {
- domFactory.setNamespaceAware(true);
- }
-
public OSGiImplementationProcessor(FactoryExtensionPoint modelFactories,
Monitor monitor) {
this.monitor = monitor;
this.modelFactories = modelFactories;
@@ -233,12 +230,23 @@
impl.setUnresolved(false);
- BundleReference bundleReference =
- new BundleReference(impl.getBundleSymbolicName(),
impl.getBundleVersion());
- BundleReference resolvedBundle =
resolver.resolveModel(BundleReference.class, bundleReference);
- Bundle bundle = (Bundle)resolvedBundle.getBundle();
+ BundleContext bundleContext =
OSGiImplementationActivator.getBundleContext();
+ Bundle bundle = null;
+ for (Bundle b : bundleContext.getBundles()) {
+ String sn = b.getSymbolicName();
+ String ver = (String)b.getHeaders().get(BUNDLE_VERSION);
+ if (!impl.getBundleSymbolicName().equals(sn)) {
+ continue;
+ }
+ Version v1 = Version.parseVersion(ver);
+ Version v2 = Version.parseVersion(impl.getBundleVersion());
+ if (v1.equals(v2)) {
+ bundle = b;
+ break;
+ }
+ }
if (bundle != null) {
- impl.setOSGiBundle(bundle);
+ impl.setBundle(bundle);
} else {
error("CouldNotLocateOSGiBundle", impl,
impl.getBundleSymbolicName());
//throw new ContributionResolveException("Could not locate
OSGi bundle " +
Added:
tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory?rev=751018&view=auto
==============================================================================
---
tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory
(added)
+++
tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory
Fri Mar 6 18:16:45 2009
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+org.apache.tuscany.sca.implementation.osgi.DefaultOSGiImplementationFactory
Modified:
tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java?rev=751018&r1=751017&r2=751018&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
(original)
+++
tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
Fri Mar 6 18:16:45 2009
@@ -27,24 +27,20 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestImpl;
import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
/**
* Test reading OSGi implementations.
@@ -65,15 +61,7 @@
new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors,
inputFactory, null, null);
- ModelFactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
- AssemblyFactory assemblyFactory =
modelFactories.getFactory(AssemblyFactory.class);
- SCABindingFactory scaBindingFactory =
modelFactories.getFactory(SCABindingFactory.class);
- UtilityExtensionPoint utilities =
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
- InterfaceContractMapper mapper =
utilities.getUtility(InterfaceContractMapper.class);
- IntentAttachPointTypeFactory attachPointTypeFactory =
- modelFactories.getFactory(IntentAttachPointTypeFactory.class);
- compositeBuilder =
- new CompositeBuilderImpl(assemblyFactory, scaBindingFactory,
attachPointTypeFactory, mapper, null);
+ compositeBuilder =
extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
OSGiTestBundles.createBundle("target/test-classes/OSGiTestService.jar",
OSGiTestInterface.class,
@@ -87,7 +75,7 @@
Composite composite = (Composite)staxProcessor.read(reader);
assertNotNull(composite);
- compositeBuilder.build(composite);
+ compositeBuilder.build(composite, null, null);
}
public void testReadAndResolveComposite() throws Exception {
@@ -106,7 +94,7 @@
staxProcessor.resolve(composite, resolver);
- compositeBuilder.build(composite);
+ compositeBuilder.build(composite, null, null);
}
public void testReadOSGiImplementation() throws Exception {
