Author: objectiser Date: 2010-12-23 07:25:28 -0500 (Thu, 23 Dec 2010) New Revision: 515 Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/OSGI-INF/ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/OSGI-INF/cdm-protocol-parser.xml Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 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.core/META-INF/MANIFEST.MF branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/core/eclipse/osgi/Activator.java Log: Making progress - CDM protocol parser now registered and invoked, but causing npe during BPEL generation. Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2010-12-22 22:55:18 UTC (rev 514) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2010-12-23 12:25:28 UTC (rev 515) @@ -1,11 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SAVARA pi4soa CDM -Bundle-SymbolicName: org.savara.pi4soa.cdm -Bundle-Version: 1.2.0.qualifier +Bundle-SymbolicName: org.savara.pi4soa.cdm;singleton:=true +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.savara.pi4soa.cdm.osgi.Activator Bundle-Vendor: www.savara.org +Service-Component: OSGI-INF/cdm-protocol-parser.xml Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.pi4soa.cdl, org.pi4soa.common, Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/OSGI-INF/cdm-protocol-parser.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/OSGI-INF/cdm-protocol-parser.xml (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/OSGI-INF/cdm-protocol-parser.xml 2010-12-23 12:25:28 UTC (rev 515) @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<component name="cdm-protocol-parser"> + <implementation class="org.savara.pi4soa.cdm.parser.CDMProtocolParser"/> + <service> + <provide interface="org.scribble.protocol.parser.ProtocolParser"/> + </service> +</component> 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 2010-12-22 22:55:18 UTC (rev 514) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/dialogs/GenerateDialog.java 2010-12-23 12:25:28 UTC (rev 515) @@ -66,6 +66,7 @@ logger.error("Unable to load model used to generate the BPEL process"); } } catch(Exception e) { + e.printStackTrace(); logger.error("Failed to generate BPEL process", e); } } Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/META-INF/MANIFEST.MF 2010-12-22 22:55:18 UTC (rev 514) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/META-INF/MANIFEST.MF 2010-12-23 12:25:28 UTC (rev 515) @@ -5,7 +5,6 @@ Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.savara.core.eclipse.osgi.Activator Bundle-Vendor: www.savara.org -Service-Component: OSGI-INF/eclipse-resource-loader.xml Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources, Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/core/eclipse/osgi/Activator.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/core/eclipse/osgi/Activator.java 2010-12-22 22:55:18 UTC (rev 514) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/core/eclipse/osgi/Activator.java 2010-12-23 12:25:28 UTC (rev 515) @@ -54,7 +54,13 @@ public void start(final BundleContext context) throws Exception { super.start(context); plugin = this; - + + // Initialize the protocol parser manager + ServiceReference sref=context.getServiceReference(ProtocolParserManager.class.getName()); + + ProtocolParserManager ppm=(ProtocolParserManager)context.getService(sref); + + ScribbleServices.setParserManager(ppm); } /* @@ -64,13 +70,6 @@ public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); - - // Initialize the protocol parser manager - ServiceReference sref=context.getServiceReference(ProtocolParserManager.class.getName()); - - ProtocolParserManager ppm=(ProtocolParserManager)context.getService(sref); - - ScribbleServices.setParserManager(ppm); } /**