7:15 a.m.
Author: objectiser
Date: 2011-02-11 08:15:20 -0500 (Fri, 11 Feb 2011)
New Revision: 656
Modified:
branches/experimental/2.0.x/bundles/org.savara.activity/pom.xml
branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml
branches/experimental/2.0.x/bundles/org.savara.common.config.file/pom.xml
branches/experimental/2.0.x/bundles/org.savara.common/pom.xml
branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml
branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml
branches/experimental/2.0.x/bundles/org.savara.protocol/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.protocol/pom.xml
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/osgi/Activator.java
branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml
branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml
branches/experimental/2.0.x/bundles/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/dialogs/GenerateDialog.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java
Log:
Moved from dependency on felix version of org.osgi.core to org.osgi. Moved tools to use
ProtocolServices in org.savara.protocol bundle, rather than the ScribbleServices in
org.savara.tools.core, as this is the only component in the tools core at the moment, but
the services holder class is also needed for some tests in the bundles - so makes sense to
move and remove the tools core plugin for now. Can always be added again later if there is
a need for common tools classes.
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/pom.xml 2011-02-11 12:26:06
UTC (rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/pom.xml 2011-02-11 13:15:20
UTC (rev 656)
@@ -30,7 +30,7 @@
<version>${savara.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml 2011-02-11 12:26:06 UTC
(rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml 2011-02-11 13:15:20 UTC
(rev 656)
@@ -55,7 +55,7 @@
<version>${savara.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.common/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/pom.xml 2011-02-11 12:26:06 UTC
(rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.common/pom.xml 2011-02-11 13:15:20 UTC
(rev 656)
@@ -20,7 +20,7 @@
<version>${scribble.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.common.config.file/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/pom.xml 2011-02-11
12:26:06 UTC (rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/pom.xml 2011-02-11
13:15:20 UTC (rev 656)
@@ -20,7 +20,7 @@
<version>${savara.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml 2011-02-11 12:26:06
UTC (rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml 2011-02-11 13:15:20
UTC (rev 656)
@@ -30,7 +30,7 @@
<version>${savara.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml 2011-02-11 12:26:06 UTC
(rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml 2011-02-11 13:15:20 UTC
(rev 656)
@@ -45,7 +45,7 @@
<version>${savara.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml 2011-02-11
12:26:06 UTC (rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml 2011-02-11
13:15:20 UTC (rev 656)
@@ -45,7 +45,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/META-INF/MANIFEST.MF
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.protocol/META-INF/MANIFEST.MF 2011-02-11
12:26:06 UTC (rev 655)
+++
branches/experimental/2.0.x/bundles/org.savara.protocol/META-INF/MANIFEST.MF 2011-02-11
13:15:20 UTC (rev 656)
@@ -1,12 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA Protocol
-Bundle-SymbolicName: org.savara.protocol
+Bundle-SymbolicName: org.savara.protocol;singleton:=true
Bundle-Version: 2.0.0.SNAPSHOT
Bundle-Activator: org.savara.protocol.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.osgi.framework;version="1.3.0"
+Import-Package: org.osgi.framework;version="1.3.0",
+ org.osgi.util.tracker
Require-Bundle: org.scribble.common,
org.scribble.protocol,
org.savara.common,
@@ -22,3 +23,4 @@
org.savara.protocol.repository,
org.savara.protocol.repository.impl,
org.savara.protocol.util
+Bundle-ActivationPolicy: lazy
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/pom.xml 2011-02-11 12:26:06
UTC (rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/pom.xml 2011-02-11 13:15:20
UTC (rev 656)
@@ -47,10 +47,15 @@
<version>${savara.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/osgi/Activator.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/osgi/Activator.java 2011-02-11
12:26:06 UTC (rev 655)
+++
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/osgi/Activator.java 2011-02-11
13:15:20 UTC (rev 656)
@@ -1,15 +1,24 @@
package org.savara.protocol.osgi;
+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.util.tracker.ServiceTracker;
+import org.savara.protocol.util.ProtocolServices;
import org.scribble.protocol.parser.ProtocolParserManager;
import org.scribble.protocol.projection.ProtocolProjector;
public class Activator implements BundleActivator {
+ private static Logger logger = Logger.getLogger(Activator.class.getName());
+
private static BundleContext context;
+ private org.osgi.util.tracker.ServiceTracker m_protocolProjectorTracker=null;
+
static BundleContext getContext() {
return context;
}
@@ -21,21 +30,57 @@
public void start(BundleContext bundleContext) throws Exception {
Activator.context = bundleContext;
+ // Make sure any bundles, associated with scribble, are started (excluding
+ // the designer itself)
+ Bundle[] bundles=context.getBundles();
+
+ for (int i=0; i < bundles.length; i++) {
+ Bundle bundle=bundles[i];
+
+ if (bundle != null) {
+ //Object val=bundle.getHeaders().get(SERVICE_COMPONENT);
+ if (bundle.getSymbolicName().startsWith("org.scribble.") &&
+ bundle.getSymbolicName().endsWith("designer") == false) {
+
+ //if (bundle.getState() == Bundle.RESOLVED) {
+ logger.fine("Pre-empt bundle start: "+bundle);
+ bundle.start();
+ //}
+ }
+ }
+ }
+
// Initialize the protocol parser manager
ServiceReference
sref=context.getServiceReference(ProtocolParserManager.class.getName());
ProtocolParserManager ppm=(ProtocolParserManager)context.getService(sref);
- org.savara.protocol.util.ProtocolServices.setParserManager(ppm);
+ ProtocolServices.setParserManager(ppm);
// Initialize the protocol projector
- /*
sref=context.getServiceReference(ProtocolProjector.class.getName());
- ProtocolProjector pp=(ProtocolProjector)context.getService(sref);
-
- org.savara.protocol.util.ProtocolServices.setProtocolProjector(pp);
- */
+ if (sref != null) {
+ ProtocolProjector pp=(ProtocolProjector)context.getService(sref);
+ ProtocolServices.setProtocolProjector(pp);
+ } else {
+ // Create service tracker
+ m_protocolProjectorTracker = new ServiceTracker(context,
+ ProtocolProjector.class.getName(), null) {
+
+ public Object addingService(ServiceReference ref) {
+ Object ret=super.addingService(ref);
+
+ logger.fine("Projector being set: "+ret);
+
+ ProtocolServices.setProtocolProjector((ProtocolProjector)ret);
+
+ return(ret);
+ }
+ };
+
+ m_protocolProjectorTracker.open();
+ }
}
/*
Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml 2011-02-11 12:26:06
UTC (rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml 2011-02-11 13:15:20
UTC (rev 656)
@@ -35,7 +35,7 @@
<version>${savara.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml 2011-02-11 12:26:06 UTC
(rev 655)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml 2011-02-11 13:15:20 UTC
(rev 656)
@@ -50,7 +50,7 @@
<version>1.6.2</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/bundles/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/pom.xml 2011-02-11 12:26:06 UTC (rev 655)
+++ branches/experimental/2.0.x/bundles/pom.xml 2011-02-11 13:15:20 UTC (rev 656)
@@ -16,7 +16,7 @@
<properties>
<jaxb.version>2.1</jaxb.version>
- <osgi.version>1.4.0</osgi.version>
+ <osgi.version>4.2.0</osgi.version>
</properties>
<modules>
Modified:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/dialogs/GenerateDialog.java
===================================================================
---
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/dialogs/GenerateDialog.java 2011-02-11
12:26:06 UTC (rev 655)
+++
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/dialogs/GenerateDialog.java 2011-02-11
13:15:20 UTC (rev 656)
@@ -24,8 +24,8 @@
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
+import org.savara.protocol.util.ProtocolServices;
import org.savara.tools.bpel.generator.*;
-import org.savara.tools.core.ScribbleServices;
import org.scribble.common.logging.CachedJournal;
import org.scribble.common.logging.Journal;
import org.scribble.protocol.model.*;
@@ -59,7 +59,7 @@
Journal journal=new CachedJournal();
try {
- m_protocolModel = ScribbleServices.getParserManager().parse(res.getFileExtension(),
+ m_protocolModel = ProtocolServices.getParserManager().parse(res.getFileExtension(),
res.getContents(), journal, null);
if (m_protocolModel == null) {
Modified:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
===================================================================
---
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-02-11
12:26:06 UTC (rev 655)
+++
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-02-11
13:15:20 UTC (rev 656)
@@ -43,7 +43,7 @@
import org.savara.contract.model.Namespace;
import org.savara.protocol.contract.generator.ContractGenerator;
import org.savara.protocol.contract.generator.ContractGeneratorFactory;
-import org.savara.tools.core.ScribbleServices;
+import org.savara.protocol.util.ProtocolServices;
import org.savara.wsdl.generator.WSDLGeneratorFactory;
import org.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding;
import org.scribble.common.logging.CachedJournal;
@@ -141,7 +141,7 @@
Journal journal=new CachedJournal();
try {
- m_protocolModel = ScribbleServices.getParserManager().parse(res.getFileExtension(),
+ m_protocolModel = ProtocolServices.getParserManager().parse(res.getFileExtension(),
res.getContents(), journal, null);
if (m_protocolModel == null) {
@@ -233,10 +233,10 @@
}
*/
- DefaultProtocolContext context=new
DefaultProtocolContext(ScribbleServices.getParserManager(),
+ DefaultProtocolContext context=new
DefaultProtocolContext(ProtocolServices.getParserManager(),
new DefaultResourceLocator(cdmResource.getParent().getFullPath().toFile()));
- ProtocolModel local=ScribbleServices.getProtocolProjector().project(m_protocolModel,
+ ProtocolModel local=ProtocolServices.getProtocolProjector().project(m_protocolModel,
localRole, journal, context);
if (local != null) {
Modified:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java
===================================================================
---
branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java 2011-02-11
12:26:06 UTC (rev 655)
+++
branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java 2011-02-11
13:15:20 UTC (rev 656)
@@ -60,6 +60,7 @@
super.start(context);
plugin = this;
+ /*
// Make sure any bundles, associated with scribble, are started (excluding
// the designer itself)
Bundle[] bundles=context.getBundles();
@@ -111,6 +112,7 @@
m_protocolProjectorTracker.open();
}
+ */
}
/*