Renamed org.*.generic.tracemodels to org.*.generic.tracemodel
The current naming of the bundle that contains the generic trace model
is not according to our naming conventions. This change renames the
bundle as well as all packages and ensures that the correct reference is
used everywhere within the project.
diff --git a/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.html b/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.html
index ce54a9e..9df4b25 100644
--- a/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.html
+++ b/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.html
@@ -360,7 +360,7 @@
<li>Implement all the methods according to your new custom metamodel. Note that information about what each method does and its parameters can be obtained by hovering the mouse over the respective method name. </li>
</ol>
<p>NOTE: To test your new Traceability metamodel and artifact model, first close the project
- <code>org.eclipse.capra.generic.tracemodels</code>. Otherwise that project will be used by Capra.
+ <code>org.eclipse.capra.generic.tracemodel</code>. Otherwise that project will be used by Capra.
</p>
<h4 id="adding-a-new-artifact-handler">Adding a new artifact handler</h4>
<p>In case you want Capra to support an artifact type that is not already supported, you will need to create a new artifact handler for the particular artifact type.</p>
diff --git a/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.textile b/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.textile
index 2d44565..df98e09 100644
--- a/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.textile
+++ b/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.textile
@@ -294,7 +294,7 @@
# Click Finish and a class will be created with the methods to be implemented in it.
# Implement all the methods according to your new custom metamodel. Note that information about what each method does and its parameters can be obtained by hovering the mouse over the respective method name.
-NOTE: To test your new Traceability metamodel and artifact model, first close the project @org.eclipse.capra.generic.tracemodels@. Otherwise that project will be used by Capra.
+NOTE: To test your new Traceability metamodel and artifact model, first close the project @org.eclipse.capra.generic.tracemodel@. Otherwise that project will be used by Capra.
h4(#adding-a-new-artifact-handler). Adding a new artifact handler
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/.classpath b/bundles/org.eclipse.capra.generic.tracemodel/.classpath
similarity index 100%
rename from bundles/org.eclipse.capra.generic.tracemodels/.classpath
rename to bundles/org.eclipse.capra.generic.tracemodel/.classpath
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/.gitignore b/bundles/org.eclipse.capra.generic.tracemodel/.gitignore
similarity index 100%
rename from bundles/org.eclipse.capra.generic.tracemodels/.gitignore
rename to bundles/org.eclipse.capra.generic.tracemodel/.gitignore
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/.project b/bundles/org.eclipse.capra.generic.tracemodel/.project
similarity index 93%
rename from bundles/org.eclipse.capra.generic.tracemodels/.project
rename to bundles/org.eclipse.capra.generic.tracemodel/.project
index 378bcd9..4eb0d68 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/.project
+++ b/bundles/org.eclipse.capra.generic.tracemodel/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.capra.generic.tracemodels</name>
+ <name>org.eclipse.capra.generic.tracemodel</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.generic.tracemodel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.capra.generic.tracemodels/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.generic.tracemodel/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.generic.tracemodel/META-INF/MANIFEST.MF
similarity index 81%
rename from bundles/org.eclipse.capra.generic.tracemodels/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.generic.tracemodel/META-INF/MANIFEST.MF
index 42f7580..ebed64f 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.generic.tracemodel/META-INF/MANIFEST.MF
@@ -1,7 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.capra.generic.tracemodels;singleton:=true
+Bundle-SymbolicName: org.eclipse.capra.generic.tracemodel;singleton:=true
+Automatic-Module-Name: org.eclipse.capra.generic.tracemodel
Bundle-Version: 0.7.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/build.properties b/bundles/org.eclipse.capra.generic.tracemodel/build.properties
similarity index 100%
rename from bundles/org.eclipse.capra.generic.tracemodels/build.properties
rename to bundles/org.eclipse.capra.generic.tracemodel/build.properties
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/model/generictrace.xcore b/bundles/org.eclipse.capra.generic.tracemodel/model/generictrace.xcore
similarity index 100%
rename from bundles/org.eclipse.capra.generic.tracemodels/model/generictrace.xcore
rename to bundles/org.eclipse.capra.generic.tracemodel/model/generictrace.xcore
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/plugin.properties b/bundles/org.eclipse.capra.generic.tracemodel/plugin.properties
similarity index 100%
rename from bundles/org.eclipse.capra.generic.tracemodels/plugin.properties
rename to bundles/org.eclipse.capra.generic.tracemodel/plugin.properties
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/plugin.xml b/bundles/org.eclipse.capra.generic.tracemodel/plugin.xml
similarity index 92%
rename from bundles/org.eclipse.capra.generic.tracemodels/plugin.xml
rename to bundles/org.eclipse.capra.generic.tracemodel/plugin.xml
index 681c2f0..36c523a 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/plugin.xml
+++ b/bundles/org.eclipse.capra.generic.tracemodel/plugin.xml
@@ -15,15 +15,12 @@
Chalmers | University of Gothenburg - additional features, updated API
-->
-<!--
--->
-
<plugin>
<extension
point="org.eclipse.capra.configuration.traceabilityMetaModel">
<TraceabilityMetaModelAdapter
- class="org.eclipse.capra.generic.tracemodels.GenericMetaModelAdapter">
+ class="org.eclipse.capra.generic.tracemodel.GenericMetaModelAdapter">
</TraceabilityMetaModelAdapter>
</extension>
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/pom.xml b/bundles/org.eclipse.capra.generic.tracemodel/pom.xml
similarity index 94%
rename from bundles/org.eclipse.capra.generic.tracemodels/pom.xml
rename to bundles/org.eclipse.capra.generic.tracemodel/pom.xml
index 0460924..069a6d0 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/pom.xml
+++ b/bundles/org.eclipse.capra.generic.tracemodel/pom.xml
@@ -21,7 +21,7 @@
<version>0.7.1-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.capra.generic.tracemodels</artifactId>
+ <artifactId>org.eclipse.capra.generic.tracemodel</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/GenericTraceModel.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/GenericTraceModel.java
similarity index 87%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/GenericTraceModel.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/GenericTraceModel.java
index d32ead2..c153900 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/GenericTraceModel.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/GenericTraceModel.java
@@ -27,10 +27,6 @@
* Returns the value of the '<em><b>Traces</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.capra.generic.tracemodel.RelatedTo}.
* <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Traces</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Traces</em>' containment reference list.
* @see org.eclipse.capra.generic.tracemodel.TracemodelPackage#getGenericTraceModel_Traces()
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/RelatedTo.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/RelatedTo.java
similarity index 80%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/RelatedTo.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/RelatedTo.java
index 6d512d1..65d4cb9 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/RelatedTo.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/RelatedTo.java
@@ -28,15 +28,10 @@
/**
* Returns the value of the '<em><b>ID</b></em>' attribute.
* <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>ID</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
* <!-- end-user-doc -->
* @return the value of the '<em>ID</em>' attribute.
* @see org.eclipse.capra.generic.tracemodel.TracemodelPackage#getRelatedTo_ID()
* @model unique="false" transient="true" changeable="false" volatile="true" derived="true"
- * annotation="http://www.eclipse.org/emf/2002/GenModel get='return <%org.eclipse.emf.ecore.util.EcoreUtil%>.generateUUID();'"
* @generated
*/
String getID();
@@ -44,10 +39,6 @@
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
@@ -71,10 +62,6 @@
* Returns the value of the '<em><b>Item</b></em>' reference list.
* The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
* <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Item</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Item</em>' reference list.
* @see org.eclipse.capra.generic.tracemodel.TracemodelPackage#getRelatedTo_Item()
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelFactory.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelFactory.java
similarity index 100%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelFactory.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelFactory.java
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelPackage.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelPackage.java
similarity index 98%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelPackage.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelPackage.java
index a95a5a0..eef4c10 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelPackage.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/TracemodelPackage.java
@@ -21,7 +21,6 @@
* <!-- end-user-doc -->
* @see org.eclipse.capra.generic.tracemodel.TracemodelFactory
* @model kind="package"
- * annotation="http://www.eclipse.org/emf/2002/GenModel basePackage='org.eclipse.capra.generic'"
* @generated
*/
public interface TracemodelPackage extends EPackage {
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java
similarity index 99%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java
index 1a0f155..e1ba120 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java
@@ -68,6 +68,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<RelatedTo> getTraces() {
if (traces == null) {
traces = new EObjectContainmentEList<RelatedTo>(RelatedTo.class, this, TracemodelPackage.GENERIC_TRACE_MODEL__TRACES);
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java
similarity index 97%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java
index 56a1f66..4edd117 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java
@@ -100,6 +100,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getID() {
return EcoreUtil.generateUUID();
}
@@ -109,6 +110,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getName() {
return name;
}
@@ -118,6 +120,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setName(String newName) {
String oldName = name;
name = newName;
@@ -130,6 +133,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<EObject> getItem() {
if (item == null) {
item = new EObjectResolvingEList<EObject>(EObject.class, this, TracemodelPackage.RELATED_TO__ITEM);
@@ -220,7 +224,7 @@
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (name: ");
result.append(name);
result.append(')');
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java
similarity index 98%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java
index d63f0f7..cd4d5a0 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java
@@ -68,6 +68,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public GenericTraceModel createGenericTraceModel() {
GenericTraceModelImpl genericTraceModel = new GenericTraceModelImpl();
return genericTraceModel;
@@ -78,6 +79,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public RelatedTo createRelatedTo() {
RelatedToImpl relatedTo = new RelatedToImpl();
return relatedTo;
@@ -88,6 +90,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public TracemodelPackage getTracemodelPackage() {
return (TracemodelPackage)getEPackage();
}
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java
similarity index 95%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java
index 6ab9736..fb8c61f 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java
@@ -64,7 +64,7 @@
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link TracemodelPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -78,7 +78,8 @@
if (isInited) return (TracemodelPackage)EPackage.Registry.INSTANCE.getEPackage(TracemodelPackage.eNS_URI);
// Obtain or create and register package
- TracemodelPackageImpl theTracemodelPackage = (TracemodelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TracemodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TracemodelPackageImpl());
+ Object registeredTracemodelPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+ TracemodelPackageImpl theTracemodelPackage = registeredTracemodelPackage instanceof TracemodelPackageImpl ? (TracemodelPackageImpl)registeredTracemodelPackage : new TracemodelPackageImpl();
isInited = true;
@@ -94,7 +95,6 @@
// Mark meta-data to indicate it can't be changed
theTracemodelPackage.freeze();
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(TracemodelPackage.eNS_URI, theTracemodelPackage);
return theTracemodelPackage;
@@ -105,6 +105,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getGenericTraceModel() {
return genericTraceModelEClass;
}
@@ -114,6 +115,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getGenericTraceModel_Traces() {
return (EReference)genericTraceModelEClass.getEStructuralFeatures().get(0);
}
@@ -123,6 +125,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getRelatedTo() {
return relatedToEClass;
}
@@ -132,6 +135,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getRelatedTo_ID() {
return (EAttribute)relatedToEClass.getEStructuralFeatures().get(0);
}
@@ -141,6 +145,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getRelatedTo_Name() {
return (EAttribute)relatedToEClass.getEStructuralFeatures().get(1);
}
@@ -150,6 +155,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getRelatedTo_Item() {
return (EReference)relatedToEClass.getEStructuralFeatures().get(2);
}
@@ -159,6 +165,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public TracemodelFactory getTracemodelFactory() {
return (TracemodelFactory)getEFactoryInstance();
}
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/util/TracemodelAdapterFactory.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/util/TracemodelAdapterFactory.java
similarity index 100%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/util/TracemodelAdapterFactory.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/util/TracemodelAdapterFactory.java
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/util/TracemodelSwitch.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/util/TracemodelSwitch.java
similarity index 100%
rename from bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/generic/tracemodel/util/TracemodelSwitch.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/util/TracemodelSwitch.java
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java b/bundles/org.eclipse.capra.generic.tracemodel/src/org/eclipse/capra/generic/tracemodel/GenericMetaModelAdapter.java
similarity index 99%
rename from bundles/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
rename to bundles/org.eclipse.capra.generic.tracemodel/src/org/eclipse/capra/generic/tracemodel/GenericMetaModelAdapter.java
index ef20f50..65caa7c 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src/org/eclipse/capra/generic/tracemodel/GenericMetaModelAdapter.java
@@ -11,7 +11,7 @@
* Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
* Chalmers | University of Gothenburg - additional features, updated API
*******************************************************************************/
-package org.eclipse.capra.generic.tracemodels;
+package org.eclipse.capra.generic.tracemodel;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/features/org.eclipse.capra.generic.feature/feature.xml b/features/org.eclipse.capra.generic.feature/feature.xml
index 16b02a8..13420c8 100644
--- a/features/org.eclipse.capra.generic.feature/feature.xml
+++ b/features/org.eclipse.capra.generic.feature/feature.xml
@@ -32,7 +32,7 @@
unpack="false"/>
<plugin
- id="org.eclipse.capra.generic.tracemodels"
+ id="org.eclipse.capra.generic.tracemodel"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/pom.xml b/pom.xml
index 4689ba7..ab8bfcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<module>bundles/org.eclipse.capra.documentation</module>
<module>bundles/org.eclipse.capra.generic.persistence</module>
<module>bundles/org.eclipse.capra.generic.priority</module>
- <module>bundles/org.eclipse.capra.generic.tracemodels</module>
+ <module>bundles/org.eclipse.capra.generic.tracemodel</module>
<module>bundles/org.eclipse.capra.generic.artifactmodel</module>
<module>bundles/org.eclipse.capra.handler.cdt</module>
<module>bundles/org.eclipse.capra.handler.emf</module>
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
index 83ce345..c337bf6 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@
org.junit,
org.eclipse.cdt.managedbuilder.core,
org.eclipse.cdt.core,
- org.eclipse.capra.generic.tracemodels,
+ org.eclipse.capra.generic.tracemodel,
org.eclipse.capra.generic.persistence,
org.eclipse.capra.generic.artifactmodel,
org.eclipse.cdt.managedbuilder.gnu.ui
+Export-Package: org.eclipse.capra.handler.cdt;x-internal:=true
diff --git a/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF
index 4ccb2bc..215b59d 100644
--- a/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-Version: 0.7.1.qualifier
Require-Bundle:
org.eclipse.capra.core,
- org.eclipse.capra.generic.tracemodels,
+ org.eclipse.capra.generic.tracemodel,
org.eclipse.capra.handler.featureide,
org.eclipse.capra.ui,
org.eclipse.capra.testsuite,
@@ -15,5 +15,7 @@
org.eclipse.core.runtime,
org.eclipse.ui,
de.ovgu.featureide.fm.core,
- org.junit
+ org.junit,
+ ch.qos.logback.slf4j;resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.capra.handler.featureide.tests;x-internal:=true
diff --git a/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
index 4c533c8..edce9ee 100644
--- a/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
@@ -12,5 +12,6 @@
org.eclipse.jdt.launching,
org.eclipse.jdt.core,
org.eclipse.capra.generic.persistence,
- org.eclipse.capra.generic.tracemodels,
+ org.eclipse.capra.generic.tracemodel,
org.eclipse.capra.generic.artifactmodel
+Export-Package: org.eclipse.capra.handler.jdt;x-internal:=true
diff --git a/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF
index 018f3f7..9a902df 100644
--- a/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-Version: 0.7.1.qualifier
Require-Bundle:
org.eclipse.capra.core,
- org.eclipse.capra.generic.tracemodels,
+ org.eclipse.capra.generic.tracemodel,
org.eclipse.capra.handler.uml,
org.eclipse.capra.ui,
org.eclipse.capra.ui.plantuml,
@@ -16,5 +16,7 @@
org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.uml2.uml,
- org.junit
+ org.junit,
+ ch.qos.logback.slf4j;resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.capra.handler.uml.tests;x-internal:=true
diff --git a/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
index 25026ea..6151aeb 100644
--- a/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
@@ -5,7 +5,9 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.capra.testsuite;singleton:=true
Bundle-Version: 0.7.1.qualifier
-Export-Package: org.eclipse.capra.testsuite
+Export-Package: org.eclipse.capra.testsuite,
+ org.eclipse.capra.testsuite.extension;x-internal:=true,
+ org.eclipse.capra.testsuite.notification;x-internal:=true
Require-Bundle: org.junit,
org.eclipse.equinox.registry,
org.eclipse.core.resources,
@@ -25,7 +27,7 @@
org.eclipse.osgi,
org.eclipse.swt,
org.eclipse.capra.generic.artifactmodel,
- org.eclipse.capra.generic.tracemodels,
+ org.eclipse.capra.generic.tracemodel,
org.eclipse.capra.generic.priority,
org.eclipse.capra.core,
org.eclipse.capra.ui.plantuml,
@@ -37,8 +39,7 @@
org.eclipse.capra.handler.file,
org.eclipse.capra.ui,
org.eclipse.capra.ui.notification,
- ch.qos.logback.classic,
- ch.qos.logback.core
+ ch.qos.logback.slf4j;resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.eclipse.swt.dnd,
org.slf4j
