From df394ad8991792c90ee678ec18ca3d4fcf896e2e Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 20 Mar 2009 10:10:33 +0000 Subject: Copy trunk to test sanbox for release plugin testing git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756399 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/node/osgi/impl/NodeActivator.java | 86 +++ .../sca/node/osgi/impl/NodeFactoryImpl.java | 686 +++++++++++++++++++++ .../tuscany/sca/node/osgi/impl/NodeManager.java | 123 ++++ .../tuscany/sca/node/osgi/impl/NodeUtil.java | 56 ++ .../sca/node/osgi/impl/OSGiServiceTracker.java | 40 ++ .../org.apache.tuscany.sca.node.NodeFactory | 17 + .../java/calculator/dosgi/CalculatorActivator.java | 74 +++ .../java/calculator/dosgi/CalculatorService.java | 36 ++ .../calculator/dosgi/CalculatorServiceDSImpl.java | 113 ++++ .../calculator/dosgi/CalculatorServiceImpl.java | 95 +++ .../calculator/dosgi/operations/AddService.java | 31 + .../dosgi/operations/AddServiceImpl.java | 35 ++ .../calculator/dosgi/operations/DivideService.java | 31 + .../dosgi/operations/DivideServiceImpl.java | 35 ++ .../dosgi/operations/MultiplyService.java | 31 + .../dosgi/operations/MultiplyServiceImpl.java | 35 ++ .../dosgi/operations/OperationsActivator.java | 63 ++ .../dosgi/operations/SubtractService.java | 31 + .../dosgi/operations/SubtractServiceImpl.java | 35 ++ .../dosgi/test/CalculatorOSGiNodeTestCase.java | 248 ++++++++ .../dosgi/test/CalculatorOSGiTestCase.java | 211 +++++++ .../calculator/dosgi/test/OSGiTestBundles.java | 183 ++++++ .../test/resources/META-INF/sca-contribution.xml | 24 + .../src/test/resources/OSGI-INF/add-component.xml | 25 + .../resources/OSGI-INF/calculator-component.xml | 36 ++ .../test/resources/OSGI-INF/divide-component.xml | 25 + .../test/resources/OSGI-INF/multiply-component.xml | 25 + .../test/resources/OSGI-INF/subtract-component.xml | 25 + .../calculator/dosgi/META-INF/MANIFEST.MF | 20 + .../calculator/dosgi/bundle.componentType | 54 ++ .../calculator/dosgi/calculator.composite | 53 ++ .../dosgi/operations/META-INF/MANIFEST.MF | 20 + .../dosgi/operations/bundle.componentType | 47 ++ .../dosgi/operations/operations.composite | 43 ++ 34 files changed, 2692 insertions(+) create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/META-INF/sca-contribution.xml create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/add-component.xml create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/calculator-component.xml create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/divide-component.xml create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/multiply-component.xml create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/subtract-component.xml create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType create mode 100644 sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite (limited to 'sandbox/ant/sca/trunk/modules/node-impl-osgi/src') diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java new file mode 100644 index 0000000000..43892d44d8 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java @@ -0,0 +1,86 @@ +/* + * 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. + */ + +package org.apache.tuscany.sca.node.osgi.impl; + +import static org.apache.tuscany.sca.node.osgi.impl.NodeManager.isSCABundle; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.SynchronousBundleListener; + +/** + * Bundle activator to receive the BundleContext + */ +public class NodeActivator implements BundleActivator, SynchronousBundleListener { + private static BundleContext bundleContext; + private boolean inited; + private NodeManager manager; + + private void init() { + synchronized (this) { + if (inited) { + return; + } + manager = new NodeManager(bundleContext); + manager.start(); + bundleContext.addBundleListener(manager); + inited = true; + } + } + + public void start(BundleContext context) throws Exception { + bundleContext = context; + boolean found = false; + for (Bundle b : context.getBundles()) { + if (isSCABundle(b)) { + found = true; + break; + } + } + + if (found) { + init(); + } else { + context.addBundleListener(this); + } + } + + public void stop(BundleContext context) throws Exception { + context.removeBundleListener(this); + bundleContext = null; + } + + public static BundleContext getBundleContext() { + return bundleContext; + } + + public void bundleChanged(BundleEvent event) { + if (event.getType() == BundleEvent.STARTING) { + if (isSCABundle(event.getBundle())) { + bundleContext.removeBundleListener(this); + init(); + } + } + + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java new file mode 100644 index 0000000000..37b3f1a6fb --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java @@ -0,0 +1,686 @@ +/* +* 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. +*/ + +package org.apache.tuscany.sca.node.osgi.impl; + +import static java.lang.System.currentTimeMillis; +import static org.apache.tuscany.sca.node.osgi.impl.NodeUtil.contribution; +import static org.apache.tuscany.sca.node.osgi.impl.NodeUtil.createURI; + +import java.io.File; +import java.io.StringReader; +import java.net.URI; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamReader; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.ComponentService; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.CompositeService; +import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; +import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ContributionFactory; +import org.apache.tuscany.sca.contribution.DefaultImport; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.core.ModuleActivator; +import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint; +import org.apache.tuscany.sca.core.UtilityExtensionPoint; +import org.apache.tuscany.sca.core.assembly.ActivationException; +import org.apache.tuscany.sca.core.assembly.CompositeActivator; +import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory; +import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory; +import org.apache.tuscany.sca.core.invocation.ProxyFactory; +import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint; +import org.apache.tuscany.sca.definitions.Definitions; +import org.apache.tuscany.sca.definitions.DefinitionsFactory; +import org.apache.tuscany.sca.definitions.util.DefinitionsUtil; +import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation; +import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory; +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.MonitorFactory; +import org.apache.tuscany.sca.monitor.Problem; +import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.node.Client; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.provider.DefinitionsProvider; +import org.apache.tuscany.sca.provider.DefinitionsProviderException; +import org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint; +import org.apache.tuscany.sca.runtime.RuntimeComponent; +import org.apache.tuscany.sca.runtime.RuntimeComponentContext; +import org.apache.tuscany.sca.work.WorkScheduler; +import org.apache.tuscany.sca.workspace.Workspace; +import org.apache.tuscany.sca.workspace.WorkspaceFactory; +import org.apache.tuscany.sca.workspace.builder.ContributionBuilder; +import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.ServiceRuntimeException; +import org.osgi.framework.Bundle; + +/** + * Represents an SCA runtime node. + * + * @version $Rev$ $Date$ + */ +public class NodeFactoryImpl { + + private static final String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1"; + + private static final Logger logger = Logger.getLogger(NodeFactoryImpl.class.getName()); + + private boolean inited; + + private ExtensionPointRegistry extensionPoints; + private UtilityExtensionPoint utilities; + private Monitor monitor; + private URLArtifactProcessor contributionProcessor; + private ModelResolverExtensionPoint modelResolvers; + private FactoryExtensionPoint modelFactories; + private WorkspaceFactory workspaceFactory; + private ContributionFactory contributionFactory; + private AssemblyFactory assemblyFactory; + private XMLInputFactory inputFactory; + private ContributionBuilder contributionDependencyBuilder; + private CompositeBuilder compositeBuilder; + private StAXArtifactProcessorExtensionPoint xmlProcessors; + private StAXArtifactProcessor compositeProcessor; + private ProxyFactory proxyFactory; + private List moduleActivators = new ArrayList(); + private WorkScheduler workScheduler; + private Contribution systemContribution; + private Definitions systemDefinitions; + + private Map nodes = new ConcurrentHashMap(); + + /** + * Constructs a new Node controller + */ + public NodeFactoryImpl() { + } + + private ConfiguredNodeImplementation getNodeConfiguration(Bundle bundle) { + // Create a node configuration + NodeImplementationFactory nodeImplementationFactory = + modelFactories.getFactory(NodeImplementationFactory.class); + ConfiguredNodeImplementation configuration = nodeImplementationFactory.createConfiguredNodeImplementation(); + + String compositeURI = (String)bundle.getHeaders().get("SCA-Composite"); + if (compositeURI == null) { + compositeURI = "OSGI-INF/sca/bundle.composite"; + } + if (compositeURI != null) { + Composite composite = assemblyFactory.createComposite(); + composite.setURI(compositeURI); + composite.setUnresolved(true); + configuration.setComposite(composite); + } + + URL root = bundle.getEntry("/"); + org.apache.tuscany.sca.node.Contribution bundleContribution = + new org.apache.tuscany.sca.node.Contribution(bundle.getSymbolicName(), root.toString()); + + Contribution contribution = contribution(contributionFactory, bundleContribution); + configuration.getContributions().add(contribution); + return configuration; + } + + private ConfiguredNodeImplementation getNodeConfiguration(Bundle bundle, String compositeContent) throws Exception { + + ConfiguredNodeImplementation configuration = getNodeConfiguration(bundle); + + Contribution deploymentContrib = createDeploymentContribution(compositeContent); + + configuration.setComposite(deploymentContrib.getDeployables().get(0)); + configuration.getContributions().add(deploymentContrib); + + return configuration; + } + + /** + * Create an SCA contribution to hold the deployment composite + * @param compositeContent The XML string for the deployment composite + * @return An SCA contribution with the deployment composite + * @throws Exception + */ + private Contribution createDeploymentContribution(String compositeContent) throws Exception { + // Create the deployment contribution + Contribution contrib = contributionFactory.createContribution(); + contrib.setURI(SCA11_TUSCANY_NS + "/contributions/_deployment_"); + contrib.setLocation(SCA11_TUSCANY_NS + "/contributions/_deployment_"); + ModelResolver modelResolver = new ExtensibleModelResolver(contrib, modelResolvers, modelFactories); + contrib.setModelResolver(modelResolver); + contrib.setUnresolved(false); + + // Load the deployment composite + XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(compositeContent)); + reader.nextTag(); + + // Read the composite model + Composite deploymentComposite = (Composite)compositeProcessor.read(reader); + + Artifact compositeArtifact = contributionFactory.createArtifact(); + compositeArtifact.setModel(deploymentComposite); + compositeArtifact.setURI("META-INF/_deployment_.composite"); + compositeArtifact.setContents(compositeContent.getBytes("UTF-8")); + compositeArtifact.setLocation(SCA11_TUSCANY_NS + "/contributions/_deployment_/META-INF/_deployment_.composite"); + compositeArtifact.setUnresolved(false); + + contrib.getArtifacts().add(compositeArtifact); + contrib.getDeployables().add(deploymentComposite); + + analyzeProblems(); + return contrib; + } + + private synchronized void init() { + if (inited) { + return; + } + long start = currentTimeMillis(); + + // Create extension point registry + extensionPoints = new DefaultExtensionPointRegistry(); + + // Use the runtime-enabled assembly factory + modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); + assemblyFactory = new RuntimeAssemblyFactory(); + modelFactories.addFactory(assemblyFactory); + + // Create a monitor + utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); + MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); + monitor = monitorFactory.createMonitor(); + + // Initialize the Tuscany module activators + ModuleActivatorExtensionPoint activators = + extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class); + for (ModuleActivator moduleActivator : activators.getModuleActivators()) { + try { + moduleActivator.start(extensionPoints); + moduleActivators.add(moduleActivator); + } catch (Throwable e) { + // Ignore the failing module for now + logger.log(Level.SEVERE, e.getMessage(), e); + } + } + + // Get XML input/output factories + inputFactory = modelFactories.getFactory(XMLInputFactory.class); + + // Get contribution workspace and assembly model factories + contributionFactory = modelFactories.getFactory(ContributionFactory.class); + workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); + + // Create XML artifact processors + xmlProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); + compositeProcessor = xmlProcessors.getProcessor(Composite.class); + + // Create contribution content processor + URLArtifactProcessorExtensionPoint docProcessorExtensions = + extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class); + + // Get the model resolvers + modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); + + // Get a contribution dependency builder + ContributionBuilderExtensionPoint contributionBuilders = + extensionPoints.getExtensionPoint(ContributionBuilderExtensionPoint.class); + contributionDependencyBuilder = + contributionBuilders + .getContributionBuilder("org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder"); + + // Get composite builders + CompositeBuilderExtensionPoint compositeBuilders = + extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class); + compositeBuilder = + compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder"); + + // Initialize runtime + + // Get proxy factory + ProxyFactoryExtensionPoint proxyFactories = extensionPoints.getExtensionPoint(ProxyFactoryExtensionPoint.class); + proxyFactory = new ExtensibleProxyFactory(proxyFactories); + + workScheduler = utilities.getUtility(WorkScheduler.class); + + // Load the system definitions.xml from all of the loaded extension points + DefinitionsProviderExtensionPoint definitionsProviders = + extensionPoints.getExtensionPoint(DefinitionsProviderExtensionPoint.class); + DefinitionsFactory definitionsFactory = modelFactories.getFactory(DefinitionsFactory.class); + systemDefinitions = definitionsFactory.createDefinitions(); + + // aggregate all the definitions into a single definitions model + try { + for (DefinitionsProvider definitionsProvider : definitionsProviders.getDefinitionsProviders()) { + DefinitionsUtil.aggregate(definitionsProvider.getDefinitions(), systemDefinitions); + } + } catch (DefinitionsProviderException e) { + throw new IllegalStateException(e); + } + + // create a system contribution to hold the definitions. The contribution + // will be extended later with definitions from application contributions + systemContribution = contributionFactory.createContribution(); + systemContribution.setURI(SCA11_TUSCANY_NS + "/contributions/_system_"); + systemContribution.setLocation(SCA11_TUSCANY_NS + "/contributions/_system_"); + ModelResolver modelResolver = new ExtensibleModelResolver(systemContribution, modelResolvers, modelFactories); + systemContribution.setModelResolver(modelResolver); + systemContribution.setUnresolved(true); + + // create an artifact to represent the system defintions and + // add it to the contribution + List artifacts = systemContribution.getArtifacts(); + Artifact artifact = contributionFactory.createArtifact(); + artifact.setURI(SCA11_TUSCANY_NS + "/contributions/_system_/definitions"); + artifact.setLocation(SCA11_TUSCANY_NS + "/contributions/_system_/definitions"); + artifact.setModel(systemDefinitions); + artifacts.add(artifact); + + if (logger.isLoggable(Level.FINE)) { + long end = currentTimeMillis(); + logger.fine("The tuscany runtime started in " + (end - start) + " ms."); + } + inited = true; + } + + private Composite configureNode(ConfiguredNodeImplementation configuration) throws Exception { + + // Create workspace model + Workspace workspace = workspaceFactory.createWorkspace(); + workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories)); + + // Load the specified contributions + for (Contribution c : configuration.getContributions()) { + URI contributionURI = URI.create(c.getURI()); + + URI uri = createURI(c.getLocation()); + if (uri.getScheme() == null) { + uri = new File(c.getLocation()).toURI(); + } + URL contributionURL = uri.toURL(); + + // Load the contribution + logger.log(Level.INFO, "Loading contribution: " + contributionURL); + Contribution contribution = contributionProcessor.read(null, contributionURI, contributionURL); + workspace.getContributions().add(contribution); + analyzeProblems(); + } + + // Build an aggregated SCA definitions model. Must be done before we try and + // resolve any contributions or composites as they may depend on the full + // definitions.xml picture + + // get all definitions.xml artifacts from contributions and aggregate + // into the system contribution. In turn add a default import into + // each contribution so that for unresolved items the resolution + // processing will look in the system contribution + for (Contribution contribution : workspace.getContributions()) { + // aggregate definitions + for (Artifact artifact : contribution.getArtifacts()) { + Object model = artifact.getModel(); + if (model instanceof Definitions) { + DefinitionsUtil.aggregate((Definitions)model, systemDefinitions); + } + } + + // create a default import and wire it up to the system contribution + // model resolver. This is the trick that makes the resolution processing + // skip over to the system contribution if resolution is unsuccessful + // in the current contribution + DefaultImport defaultImport = contributionFactory.createDefaultImport(); + defaultImport.setModelResolver(systemContribution.getModelResolver()); + contribution.getImports().add(defaultImport); + } + + // now resolve the system contribution and add the contribution + // to the workspace + contributionProcessor.resolve(systemContribution, workspace.getModelResolver()); + workspace.getContributions().add(systemContribution); + + // TODO - Now we can calculate applicable policy sets for each composite + + // Build the contribution dependencies + Set resolved = new HashSet(); + for (Contribution contribution : workspace.getContributions()) { + contributionDependencyBuilder.build(contribution, workspace, monitor); + + // Resolve contributions + for (Contribution dependency : contribution.getDependencies()) { + if (!resolved.contains(dependency)) { + resolved.add(dependency); + contributionProcessor.resolve(dependency, workspace.getModelResolver()); + } + } + } + + Composite composite = configuration.getComposite(); + + if (composite == null) { + composite = getDefaultComposite(configuration, workspace); + } + + // Find the composite in the given contributions + boolean found = false; + Artifact compositeFile = contributionFactory.createArtifact(); + compositeFile.setUnresolved(true); + compositeFile.setURI(composite.getURI()); + for (Contribution contribution : workspace.getContributions()) { + ModelResolver resolver = contribution.getModelResolver(); + // for (Artifact artifact : contribution.getArtifacts()){ + // logger.log(Level.INFO,"artifact - " + artifact.getURI()); + // } + Artifact resolvedArtifact = resolver.resolveModel(Artifact.class, compositeFile); + // if (!resolvedArtifact.isUnresolved() && resolvedArtifact.getModel() instanceof Composite) { + + if (!composite.isUnresolved()) { + + // The composite content was passed into the node and read into a composite model, + // don't use the composite found in the contribution, use that composite, but just resolve + // it within the context of the contribution + compositeProcessor.resolve(composite, resolver); + + } else { + + // Use the resolved composite we've found in the contribution + composite = (Composite)resolvedArtifact.getModel(); + } + found = true; + // break; + // } + } + // if (!found) { + // throw new IllegalArgumentException("Composite not found: " + composite.getURI()); + // } + + // Build the composite and wire the components included in it + compositeBuilder.build(composite, systemDefinitions, monitor); + analyzeProblems(); + + // Create a top level composite to host our composite + // This is temporary to make the activator happy + Composite tempComposite = assemblyFactory.createComposite(); + tempComposite.setName(new QName(SCA11_TUSCANY_NS, "_domain_fragment_")); + tempComposite.setURI(SCA11_TUSCANY_NS + "_domain_fragment_.composite"); + + // Include the node composite in the top-level composite + tempComposite.getIncludes().add(composite); + + /* + // The following line may return null, to be investigated + XPathFactory xPathFactory = modelFactories.getFactory(XPathFactory.class); + + for (PolicySet policySet : systemDefinitions.getPolicySets()) { + if (policySet.getAppliesTo() != null) { + XPath xpath = xPathFactory.newXPath(); + // FIXME: We need to develop a xpath function resolver to + // deal with the SCA functions + // xpath.setXPathFunctionResolver(resolver); + XPathExpression exp = xpath.compile(policySet.getAppliesTo()); + // exp.evaluate(item, XPathConstants.BOOLEAN); + } + } + */ + return tempComposite; + } + + public void destroy() { + // Stop the runtime modules + for (ModuleActivator moduleActivator : moduleActivators) { + moduleActivator.stop(extensionPoints); + } + + // Stop and destroy the work manager + workScheduler.destroy(); + } + + public Node createNode(Bundle bundle) { + Node node = new NodeImpl(bundle); + nodes.put(bundle, node); + return node; + } + + public Node creatNode(Bundle bundle, String compositeContent) { + Node node = new NodeImpl(bundle, compositeContent); + nodes.put(bundle, node); + return node; + } + + /** + * Analyze problems reported by the artifact processors and builders. + * + * @throws Exception + */ + private void analyzeProblems() throws Exception { + for (Problem problem : monitor.getProblems()) { + if ((problem.getSeverity() == Severity.ERROR) && (!problem.getMessageId().equals("SchemaError"))) { + if (problem.getCause() != null) { + throw problem.getCause(); + } else { + throw new ServiceRuntimeException(problem.toString()); + } + } + } + } + + /* + * Sets a default composite by using any deployable one. + */ + private Composite getDefaultComposite(ConfiguredNodeImplementation configuration, Workspace workspace) { + // just use the first deployable composte + for (Contribution contribution : workspace.getContributions()) { + for (Composite c : contribution.getDeployables()) { + Composite composite = assemblyFactory.createComposite(); + composite.setURI(c.getURI()); + composite.setUnresolved(true); + configuration.setComposite(composite); + return composite; + } + } + throw new ServiceRuntimeException("no deployable composite found"); + } + + public ExtensionPointRegistry getExtensionPoints() { + return extensionPoints; + } + + public class NodeImpl implements Node, Client { + private Bundle bundle; + private Composite domainFragementComposite; + private CompositeActivator compositeActivator; + + public NodeImpl(Bundle bundle) { + try { + // Initialize the runtime + init(); + + this.bundle = bundle; + ConfiguredNodeImplementation configuration = getNodeConfiguration(bundle); + + // Configure the node + this.domainFragementComposite = configureNode(configuration); + this.compositeActivator = utilities.getUtility(CompositeActivator.class, true); + this.compositeActivator.setDomainComposite(domainFragementComposite); + + } catch (Exception e) { + throw new ServiceRuntimeException(e); + } + } + + public NodeImpl(Bundle bundle, String compositeContent) { + try { + // Initialize the runtime + init(); + + this.bundle = bundle; + ConfiguredNodeImplementation configuration = getNodeConfiguration(bundle, compositeContent); + + // Configure the node + this.domainFragementComposite = configureNode(configuration); + this.compositeActivator = utilities.getUtility(CompositeActivator.class, true); + this.compositeActivator.setDomainComposite(domainFragementComposite); + + } catch (Exception e) { + throw new ServiceRuntimeException(e); + } + } + + public void start() { + logger.log(Level.INFO, "Starting node: " + bundle.getSymbolicName()); + + try { + + Composite composite = domainFragementComposite.getIncludes().get(0); + // Activate the composite + compositeActivator.activate(composite); + + // Start the composite + compositeActivator.start(composite); + + } catch (ActivationException e) { + throw new IllegalStateException(e); + } + + } + + public void stop() { + logger.log(Level.INFO, "Stopping node: " + bundle.getSymbolicName()); + + try { + + Composite composite = domainFragementComposite.getIncludes().get(0); + // Stop the composite + compositeActivator.stop(composite); + + // Deactivate the composite + compositeActivator.deactivate(composite); + + } catch (ActivationException e) { + throw new IllegalStateException(e); + } + + } + + public > R cast(B target) throws IllegalArgumentException { + return (R)proxyFactory.cast(target); + } + + public B getService(Class businessInterface, String serviceName) { + + ServiceReference serviceReference = getServiceReference(businessInterface, serviceName); + if (serviceReference == null) { + throw new ServiceRuntimeException("Service not found: " + serviceName); + } + return serviceReference.getService(); + } + + public ServiceReference getServiceReference(Class businessInterface, String name) { + + // Extract the component name + String componentName; + String serviceName; + int i = name.indexOf('/'); + if (i != -1) { + componentName = name.substring(0, i); + serviceName = name.substring(i + 1); + + } else { + componentName = name; + serviceName = null; + } + + // Lookup the component + Component component = null; + + for (Component compositeComponent : domainFragementComposite.getIncludes().get(0).getComponents()) { + if (compositeComponent.getName().equals(componentName)) { + component = compositeComponent; + } + } + + if (component == null) { + throw new ServiceRuntimeException("The service " + name + " has not been contributed to the domain"); + } + RuntimeComponentContext componentContext = null; + + // If the component is a composite, then we need to find the + // non-composite component that provides the requested service + if (component.getImplementation() instanceof Composite) { + for (ComponentService componentService : component.getServices()) { + if (serviceName == null || serviceName.equals(componentService.getName())) { + CompositeService compositeService = (CompositeService)componentService.getService(); + if (compositeService != null) { + if (serviceName != null) { + serviceName = "$promoted$" + component.getName() + "$slash$" + serviceName; + } + componentContext = + ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext(); + return componentContext.createSelfReference(businessInterface, compositeService + .getPromotedService()); + } + break; + } + } + // No matching service found + throw new ServiceRuntimeException("Composite service not found: " + name); + } else { + componentContext = ((RuntimeComponent)component).getComponentContext(); + if (serviceName != null) { + return componentContext.createSelfReference(businessInterface, serviceName); + } else { + return componentContext.createSelfReference(businessInterface); + } + } + } + + public void destroy() { + this.bundle = null; + this.domainFragementComposite = null; + nodes.remove(this); + } + + } + + public Map getNodes() { + return nodes; + } +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java new file mode 100644 index 0000000000..73c98af714 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java @@ -0,0 +1,123 @@ +/* + * 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. + */ + +package org.apache.tuscany.sca.node.osgi.impl; + +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.tuscany.sca.node.Node; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.ServiceEvent; +import org.osgi.framework.ServiceListener; +import org.osgi.framework.SynchronousBundleListener; + +/** + * Managing the mapping between OSGi bundles and SCA implementation.osgi + */ +public class NodeManager implements SynchronousBundleListener, ServiceListener { + private static final Logger logger = Logger.getLogger(NodeManager.class.getName()); + private BundleContext bundleContext; + private NodeFactoryImpl factory; + public NodeManager(BundleContext bundleContext) { + super(); + this.bundleContext = bundleContext; + this.factory = new NodeFactoryImpl(); + } + + public void start() { + for (Bundle b : bundleContext.getBundles()) { + if ((b.getState() & Bundle.ACTIVE) != 0) { + // Process the active bundles + bundleStarted(b); + } + } + } + + public void stop() { + if (factory != null) { + factory.destroy(); + } + } + + public static boolean isSCABundle(Bundle bundle) { + Dictionary headers = bundle.getHeaders(); + // OSGi RFC 119 SCA + if (headers.get("SCA-Composite") != null) { + return true; + } + Enumeration entries = bundle.findEntries("OSGI-INF/sca", "*", false); + if (entries != null && entries.hasMoreElements()) { + return true; + } + + // OSGi Declarative Services + if (headers.get("Service-Component") != null) { + return true; + } + + // OSGI RFC 124: BluePrint Service + if (headers.get("Bundle-Blueprint") != null) { + return true; + } + + entries = bundle.findEntries("OSGI-INF/blueprint", "*.xml", false); + if (entries != null && entries.hasMoreElements()) { + return true; + } + return false; + } + + private void bundleStarted(Bundle bundle) { + if (!isSCABundle(bundle)) { + return; + } + try { + Node node = factory.createNode(bundle); + node.start(); + } catch (Throwable e) { + logger.log(Level.SEVERE, e.getMessage(), e); + } + } + + private void bundleStopping(Bundle bundle) { + Node node = factory.getNodes().get(bundle); + if (node == null) { + return; + } + node.stop(); + } + + public void serviceChanged(ServiceEvent event) { + } + + public void bundleChanged(BundleEvent event) { + int type = event.getType(); + if (type == BundleEvent.STOPPING) { + bundleStopping(event.getBundle()); + } else if (type == BundleEvent.STARTED) { + bundleStarted(event.getBundle()); + } + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java new file mode 100644 index 0000000000..63324bf4c4 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java @@ -0,0 +1,56 @@ +/* + * 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. + */ + +package org.apache.tuscany.sca.node.osgi.impl; + +import java.net.URI; +import java.util.logging.Logger; + +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ContributionFactory; + +/** + * NodeUtil + * + * @version $Rev: $ $Date: $ + */ +public class NodeUtil { + private static final Logger logger = Logger.getLogger(NodeFactoryImpl.class.getName()); + + static Contribution contribution(ContributionFactory contributionFactory, org.apache.tuscany.sca.node.Contribution c) { + Contribution contribution = contributionFactory.createContribution(); + contribution.setURI(c.getURI()); + contribution.setLocation(c.getLocation()); + contribution.setUnresolved(true); + return contribution; + } + + /** + * Escape the space in URL string + * @param uri + * @return + */ + static URI createURI(String uri) { + if (uri.indexOf(' ') != -1) { + uri = uri.replace(" ", "%20"); + } + return URI.create(uri); + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java new file mode 100644 index 0000000000..59ee133061 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java @@ -0,0 +1,40 @@ +/* + * 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. + */ + +package org.apache.tuscany.sca.node.osgi.impl; + +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTrackerCustomizer; + +/** + * A ServiceTracker + */ +public class OSGiServiceTracker implements ServiceTrackerCustomizer { + + public Object addingService(ServiceReference serviceReference) { + return null; + } + + public void modifiedService(ServiceReference serviceReference, Object service) { + } + + public void removedService(ServiceReference serviceReference, Object service) { + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory new file mode 100644 index 0000000000..2d7902084d --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory @@ -0,0 +1,17 @@ +# 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.node.osgi.impl.NodeFactoryImpl \ No newline at end of file diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java new file mode 100644 index 0000000000..b2d8ffb44c --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java @@ -0,0 +1,74 @@ +/* + * 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. + */ + +package calculator.dosgi; + +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.logging.Logger; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.service.packageadmin.PackageAdmin; + +import calculator.dosgi.operations.AddService; + +/** + * + */ +public class CalculatorActivator implements BundleActivator { + private Logger logger = Logger.getLogger(CalculatorActivator.class.getName()); + + private Bundle getBundle(BundleContext bundleContext, Class cls) { + PackageAdmin packageAdmin = null; + // PackageAdmin is used to resolve bundles + ServiceReference ref = bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin"); + if (ref != null) { + packageAdmin = (PackageAdmin)bundleContext.getService(ref); + Bundle bundle = packageAdmin.getBundle(cls); + if (bundle != null) { + logger.info(cls.getName() + " is loaded by bundle: " + bundle.getSymbolicName()); + } + bundleContext.ungetService(ref); + return bundle; + } + return null; + } + + public void start(BundleContext context) throws Exception { + logger.info("Starting " + context.getBundle()); + Dictionary props = new Hashtable(); + props.put("sca.service", "CalculatorComponent#service-name(Calculator)"); + props.put("calculator", "Calculator"); + logger.info("Registering " + CalculatorService.class.getName()); + CalculatorService calculator = new CalculatorServiceImpl(context); + context.registerService(CalculatorService.class.getName(), calculator, props); + + getBundle(context, AddService.class); + + } + + public void stop(BundleContext context) throws Exception { + logger.info("Stopping " + context.getBundle()); + // Registered services will be automatically unregistered + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java new file mode 100644 index 0000000000..cc562b7c2f --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java @@ -0,0 +1,36 @@ +/* + * 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. + */ +package calculator.dosgi; + +import org.oasisopen.sca.annotation.Remotable; + +/** + * The Calculator service interface. + */ +@Remotable +public interface CalculatorService { + + double add(double n1, double n2); + + double subtract(double n1, double n2); + + double multiply(double n1, double n2); + + double divide(double n1, double n2); +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java new file mode 100644 index 0000000000..9a1d64077b --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java @@ -0,0 +1,113 @@ +/* + * 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. + */ +package calculator.dosgi; + +import org.osgi.service.component.ComponentContext; + +import calculator.dosgi.operations.AddService; +import calculator.dosgi.operations.DivideService; +import calculator.dosgi.operations.MultiplyService; +import calculator.dosgi.operations.SubtractService; + +/** + * An implementation of the Calculator service. + */ +public class CalculatorServiceDSImpl implements CalculatorService { + private AddService addService; + private SubtractService subtractService; + private MultiplyService multiplyService; + private DivideService divideService; + + public CalculatorServiceDSImpl() { + super(); + System.out.println("CalculatorServiceDSImpl()"); + } + + protected void activate(ComponentContext context) { + System.out.println("Activating " + context); + } + + protected void deactivate(ComponentContext context) { + System.out.println("Deactivating " + context); + } + + /* + * The following setters can be used for DS injection + */ + public void setAddService(AddService addService) { + System.out.println("setAddService()"); + this.addService = addService; + } + + public void setSubtractService(SubtractService subtractService) { + this.subtractService = subtractService; + } + + public void setDivideService(DivideService divideService) { + this.divideService = divideService; + } + + public void setMultiplyService(MultiplyService multiplyService) { + this.multiplyService = multiplyService; + } + + /* + * The following setters can be used for DS injection + */ + public void unsetAddService(AddService addService) { + System.out.println("unsetAddService()"); + this.addService = null; + } + + public void unsetSubtractService(SubtractService subtractService) { + this.subtractService = null; + } + + public void unsetDivideService(DivideService divideService) { + this.divideService = null; + } + + public void unsetMultiplyService(MultiplyService multiplyService) { + this.multiplyService = null; + } + private T getService(Class cls) { + for (Object s : new Object[] {addService, subtractService, multiplyService, divideService}) { + if (cls.isInstance(s)) { + return cls.cast(s); + } + } + throw new IllegalStateException(cls.getSimpleName() + " is not available"); + } + + public double add(double n1, double n2) { + return getService(AddService.class).add(n1, n2); + } + + public double subtract(double n1, double n2) { + return getService(SubtractService.class).subtract(n1, n2); + } + + public double multiply(double n1, double n2) { + return getService(MultiplyService.class).multiply(n1, n2); + } + + public double divide(double n1, double n2) { + return getService(DivideService.class).divide(n1, n2); + } +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java new file mode 100644 index 0000000000..1634a1f2a4 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java @@ -0,0 +1,95 @@ +/* + * 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. + */ +package calculator.dosgi; + +import static org.osgi.framework.Constants.OBJECTCLASS; + +import org.osgi.framework.BundleContext; +import org.osgi.framework.Filter; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.util.tracker.ServiceTracker; + +import calculator.dosgi.operations.AddService; +import calculator.dosgi.operations.DivideService; +import calculator.dosgi.operations.MultiplyService; +import calculator.dosgi.operations.SubtractService; + +/** + * An implementation of the Calculator service. + */ +public class CalculatorServiceImpl implements CalculatorService { + private ServiceTracker remoteServices; + private ServiceTracker localServices; + + public CalculatorServiceImpl() { + super(); + } + + public CalculatorServiceImpl(BundleContext context) { + super(); + Filter remoteFilter = null, localFilter = null; + try { + remoteFilter = + context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (sca.reference=*))"); + localFilter = + context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (!(sca.reference=*)))"); + } catch (InvalidSyntaxException e) { + e.printStackTrace(); + } + this.remoteServices = new ServiceTracker(context, remoteFilter, null); + remoteServices.open(); + this.localServices = new ServiceTracker(context, localFilter, null); + localServices.open(); + } + + private T getService(Class cls) { + Object[] remoteObjects = remoteServices.getServices(); + if (remoteObjects != null) { + for (Object s : remoteObjects) { + if (cls.isInstance(s)) { + System.out.println("Remote service: " + s); + return cls.cast(s); + } + } + } + for (Object s : localServices.getServices()) { + if (cls.isInstance(s)) { + System.out.println("Local service: " + s); + return cls.cast(s); + } + } + throw new IllegalStateException(cls.getSimpleName() + " is not available"); + } + + public double add(double n1, double n2) { + return getService(AddService.class).add(n1, n2); + } + + public double subtract(double n1, double n2) { + return getService(SubtractService.class).subtract(n1, n2); + } + + public double multiply(double n1, double n2) { + return getService(MultiplyService.class).multiply(n1, n2); + } + + public double divide(double n1, double n2) { + return getService(DivideService.class).divide(n1, n2); + } +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java new file mode 100644 index 0000000000..971500782f --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java @@ -0,0 +1,31 @@ +/* + * 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. + */ +package calculator.dosgi.operations; + +import org.oasisopen.sca.annotation.Remotable; + +/** + * The interface for the add service + */ +@Remotable +public interface AddService { + + double add(double n1, double n2); + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java new file mode 100644 index 0000000000..6bdbfa5fb5 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java @@ -0,0 +1,35 @@ +/* + * 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. + */ +package calculator.dosgi.operations; + +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * An implementation of the Add service + */ +public class AddServiceImpl implements AddService { + + public double add(double n1, double n2) { + Logger logger = Logger.getLogger("calculator"); + logger.log(Level.INFO, "Adding " + n1 + " and " + n2); + return n1 + n2; + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java new file mode 100644 index 0000000000..49b8a1c0bf --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java @@ -0,0 +1,31 @@ +/* + * 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. + */ +package calculator.dosgi.operations; + +import org.oasisopen.sca.annotation.Remotable; + +/** + * The interface for the divide service + */ +@Remotable +public interface DivideService { + + double divide(double n1, double n2); + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java new file mode 100644 index 0000000000..eafc9b0f4f --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java @@ -0,0 +1,35 @@ +/* + * 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. + */ +package calculator.dosgi.operations; + +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * An implementation of the Divide service. + */ +public class DivideServiceImpl implements DivideService { + + public double divide(double n1, double n2) { + Logger logger = Logger.getLogger("calculator"); + logger.log(Level.INFO, "Dividing " + n1 + " with " + n2); + return n1 / n2; + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java new file mode 100644 index 0000000000..f4e59d12ea --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java @@ -0,0 +1,31 @@ +/* + * 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. + */ +package calculator.dosgi.operations; + +import org.oasisopen.sca.annotation.Remotable; + +/** + * The interface for the multiply service + */ +@Remotable +public interface MultiplyService { + + double multiply(double n1, double n2); + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java new file mode 100644 index 0000000000..c2e39ad2f4 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java @@ -0,0 +1,35 @@ +/* + * 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. + */ +package calculator.dosgi.operations; + +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * An implementation of the Multiply service. + */ +public class MultiplyServiceImpl implements MultiplyService { + + public double multiply(double n1, double n2) { + Logger logger = Logger.getLogger("calculator"); + logger.log(Level.INFO, "Multiplying " + n1 + " with " + n2); + return n1 * n2; + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java new file mode 100644 index 0000000000..7db89cd98d --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java @@ -0,0 +1,63 @@ +/* + * 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. + */ + +package calculator.dosgi.operations; + +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.logging.Logger; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * + */ +public class OperationsActivator implements BundleActivator { + private Logger logger = Logger.getLogger(OperationsActivator.class.getName()); + + public void start(BundleContext context) throws Exception { + logger.info("Starting " + context.getBundle()); + + Dictionary props = new Hashtable(); + + logger.info("Registering " + AddService.class.getName()); + props.put("sca.service", "AddComponent#service-name(Add)"); + context.registerService(AddService.class.getName(), new AddServiceImpl(), props); + + logger.info("Registering " + SubtractService.class.getName()); + props.put("sca.service", "SubtractComponent#service-name(Subtract)"); + context.registerService(SubtractService.class.getName(), new SubtractServiceImpl(), props); + + logger.info("Registering " + MultiplyService.class.getName()); + props.put("sca.service", "MultiplyComponent#service-name(Multiply)"); + context.registerService(MultiplyService.class.getName(), new MultiplyServiceImpl(), props); + + logger.info("Registering " + DivideService.class.getName()); + props.put("sca.service", "DivideComponent#service-name(Divide)"); + context.registerService(DivideService.class.getName(), new DivideServiceImpl(), props); + + } + + public void stop(BundleContext context) throws Exception { + logger.info("Stopping " + context.getBundle()); + // Registered services will be automatically unregistered + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java new file mode 100644 index 0000000000..bfb9b820f7 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java @@ -0,0 +1,31 @@ +/* + * 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. + */ +package calculator.dosgi.operations; + +import org.oasisopen.sca.annotation.Remotable; + +/** + * The interface for the subtract service + */ +@Remotable +public interface SubtractService { + + double subtract(double n1, double n2); + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java new file mode 100644 index 0000000000..64cc776884 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java @@ -0,0 +1,35 @@ +/* + * 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. + */ +package calculator.dosgi.operations; + +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * An implementation of the subtract service. + */ +public class SubtractServiceImpl implements SubtractService { + + public double subtract(double n1, double n2) { + Logger logger = Logger.getLogger("calculator"); + logger.log(Level.INFO, "Subtracting " + n1 + " from " + n2); + return n1 - n2; + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java new file mode 100644 index 0000000000..dbb45dedb4 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java @@ -0,0 +1,248 @@ +/* + * 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. + */ + +package calculator.dosgi.test; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.HashSet; +import java.util.Set; + +import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; + +import calculator.dosgi.CalculatorActivator; +import calculator.dosgi.CalculatorService; +import calculator.dosgi.CalculatorServiceDSImpl; +import calculator.dosgi.CalculatorServiceImpl; +import calculator.dosgi.operations.AddService; +import calculator.dosgi.operations.AddServiceImpl; +import calculator.dosgi.operations.DivideService; +import calculator.dosgi.operations.DivideServiceImpl; +import calculator.dosgi.operations.MultiplyService; +import calculator.dosgi.operations.MultiplyServiceImpl; +import calculator.dosgi.operations.OperationsActivator; +import calculator.dosgi.operations.SubtractService; +import calculator.dosgi.operations.SubtractServiceImpl; + +/** + * + */ +public class CalculatorOSGiNodeTestCase { + private static EquinoxHost host; + private static BundleContext context; + private static Boolean client; + + public static URL getCodeLocation(final Class anchorClass) { + return AccessController.doPrivileged(new PrivilegedAction() { + public URL run() { + return anchorClass.getProtectionDomain().getCodeSource().getLocation(); + } + }); + } + + /** + * @throws java.lang.Exception + */ + @BeforeClass + public static void setUpBeforeClass() throws Exception { + try { + String prop = System.getProperty("client"); + if (prop != null) { + client = Boolean.valueOf(prop); + } + Set bundles = new HashSet(); + + if (client == null || client.booleanValue()) { + System.out.println("Generating calculator.dosgi bundle..."); + bundles.add(OSGiTestBundles.createBundle("target/test-classes/calculator-bundle.jar", + "calculator/dosgi/META-INF/MANIFEST.MF", + new String[][] { + {"OSGI-INF/calculator-component.xml", null}, + {"calculator/dosgi/bundle.componentType", + "OSGI-INF/sca/bundle.componentType"}, + {"calculator/dosgi/calculator.composite", + "OSGI-INF/sca/bundle.composite"}}, + CalculatorService.class, + // Package the interfaces so that the operations bundle can be remote + AddService.class, + SubtractService.class, + MultiplyService.class, + DivideService.class, + CalculatorServiceImpl.class, + CalculatorServiceDSImpl.class, + CalculatorActivator.class)); + } + + if (client == null || !client.booleanValue()) { + System.out.println("Generating calculator.dosgi.operations bundle..."); + bundles.add(OSGiTestBundles + .createBundle("target/test-classes/operations-bundle.jar", + "calculator/dosgi/operations/META-INF/MANIFEST.MF", + new String[][] { + {"OSGI-INF/add-component.xml", null}, + {"OSGI-INF/subtract-component.xml", null}, + {"OSGI-INF/multiply-component.xml", null}, + {"OSGI-INF/divide-component.xml", null}, + {"calculator/dosgi/operations/bundle.componentType", + "OSGI-INF/sca/bundle.componentType"}, + {"calculator/dosgi/operations/operations.composite", + "OSGI-INF/sca/bundle.composite"}}, + OperationsActivator.class, + AddService.class, + AddServiceImpl.class, + SubtractService.class, + SubtractServiceImpl.class, + MultiplyService.class, + MultiplyServiceImpl.class, + DivideService.class, + DivideServiceImpl.class)); + } + host = new EquinoxHost(); + context = host.start(); + for (URL loc : bundles) { + host.installBundle(loc, null); + } + for (Bundle b : context.getBundles()) { + if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName() + .startsWith("org.apache.tuscany.sca.")) { + try { + b.start(); + } catch (Exception e) { + System.out.println(string(b, false)); + e.printStackTrace(); + } + System.out.println(string(b, false)); + } + } + for (Bundle b : context.getBundles()) { + if (b.getSymbolicName().startsWith("calculator.dosgi")) { + b.start(); + System.out.println(string(b, false)); + } + } + } catch (Exception e) { + e.printStackTrace(); + throw e; + } + } + + private static T cast(Object obj, Class cls) { + if (cls.isInstance(obj)) { + return cls.cast(obj); + } else { + return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(), + new Class[] {cls}, + new InvocationHandlerImpl(obj))); + } + } + + private static class InvocationHandlerImpl implements InvocationHandler { + private Object instance; + + public InvocationHandlerImpl(Object instance) { + super(); + this.instance = instance; + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes()); + return m.invoke(instance, args); + } + + } + + @Test + public void testOSGi() { + if (client == null || client.booleanValue()) { + ServiceReference ref = context.getServiceReference(CalculatorService.class.getName()); + Assert.assertNotNull(ref); + Object service = context.getService(ref); + Assert.assertNotNull(service); + CalculatorService calculator = cast(service, CalculatorService.class); + System.out.println("2.0 + 1.0 = " + calculator.add(2.0, 1.0)); + System.out.println("2.0 - 1.0 = " + calculator.subtract(2.0, 1.0)); + System.out.println("2.0 * 1.0 = " + calculator.multiply(2.0, 1.0)); + System.out.println("2.0 / 1.0 = " + calculator.divide(2.0, 1.0)); + } + } + + /** + * Returns a string representation of the given bundle. + * + * @param b + * @param verbose + * @return + */ + static String string(Bundle bundle, boolean verbose) { + StringBuffer sb = new StringBuffer(); + sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName()); + int s = bundle.getState(); + if ((s & Bundle.UNINSTALLED) != 0) { + sb.append(" UNINSTALLED"); + } + if ((s & Bundle.INSTALLED) != 0) { + sb.append(" INSTALLED"); + } + if ((s & Bundle.RESOLVED) != 0) { + sb.append(" RESOLVED"); + } + if ((s & Bundle.STARTING) != 0) { + sb.append(" STARTING"); + } + if ((s & Bundle.STOPPING) != 0) { + sb.append(" STOPPING"); + } + if ((s & Bundle.ACTIVE) != 0) { + sb.append(" ACTIVE"); + } + + if (verbose) { + sb.append(" ").append(bundle.getLocation()); + sb.append(" ").append(bundle.getHeaders()); + } + return sb.toString(); + } + + /** + * @throws java.lang.Exception + */ + @AfterClass + public static void tearDownAfterClass() throws Exception { + if (host != null) { + if (client != null && !client.booleanValue()) { + System.out.println("Press Enter to stop the node..."); + System.in.read(); + } + host.stop(); + context = null; + } + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java new file mode 100644 index 0000000000..6ff261d01f --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java @@ -0,0 +1,211 @@ +/* + * 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. + */ + +package calculator.dosgi.test; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.net.URL; +import java.util.HashSet; +import java.util.Set; + +import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; + +import calculator.dosgi.CalculatorActivator; +import calculator.dosgi.CalculatorService; +import calculator.dosgi.CalculatorServiceDSImpl; +import calculator.dosgi.CalculatorServiceImpl; +import calculator.dosgi.operations.AddService; +import calculator.dosgi.operations.AddServiceImpl; +import calculator.dosgi.operations.DivideService; +import calculator.dosgi.operations.DivideServiceImpl; +import calculator.dosgi.operations.MultiplyService; +import calculator.dosgi.operations.MultiplyServiceImpl; +import calculator.dosgi.operations.OperationsActivator; +import calculator.dosgi.operations.SubtractService; +import calculator.dosgi.operations.SubtractServiceImpl; + +/** + * + */ +public class CalculatorOSGiTestCase { + private static EquinoxHost host; + + /** + * @throws java.lang.Exception + */ + @BeforeClass + public static void setUpBeforeClass() throws Exception { + Set bundles = new HashSet(); + + bundles.add(OSGiTestBundles.createBundle("target/test-classes/calculator-bundle.jar", + "calculator/dosgi/META-INF/MANIFEST.MF", + new String[][] { + {"OSGI-INF/calculator-component.xml", null}, + {"calculator/dosgi/bundle.componentType", + "OSGI-INF/sca/bundle.componentType"}, + {"calculator/dosgi/calculator.composite", + "OSGI-INF/sca/bundle.composite"}}, + CalculatorService.class, + CalculatorServiceImpl.class, + CalculatorServiceDSImpl.class, + CalculatorActivator.class)); + + bundles.add(OSGiTestBundles.createBundle("target/test-classes/operations-bundle.jar", + "calculator/dosgi/operations/META-INF/MANIFEST.MF", + new String[][] { + {"OSGI-INF/add-component.xml", null}, + {"OSGI-INF/subtract-component.xml", null}, + {"OSGI-INF/multiply-component.xml", null}, + {"OSGI-INF/divide-component.xml", null}, + {"calculator/dosgi/operations/bundle.componentType", + "OSGI-INF/sca/bundle.componentType"}, + {"calculator/dosgi/operations/operations.composite", + "OSGI-INF/sca/bundle.composite"}}, + OperationsActivator.class, + AddService.class, + AddServiceImpl.class, + SubtractService.class, + SubtractServiceImpl.class, + MultiplyService.class, + MultiplyServiceImpl.class, + DivideService.class, + DivideServiceImpl.class)); + try { + host = new EquinoxHost(); + BundleContext context = host.start(); + for (URL loc : bundles) { + host.installBundle(loc, null); + } + for (Bundle b : context.getBundles()) { + if (b.getSymbolicName().equals("org.eclipse.equinox.ds")) { + System.out.println(string(b, false)); + b.start(); + System.out.println(string(b, false)); + } + } + for (Bundle b : context.getBundles()) { + if (b.getSymbolicName().startsWith("calculator.dosgi")) { + b.start(); + System.out.println(string(b, false)); + } + } + + // Sleep for 1 sec so that the DS is available + Thread.sleep(1000); + // Use the DS version + String filter = "(component.name=CalculatorComponent)"; + System.out.println(filter); + ServiceReference ref = context.getServiceReferences(CalculatorService.class.getName(), filter)[0]; + CalculatorService calculator = cast(context.getService(ref), CalculatorService.class); + System.out.println("2.0 + 1.0 = " + calculator.add(2.0, 1.0)); + System.out.println("2.0 - 1.0 = " + calculator.subtract(2.0, 1.0)); + System.out.println("2.0 * 1.0 = " + calculator.multiply(2.0, 1.0)); + System.out.println("2.0 / 1.0 = " + calculator.divide(2.0, 1.0)); + } catch (Exception e) { + e.printStackTrace(); + throw e; + } + } + + private static T cast(Object obj, Class cls) { + if (cls.isInstance(obj)) { + return cls.cast(obj); + } else { + return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(), + new Class[] {cls}, + new InvocationHandlerImpl(obj))); + } + } + + private static class InvocationHandlerImpl implements InvocationHandler { + private Object instance; + + public InvocationHandlerImpl(Object instance) { + super(); + this.instance = instance; + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes()); + return m.invoke(instance, args); + } + + } + + @Test + public void testOSGi() { + + } + + /** + * Returns a string representation of the given bundle. + * + * @param b + * @param verbose + * @return + */ + static String string(Bundle bundle, boolean verbose) { + StringBuffer sb = new StringBuffer(); + sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName()); + int s = bundle.getState(); + if ((s & Bundle.UNINSTALLED) != 0) { + sb.append(" UNINSTALLED"); + } + if ((s & Bundle.INSTALLED) != 0) { + sb.append(" INSTALLED"); + } + if ((s & Bundle.RESOLVED) != 0) { + sb.append(" RESOLVED"); + } + if ((s & Bundle.STARTING) != 0) { + sb.append(" STARTING"); + } + if ((s & Bundle.STOPPING) != 0) { + sb.append(" STOPPING"); + } + if ((s & Bundle.ACTIVE) != 0) { + sb.append(" ACTIVE"); + } + + if (verbose) { + sb.append(" ").append(bundle.getLocation()); + sb.append(" ").append(bundle.getHeaders()); + } + return sb.toString(); + } + + /** + * @throws java.lang.Exception + */ + @AfterClass + public static void tearDownAfterClass() throws Exception { + if (host != null) { + host.stop(); + } + } + +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java new file mode 100644 index 0000000000..1a7b961271 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java @@ -0,0 +1,183 @@ +/* + * 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. + */ + +package calculator.dosgi.test; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.HashSet; +import java.util.Set; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; +import java.util.zip.ZipEntry; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.Constants; + +/** + * + * Utility class to create OSGi bundles + * + * @version $Rev$ $Date$ + */ +public class OSGiTestBundles { + private static String getPackageName(Class cls) { + String name = cls.getName(); + int index = name.lastIndexOf('.'); + return index == -1 ? "" : name.substring(0, index); + } + + public static URL createBundle(String jarName, String mfFile, String[][] resources, Class... classes) + throws IOException { + InputStream is = OSGiTestBundles.class.getClassLoader().getResourceAsStream(mfFile); + Manifest manifest = new Manifest(is); + is.close(); + + ByteArrayOutputStream out = new ByteArrayOutputStream(); + JarOutputStream jarOut = new JarOutputStream(out, manifest); + + for (Class cls : classes) { + addClass(jarOut, cls); + } + + if (resources != null) { + for (String resource[] : resources) { + addResource(jarOut, OSGiTestBundles.class.getClassLoader(), resource[0], resource[1]); + } + } + + jarOut.close(); + out.close(); + + File jar = new File(jarName); + FileOutputStream fileOut = new FileOutputStream(jar); + fileOut.write(out.toByteArray()); + fileOut.close(); + + return jar.toURI().toURL(); + } + + public static URL createBundle(String jarName, + String bundleName, + String exports, + String imports, + String[] resources, + Class... classes) throws IOException { + + Class activator = null; + Set packages = new HashSet(); + StringBuffer exportPackages = new StringBuffer(); + if (exports != null) { + exportPackages.append(exports); + } + for (Class cls : classes) { + if (BundleActivator.class.isAssignableFrom(cls)) { + activator = cls; + } + if (exports == null && cls.isInterface()) { + String pkg = getPackageName(cls); + if (packages.add(pkg)) { + exportPackages.append(pkg).append(","); + } + } + } + int len = exportPackages.length(); + if (len > 0 && exportPackages.charAt(len - 1) == ',') { + exportPackages.deleteCharAt(len - 1); + } + + Manifest manifest = new Manifest(); + // This attribute Manifest-Version is required so that the MF will be added to the jar + manifest.getMainAttributes().putValue("Manifest-Version", "1.0"); + manifest.getMainAttributes().putValue(Constants.BUNDLE_MANIFESTVERSION, "2"); + manifest.getMainAttributes().putValue(Constants.BUNDLE_SYMBOLICNAME, bundleName); + manifest.getMainAttributes().putValue(Constants.BUNDLE_VERSION, "1.0.0"); + manifest.getMainAttributes().putValue(Constants.BUNDLE_NAME, bundleName); + manifest.getMainAttributes().putValue(Constants.EXPORT_PACKAGE, exportPackages.toString()); + StringBuffer importPackages = new StringBuffer(); + if (imports != null) { + importPackages.append(imports).append(",org.osgi.framework"); + } else { + importPackages.append("org.osgi.framework"); + } + manifest.getMainAttributes().putValue(Constants.IMPORT_PACKAGE, importPackages.toString()); + + if (activator != null) { + manifest.getMainAttributes().putValue(Constants.BUNDLE_ACTIVATOR, activator.getName()); + } + + ByteArrayOutputStream out = new ByteArrayOutputStream(); + JarOutputStream jarOut = new JarOutputStream(out, manifest); + + for (Class cls : classes) { + addClass(jarOut, cls); + } + + if (resources != null) { + for (String resource : resources) { + addResource(jarOut, OSGiTestBundles.class.getClassLoader(), resource, null); + } + } + + jarOut.close(); + out.close(); + + File jar = new File(jarName); + FileOutputStream fileOut = new FileOutputStream(jar); + fileOut.write(out.toByteArray()); + fileOut.close(); + + return jar.toURI().toURL(); + } + + private static void addClass(JarOutputStream jarOut, Class javaClass) throws IOException, FileNotFoundException { + String classFile = javaClass.getName().replace('.', '/') + ".class"; + URL url = javaClass.getResource(javaClass.getSimpleName() + ".class"); + addEntry(jarOut, url, classFile); + } + + private static void addResource(JarOutputStream jarOut, ClassLoader cl, String resourceName, String entryName) + throws IOException, FileNotFoundException { + URL url = cl.getResource(resourceName); + if (entryName == null) { + entryName = resourceName; + } + addEntry(jarOut, url, entryName); + } + + private static void addEntry(JarOutputStream jarOut, URL url, String resourceName) throws IOException, + FileNotFoundException { + String path = url.getPath(); + + ZipEntry ze = new ZipEntry(resourceName); + + jarOut.putNextEntry(ze); + FileInputStream file = new FileInputStream(path); + byte[] fileContents = new byte[file.available()]; + file.read(fileContents); + jarOut.write(fileContents); + jarOut.closeEntry(); + } +} diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/META-INF/sca-contribution.xml b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..1149eb5cbf --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/META-INF/sca-contribution.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/add-component.xml b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/add-component.xml new file mode 100644 index 0000000000..a7d563023c --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/add-component.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/calculator-component.xml b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/calculator-component.xml new file mode 100644 index 0000000000..3e537df732 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/calculator-component.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/divide-component.xml b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/divide-component.xml new file mode 100644 index 0000000000..def7fce23c --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/divide-component.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/multiply-component.xml b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/multiply-component.xml new file mode 100644 index 0000000000..57f627f990 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/multiply-component.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/subtract-component.xml b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/subtract-component.xml new file mode 100644 index 0000000000..073ee5ea40 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/OSGI-INF/subtract-component.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..41c1264364 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF @@ -0,0 +1,20 @@ +Manifest-Version: 1.0 +Export-Package: calculator.dosgi;version="1.0.0", + calculator.dosgi.operations;version="1.0.0" +Bundle-Version: 1.0.0 +Bundle-Name: calculator.dosgi +Bundle-Activator: calculator.dosgi.CalculatorActivator +Bundle-ManifestVersion: 2 +Import-Package: calculator.dosgi.operations;version="1.0.0", + org.osgi.framework, + org.osgi.service.packageadmin, + org.osgi.util.tracker, + org.osgi.service.component;resolution:=optional +Bundle-SymbolicName: calculator.dosgi +Bundle-Vendor: The Apache Software Foundation +Bundle-ActivationPolicy: lazy +Eclipse-LazyStart: true +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-DocURL: http://www.apache.org/ +Service-Component: OSGI-INF/calculator-component.xml + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType new file mode 100644 index 0000000000..7860094626 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType @@ -0,0 +1,54 @@ + + + + + + + + + 1 + ABC + + + + + + 1 + ABC + + + + 1 + ABC + + + + 1 + ABC + + + + 1 + ABC + + + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite new file mode 100644 index 0000000000..3c77086c45 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..eb15e778b1 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF @@ -0,0 +1,20 @@ +Manifest-Version: 1.0 +Export-Package: calculator.dosgi.operations;version="1.0.0" +Bundle-Version: 1.0.0 +Bundle-Name: calculator.dosgi.operations +Bundle-Activator: calculator.dosgi.operations.OperationsActivator +Bundle-ManifestVersion: 2 +Import-Package: calculator.dosgi.operations;version="1.0.0", + org.osgi.framework, + org.osgi.service.component;resolution:=optional +Bundle-SymbolicName: calculator.dosgi.operations +Bundle-Vendor: The Apache Software Foundation +Bundle-ActivationPolicy: lazy +Eclipse-LazyStart: true +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-DocURL: http://www.apache.org/ +Service-Component: OSGI-INF/add-component.xml, + OSGI-INF/subtract-component.xml, + OSGI-INF/multiply-component.xml, + OSGI-INF/divide-component.xml + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType new file mode 100644 index 0000000000..6f6f4bdce6 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType @@ -0,0 +1,47 @@ + + + + + + + + + 1 + ABC + + + + 1 + ABC + + + + 1 + ABC + + + + 1 + ABC + + + diff --git a/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite new file mode 100644 index 0000000000..c9fb3818b8 --- /dev/null +++ b/sandbox/ant/sca/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3