#149 Fix CDO code generation customization for CDO XML TA

eclipse-capella · Jan 6, 2022 · a360a93 · a360a93
1 parent 2053064
commit a360a93
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/vpdsl/plugins/org.polarsys.capella.cdo.ta.definition/META-INF/MANIFEST.MF b/vpdsl/plugins/org.polarsys.capella.cdo.ta.definition/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Export-Package: org.polarsys.capella.cdo.ta.definition
diff --git a/vpdsl/plugins/org.polarsys.capella.cdoxml.ta/META-INF/MANIFEST.MF b/vpdsl/plugins/org.polarsys.capella.cdoxml.ta/META-INF/MANIFEST.MF
@@ -15,7 +15,9 @@ Require-Bundle: org.eclipse.ui,
  org.polarsys.kitalpha.ad.viewpoint.dsl.generation.core,
  org.polarsys.kitalpha.ad.viewpoint.dsl.as.desc.model,
  org.polarsys.kitalpha.ad.viewpoint.dsl.as.ui.model,
- org.polarsys.capella.cdoxml.ta.genchain
+ org.polarsys.capella.cdoxml.ta.genchain,
+ org.polarsys.capella.extension.genchain,
+ org.polarsys.capella.cdo.ta.definition
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.polarsys.capella.cdoxml.ta
 Bundle-ActivationPolicy: lazy

diff --git a/...pella.cdoxml.ta/src/org/polarsys/capella/cdoxml/ta/CapellaCDOandXMLTargetApplication.java b/...pella.cdoxml.ta/src/org/polarsys/capella/cdoxml/ta/CapellaCDOandXMLTargetApplication.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Thales Global Services.
+ * Copyright (c) 2021, 2022 Thales Global Services.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0
@@ -11,19 +11,17 @@
  *******************************************************************************/
 package org.polarsys.capella.cdoxml.ta;
 
+import org.polarsys.capella.cdo.ta.definition.CDOForCapellaTargetApplication;
 import org.polarsys.capella.cdoxml.ta.genchain.CapellaConnectorExtension;
-import org.polarsys.capella.ta.definition.CapellaTargetApplication;
 
 import java.util.List;
 import org.eclipse.egf.portfolio.genchain.extension.ExtensionHelper;
-import org.eclipse.egf.portfolio.genchain.cdo.CdoGenerationExtension;
 
-public class CapellaCDOandXMLTargetApplication extends CapellaTargetApplication  {
+public class CapellaCDOandXMLTargetApplication extends CDOForCapellaTargetApplication  {
 
 	@Override
 	public List<ExtensionHelper> getGenerationExtensionHelpers() {
 		List<ExtensionHelper> generationExtensionHelpers = super.getGenerationExtensionHelpers();
-		generationExtensionHelpers.add(new CdoGenerationExtension());
 		generationExtensionHelpers.add(new CapellaConnectorExtension());
 		return generationExtensionHelpers;
 	}