Moved projects into subfolders
In order to keep the overview over the different projects
Eclipse Capra consists of and to conform to PDE best practices,
they are now separated into bundles/, features/, tests/, and
releng/ folders, following PDE best practices.
Change-Id: Ia9cc611eb4bed2b1ed55a8fcf87fb61900b6f090
diff --git a/org.eclipse.capra.core/.classpath b/bundles/org.eclipse.capra.core/.classpath
similarity index 100%
rename from org.eclipse.capra.core/.classpath
rename to bundles/org.eclipse.capra.core/.classpath
diff --git a/org.eclipse.capra.core/.gitignore b/bundles/org.eclipse.capra.core/.gitignore
similarity index 100%
rename from org.eclipse.capra.core/.gitignore
rename to bundles/org.eclipse.capra.core/.gitignore
diff --git a/org.eclipse.capra.core/.project b/bundles/org.eclipse.capra.core/.project
similarity index 100%
rename from org.eclipse.capra.core/.project
rename to bundles/org.eclipse.capra.core/.project
diff --git a/org.eclipse.capra.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.core/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.core/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.core/build.properties b/bundles/org.eclipse.capra.core/build.properties
similarity index 100%
rename from org.eclipse.capra.core/build.properties
rename to bundles/org.eclipse.capra.core/build.properties
diff --git a/org.eclipse.capra.core/plugin.xml b/bundles/org.eclipse.capra.core/plugin.xml
similarity index 100%
rename from org.eclipse.capra.core/plugin.xml
rename to bundles/org.eclipse.capra.core/plugin.xml
diff --git a/org.eclipse.capra.core/pom.xml b/bundles/org.eclipse.capra.core/pom.xml
similarity index 95%
rename from org.eclipse.capra.core/pom.xml
rename to bundles/org.eclipse.capra.core/pom.xml
index 484f228..d72efbf 100644
--- a/org.eclipse.capra.core/pom.xml
+++ b/bundles/org.eclipse.capra.core/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.artifactHandlers.exsd b/bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.artifactHandlers.exsd
similarity index 100%
rename from org.eclipse.capra.core/schema/org.eclipse.capra.configuration.artifactHandlers.exsd
rename to bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.artifactHandlers.exsd
diff --git a/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.artifactMetaModel.exsd b/bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.artifactMetaModel.exsd
similarity index 100%
rename from org.eclipse.capra.core/schema/org.eclipse.capra.configuration.artifactMetaModel.exsd
rename to bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.artifactMetaModel.exsd
diff --git a/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.persistenceHandler.exsd b/bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.persistenceHandler.exsd
similarity index 100%
rename from org.eclipse.capra.core/schema/org.eclipse.capra.configuration.persistenceHandler.exsd
rename to bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.persistenceHandler.exsd
diff --git a/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.priorityHandlers.exsd b/bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.priorityHandlers.exsd
similarity index 100%
rename from org.eclipse.capra.core/schema/org.eclipse.capra.configuration.priorityHandlers.exsd
rename to bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.priorityHandlers.exsd
diff --git a/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.traceabilityMetaModel.exsd b/bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.traceabilityMetaModel.exsd
similarity index 100%
rename from org.eclipse.capra.core/schema/org.eclipse.capra.configuration.traceabilityMetaModel.exsd
rename to bundles/org.eclipse.capra.core/schema/org.eclipse.capra.configuration.traceabilityMetaModel.exsd
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractArtifactMetaModelAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractArtifactMetaModelAdapter.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractArtifactMetaModelAdapter.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractArtifactMetaModelAdapter.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractMetaModelAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractMetaModelAdapter.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractMetaModelAdapter.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractMetaModelAdapter.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/ArtifactMetaModelAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/ArtifactMetaModelAdapter.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/ArtifactMetaModelAdapter.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/ArtifactMetaModelAdapter.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/Connection.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/Connection.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/Connection.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/Connection.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TracePersistenceAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TracePersistenceAdapter.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TracePersistenceAdapter.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TracePersistenceAdapter.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AbstractArtifactHandler.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AbstractArtifactHandler.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AbstractArtifactHandler.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AbstractArtifactHandler.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AnnotationException.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AnnotationException.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AnnotationException.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AnnotationException.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IAnnotateArtifact.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IAnnotateArtifact.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IAnnotateArtifact.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IAnnotateArtifact.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactHandler.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactHandler.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactHandler.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactHandler.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactUnpacker.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactUnpacker.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactUnpacker.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactUnpacker.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/PriorityHandler.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/PriorityHandler.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/PriorityHandler.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/PriorityHandler.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ArtifactHelper.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ArtifactHelper.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ArtifactHelper.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ArtifactHelper.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/EMFHelper.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/EMFHelper.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/EMFHelper.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/EMFHelper.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ExtensionPointHelper.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ExtensionPointHelper.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ExtensionPointHelper.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ExtensionPointHelper.java
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/TraceHelper.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/TraceHelper.java
similarity index 100%
rename from org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/TraceHelper.java
rename to bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/TraceHelper.java
diff --git a/org.eclipse.capra.documentation/.classpath b/bundles/org.eclipse.capra.documentation/.classpath
similarity index 100%
rename from org.eclipse.capra.documentation/.classpath
rename to bundles/org.eclipse.capra.documentation/.classpath
diff --git a/org.eclipse.capra.documentation/.project b/bundles/org.eclipse.capra.documentation/.project
similarity index 100%
rename from org.eclipse.capra.documentation/.project
rename to bundles/org.eclipse.capra.documentation/.project
diff --git a/org.eclipse.capra.documentation/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.documentation/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.documentation/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.documentation/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.documentation/build.properties b/bundles/org.eclipse.capra.documentation/build.properties
similarity index 100%
rename from org.eclipse.capra.documentation/build.properties
rename to bundles/org.eclipse.capra.documentation/build.properties
diff --git a/org.eclipse.capra.documentation/docu/capraDocumentation-toc.xml b/bundles/org.eclipse.capra.documentation/docu/capraDocumentation-toc.xml
similarity index 100%
rename from org.eclipse.capra.documentation/docu/capraDocumentation-toc.xml
rename to bundles/org.eclipse.capra.documentation/docu/capraDocumentation-toc.xml
diff --git a/org.eclipse.capra.documentation/docu/capraDocumentation.html b/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.html
similarity index 100%
rename from org.eclipse.capra.documentation/docu/capraDocumentation.html
rename to bundles/org.eclipse.capra.documentation/docu/capraDocumentation.html
diff --git a/org.eclipse.capra.documentation/docu/capraDocumentation.textile b/bundles/org.eclipse.capra.documentation/docu/capraDocumentation.textile
similarity index 100%
rename from org.eclipse.capra.documentation/docu/capraDocumentation.textile
rename to bundles/org.eclipse.capra.documentation/docu/capraDocumentation.textile
diff --git a/org.eclipse.capra.documentation/images/Capra Documentation.md b/bundles/org.eclipse.capra.documentation/images/Capra Documentation.md
similarity index 100%
rename from org.eclipse.capra.documentation/images/Capra Documentation.md
rename to bundles/org.eclipse.capra.documentation/images/Capra Documentation.md
diff --git a/org.eclipse.capra.documentation/images/CapraArchitecture.png b/bundles/org.eclipse.capra.documentation/images/CapraArchitecture.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/CapraArchitecture.png
rename to bundles/org.eclipse.capra.documentation/images/CapraArchitecture.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/addNewTraceAdapterClass.png b/bundles/org.eclipse.capra.documentation/images/addNewTraceAdapterClass.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/addNewTraceAdapterClass.png
rename to bundles/org.eclipse.capra.documentation/images/addNewTraceAdapterClass.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/addPersistenceHandler.png b/bundles/org.eclipse.capra.documentation/images/addPersistenceHandler.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/addPersistenceHandler.png
rename to bundles/org.eclipse.capra.documentation/images/addPersistenceHandler.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/addTraceExtension.pdf b/bundles/org.eclipse.capra.documentation/images/addTraceExtension.pdf
similarity index 100%
rename from org.eclipse.capra.documentation/images/addTraceExtension.pdf
rename to bundles/org.eclipse.capra.documentation/images/addTraceExtension.pdf
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/addTraceExtension.png b/bundles/org.eclipse.capra.documentation/images/addTraceExtension.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/addTraceExtension.png
rename to bundles/org.eclipse.capra.documentation/images/addTraceExtension.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/artifactMetamodelDefinition.png b/bundles/org.eclipse.capra.documentation/images/artifactMetamodelDefinition.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/artifactMetamodelDefinition.png
rename to bundles/org.eclipse.capra.documentation/images/artifactMetamodelDefinition.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/createTrace.png b/bundles/org.eclipse.capra.documentation/images/createTrace.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/createTrace.png
rename to bundles/org.eclipse.capra.documentation/images/createTrace.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/editPersistenceHandler.png b/bundles/org.eclipse.capra.documentation/images/editPersistenceHandler.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/editPersistenceHandler.png
rename to bundles/org.eclipse.capra.documentation/images/editPersistenceHandler.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/graphical-view-transitive.pdf b/bundles/org.eclipse.capra.documentation/images/graphical-view-transitive.pdf
similarity index 100%
rename from org.eclipse.capra.documentation/images/graphical-view-transitive.pdf
rename to bundles/org.eclipse.capra.documentation/images/graphical-view-transitive.pdf
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/graphical-view-transitive.png b/bundles/org.eclipse.capra.documentation/images/graphical-view-transitive.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/graphical-view-transitive.png
rename to bundles/org.eclipse.capra.documentation/images/graphical-view-transitive.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/hvacProjects.png b/bundles/org.eclipse.capra.documentation/images/hvacProjects.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/hvacProjects.png
rename to bundles/org.eclipse.capra.documentation/images/hvacProjects.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/interface.png b/bundles/org.eclipse.capra.documentation/images/interface.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/interface.png
rename to bundles/org.eclipse.capra.documentation/images/interface.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/matrixView.png b/bundles/org.eclipse.capra.documentation/images/matrixView.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/matrixView.png
rename to bundles/org.eclipse.capra.documentation/images/matrixView.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/matrixViewMany.png b/bundles/org.eclipse.capra.documentation/images/matrixViewMany.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/matrixViewMany.png
rename to bundles/org.eclipse.capra.documentation/images/matrixViewMany.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newArtifactAdapter.pdf b/bundles/org.eclipse.capra.documentation/images/newArtifactAdapter.pdf
similarity index 100%
rename from org.eclipse.capra.documentation/images/newArtifactAdapter.pdf
rename to bundles/org.eclipse.capra.documentation/images/newArtifactAdapter.pdf
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newArtifactAdapter.png b/bundles/org.eclipse.capra.documentation/images/newArtifactAdapter.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/newArtifactAdapter.png
rename to bundles/org.eclipse.capra.documentation/images/newArtifactAdapter.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newArtifactAdapterClass.png b/bundles/org.eclipse.capra.documentation/images/newArtifactAdapterClass.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/newArtifactAdapterClass.png
rename to bundles/org.eclipse.capra.documentation/images/newArtifactAdapterClass.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newArtifactClass.png b/bundles/org.eclipse.capra.documentation/images/newArtifactClass.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/newArtifactClass.png
rename to bundles/org.eclipse.capra.documentation/images/newArtifactClass.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newArtifactHandler.png b/bundles/org.eclipse.capra.documentation/images/newArtifactHandler.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/newArtifactHandler.png
rename to bundles/org.eclipse.capra.documentation/images/newArtifactHandler.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newClass.pdf b/bundles/org.eclipse.capra.documentation/images/newClass.pdf
similarity index 100%
rename from org.eclipse.capra.documentation/images/newClass.pdf
rename to bundles/org.eclipse.capra.documentation/images/newClass.pdf
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newClass.png b/bundles/org.eclipse.capra.documentation/images/newClass.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/newClass.png
rename to bundles/org.eclipse.capra.documentation/images/newClass.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newPersistenceHandler.png b/bundles/org.eclipse.capra.documentation/images/newPersistenceHandler.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/newPersistenceHandler.png
rename to bundles/org.eclipse.capra.documentation/images/newPersistenceHandler.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newPersistenceHandlerClass.png b/bundles/org.eclipse.capra.documentation/images/newPersistenceHandlerClass.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/newPersistenceHandlerClass.png
rename to bundles/org.eclipse.capra.documentation/images/newPersistenceHandlerClass.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newTMAdapter.pdf b/bundles/org.eclipse.capra.documentation/images/newTMAdapter.pdf
similarity index 100%
rename from org.eclipse.capra.documentation/images/newTMAdapter.pdf
rename to bundles/org.eclipse.capra.documentation/images/newTMAdapter.pdf
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/newTMAdapter.png b/bundles/org.eclipse.capra.documentation/images/newTMAdapter.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/newTMAdapter.png
rename to bundles/org.eclipse.capra.documentation/images/newTMAdapter.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/priorityHandlerCode.png b/bundles/org.eclipse.capra.documentation/images/priorityHandlerCode.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/priorityHandlerCode.png
rename to bundles/org.eclipse.capra.documentation/images/priorityHandlerCode.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/problemView.png b/bundles/org.eclipse.capra.documentation/images/problemView.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/problemView.png
rename to bundles/org.eclipse.capra.documentation/images/problemView.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/quickFix.png b/bundles/org.eclipse.capra.documentation/images/quickFix.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/quickFix.png
rename to bundles/org.eclipse.capra.documentation/images/quickFix.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/relatedTo.png b/bundles/org.eclipse.capra.documentation/images/relatedTo.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/relatedTo.png
rename to bundles/org.eclipse.capra.documentation/images/relatedTo.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/selectionView1.png b/bundles/org.eclipse.capra.documentation/images/selectionView1.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/selectionView1.png
rename to bundles/org.eclipse.capra.documentation/images/selectionView1.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/toggleTransitivity.pdf b/bundles/org.eclipse.capra.documentation/images/toggleTransitivity.pdf
similarity index 100%
rename from org.eclipse.capra.documentation/images/toggleTransitivity.pdf
rename to bundles/org.eclipse.capra.documentation/images/toggleTransitivity.pdf
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/toggleTransitivity.png b/bundles/org.eclipse.capra.documentation/images/toggleTransitivity.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/toggleTransitivity.png
rename to bundles/org.eclipse.capra.documentation/images/toggleTransitivity.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/traceLink.png b/bundles/org.eclipse.capra.documentation/images/traceLink.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/traceLink.png
rename to bundles/org.eclipse.capra.documentation/images/traceLink.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/traceMetamodelDefinition.pdf b/bundles/org.eclipse.capra.documentation/images/traceMetamodelDefinition.pdf
similarity index 100%
rename from org.eclipse.capra.documentation/images/traceMetamodelDefinition.pdf
rename to bundles/org.eclipse.capra.documentation/images/traceMetamodelDefinition.pdf
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/traceMetamodelDefinition.png b/bundles/org.eclipse.capra.documentation/images/traceMetamodelDefinition.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/traceMetamodelDefinition.png
rename to bundles/org.eclipse.capra.documentation/images/traceMetamodelDefinition.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/updatesite.pdf b/bundles/org.eclipse.capra.documentation/images/updatesite.pdf
similarity index 100%
rename from org.eclipse.capra.documentation/images/updatesite.pdf
rename to bundles/org.eclipse.capra.documentation/images/updatesite.pdf
Binary files differ
diff --git a/org.eclipse.capra.documentation/images/updatesite.png b/bundles/org.eclipse.capra.documentation/images/updatesite.png
similarity index 100%
rename from org.eclipse.capra.documentation/images/updatesite.png
rename to bundles/org.eclipse.capra.documentation/images/updatesite.png
Binary files differ
diff --git a/org.eclipse.capra.documentation/mainTOC.xml b/bundles/org.eclipse.capra.documentation/mainTOC.xml
similarity index 100%
rename from org.eclipse.capra.documentation/mainTOC.xml
rename to bundles/org.eclipse.capra.documentation/mainTOC.xml
diff --git a/org.eclipse.capra.documentation/plugin.xml b/bundles/org.eclipse.capra.documentation/plugin.xml
similarity index 100%
rename from org.eclipse.capra.documentation/plugin.xml
rename to bundles/org.eclipse.capra.documentation/plugin.xml
diff --git a/org.eclipse.capra.documentation/pom.xml b/bundles/org.eclipse.capra.documentation/pom.xml
similarity index 95%
rename from org.eclipse.capra.documentation/pom.xml
rename to bundles/org.eclipse.capra.documentation/pom.xml
index b61d13f..02492d2 100644
--- a/org.eclipse.capra.documentation/pom.xml
+++ b/bundles/org.eclipse.capra.documentation/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.generic.artifactmodel/.classpath b/bundles/org.eclipse.capra.generic.artifactmodel/.classpath
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/.classpath
rename to bundles/org.eclipse.capra.generic.artifactmodel/.classpath
diff --git a/org.eclipse.capra.generic.artifactmodel/.project b/bundles/org.eclipse.capra.generic.artifactmodel/.project
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/.project
rename to bundles/org.eclipse.capra.generic.artifactmodel/.project
diff --git a/org.eclipse.capra.generic.artifactmodel/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.generic.artifactmodel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.generic.artifactmodel/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.generic.artifactmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.generic.artifactmodel/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.generic.artifactmodel/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.generic.artifactmodel/build.properties b/bundles/org.eclipse.capra.generic.artifactmodel/build.properties
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/build.properties
rename to bundles/org.eclipse.capra.generic.artifactmodel/build.properties
diff --git a/org.eclipse.capra.generic.artifactmodel/model/artifact.xcore b/bundles/org.eclipse.capra.generic.artifactmodel/model/artifact.xcore
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/model/artifact.xcore
rename to bundles/org.eclipse.capra.generic.artifactmodel/model/artifact.xcore
diff --git a/org.eclipse.capra.generic.artifactmodel/plugin.properties b/bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/plugin.properties
rename to bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties
diff --git a/org.eclipse.capra.generic.artifactmodel/plugin.xml b/bundles/org.eclipse.capra.generic.artifactmodel/plugin.xml
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/plugin.xml
rename to bundles/org.eclipse.capra.generic.artifactmodel/plugin.xml
diff --git a/org.eclipse.capra.generic.artifactmodel/pom.xml b/bundles/org.eclipse.capra.generic.artifactmodel/pom.xml
similarity index 95%
rename from org.eclipse.capra.generic.artifactmodel/pom.xml
rename to bundles/org.eclipse.capra.generic.artifactmodel/pom.xml
index 4860501..7f92f5b 100644
--- a/org.eclipse.capra.generic.artifactmodel/pom.xml
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapper.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapper.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapper.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapper.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapperContainer.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapperContainer.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapperContainer.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapperContainer.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelFactory.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelFactory.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelFactory.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelFactory.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelPackage.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelPackage.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelPackage.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelPackage.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperContainerImpl.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperContainerImpl.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperContainerImpl.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperContainerImpl.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperImpl.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperImpl.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperImpl.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperImpl.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelFactoryImpl.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelFactoryImpl.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelFactoryImpl.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelFactoryImpl.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelPackageImpl.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelPackageImpl.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelPackageImpl.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelPackageImpl.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/util/ArtifactmodelAdapterFactory.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/util/ArtifactmodelAdapterFactory.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/util/ArtifactmodelAdapterFactory.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/util/ArtifactmodelAdapterFactory.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/util/ArtifactmodelSwitch.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/util/ArtifactmodelSwitch.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/util/ArtifactmodelSwitch.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/util/ArtifactmodelSwitch.java
diff --git a/org.eclipse.capra.generic.artifactmodel/src/org/eclipse/capra/generic/artifactmodel/GenericArtifactMetaModelAdapter.java b/bundles/org.eclipse.capra.generic.artifactmodel/src/org/eclipse/capra/generic/artifactmodel/GenericArtifactMetaModelAdapter.java
similarity index 100%
rename from org.eclipse.capra.generic.artifactmodel/src/org/eclipse/capra/generic/artifactmodel/GenericArtifactMetaModelAdapter.java
rename to bundles/org.eclipse.capra.generic.artifactmodel/src/org/eclipse/capra/generic/artifactmodel/GenericArtifactMetaModelAdapter.java
diff --git a/org.eclipse.capra.generic.persistence/.classpath b/bundles/org.eclipse.capra.generic.persistence/.classpath
similarity index 100%
rename from org.eclipse.capra.generic.persistence/.classpath
rename to bundles/org.eclipse.capra.generic.persistence/.classpath
diff --git a/org.eclipse.capra.generic.persistence/.gitignore b/bundles/org.eclipse.capra.generic.persistence/.gitignore
similarity index 100%
rename from org.eclipse.capra.generic.persistence/.gitignore
rename to bundles/org.eclipse.capra.generic.persistence/.gitignore
diff --git a/org.eclipse.capra.generic.persistence/.project b/bundles/org.eclipse.capra.generic.persistence/.project
similarity index 100%
rename from org.eclipse.capra.generic.persistence/.project
rename to bundles/org.eclipse.capra.generic.persistence/.project
diff --git a/org.eclipse.capra.generic.persistence/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.generic.persistence/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.generic.persistence/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.generic.persistence/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.generic.persistence/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.generic.persistence/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.generic.persistence/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.generic.persistence/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.generic.persistence/build.properties b/bundles/org.eclipse.capra.generic.persistence/build.properties
similarity index 100%
rename from org.eclipse.capra.generic.persistence/build.properties
rename to bundles/org.eclipse.capra.generic.persistence/build.properties
diff --git a/org.eclipse.capra.generic.persistence/plugin.xml b/bundles/org.eclipse.capra.generic.persistence/plugin.xml
similarity index 100%
rename from org.eclipse.capra.generic.persistence/plugin.xml
rename to bundles/org.eclipse.capra.generic.persistence/plugin.xml
diff --git a/org.eclipse.capra.generic.persistence/pom.xml b/bundles/org.eclipse.capra.generic.persistence/pom.xml
similarity index 95%
rename from org.eclipse.capra.generic.persistence/pom.xml
rename to bundles/org.eclipse.capra.generic.persistence/pom.xml
index ea548e2..06decab 100644
--- a/org.eclipse.capra.generic.persistence/pom.xml
+++ b/bundles/org.eclipse.capra.generic.persistence/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.generic.persistence/src/org/eclipse/capra/generic/persistance/TracePersistenceAdapter.java b/bundles/org.eclipse.capra.generic.persistence/src/org/eclipse/capra/generic/persistance/TracePersistenceAdapter.java
similarity index 100%
rename from org.eclipse.capra.generic.persistence/src/org/eclipse/capra/generic/persistance/TracePersistenceAdapter.java
rename to bundles/org.eclipse.capra.generic.persistence/src/org/eclipse/capra/generic/persistance/TracePersistenceAdapter.java
diff --git a/org.eclipse.capra.generic.priority/.classpath b/bundles/org.eclipse.capra.generic.priority/.classpath
similarity index 100%
rename from org.eclipse.capra.generic.priority/.classpath
rename to bundles/org.eclipse.capra.generic.priority/.classpath
diff --git a/org.eclipse.capra.generic.priority/.gitignore b/bundles/org.eclipse.capra.generic.priority/.gitignore
similarity index 100%
rename from org.eclipse.capra.generic.priority/.gitignore
rename to bundles/org.eclipse.capra.generic.priority/.gitignore
diff --git a/org.eclipse.capra.generic.priority/.project b/bundles/org.eclipse.capra.generic.priority/.project
similarity index 100%
rename from org.eclipse.capra.generic.priority/.project
rename to bundles/org.eclipse.capra.generic.priority/.project
diff --git a/org.eclipse.capra.generic.priority/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.generic.priority/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.generic.priority/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.generic.priority/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.generic.priority/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.generic.priority/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.generic.priority/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.generic.priority/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.generic.priority/build.properties b/bundles/org.eclipse.capra.generic.priority/build.properties
similarity index 100%
rename from org.eclipse.capra.generic.priority/build.properties
rename to bundles/org.eclipse.capra.generic.priority/build.properties
diff --git a/org.eclipse.capra.generic.priority/plugin.xml b/bundles/org.eclipse.capra.generic.priority/plugin.xml
similarity index 100%
rename from org.eclipse.capra.generic.priority/plugin.xml
rename to bundles/org.eclipse.capra.generic.priority/plugin.xml
diff --git a/org.eclipse.capra.generic.priority/pom.xml b/bundles/org.eclipse.capra.generic.priority/pom.xml
similarity index 95%
rename from org.eclipse.capra.generic.priority/pom.xml
rename to bundles/org.eclipse.capra.generic.priority/pom.xml
index 6af487b..efcdb2b 100644
--- a/org.eclipse.capra.generic.priority/pom.xml
+++ b/bundles/org.eclipse.capra.generic.priority/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.generic.priority/src/org/eclipse/capra/generic/priority/DefaultPriorityHandler.java b/bundles/org.eclipse.capra.generic.priority/src/org/eclipse/capra/generic/priority/DefaultPriorityHandler.java
similarity index 100%
rename from org.eclipse.capra.generic.priority/src/org/eclipse/capra/generic/priority/DefaultPriorityHandler.java
rename to bundles/org.eclipse.capra.generic.priority/src/org/eclipse/capra/generic/priority/DefaultPriorityHandler.java
diff --git a/org.eclipse.capra.generic.tracemodels/.classpath b/bundles/org.eclipse.capra.generic.tracemodels/.classpath
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/.classpath
rename to bundles/org.eclipse.capra.generic.tracemodels/.classpath
diff --git a/org.eclipse.capra.generic.tracemodels/.gitignore b/bundles/org.eclipse.capra.generic.tracemodels/.gitignore
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/.gitignore
rename to bundles/org.eclipse.capra.generic.tracemodels/.gitignore
diff --git a/org.eclipse.capra.generic.tracemodels/.project b/bundles/org.eclipse.capra.generic.tracemodels/.project
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/.project
rename to bundles/org.eclipse.capra.generic.tracemodels/.project
diff --git a/org.eclipse.capra.generic.tracemodels/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.generic.tracemodels/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.generic.tracemodels/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.generic.tracemodels/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.generic.tracemodels/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.generic.tracemodels/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.generic.tracemodels/build.properties b/bundles/org.eclipse.capra.generic.tracemodels/build.properties
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/build.properties
rename to bundles/org.eclipse.capra.generic.tracemodels/build.properties
diff --git a/org.eclipse.capra.generic.tracemodels/model/generictrace.xcore b/bundles/org.eclipse.capra.generic.tracemodels/model/generictrace.xcore
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/model/generictrace.xcore
rename to bundles/org.eclipse.capra.generic.tracemodels/model/generictrace.xcore
diff --git a/org.eclipse.capra.generic.tracemodels/plugin.properties b/bundles/org.eclipse.capra.generic.tracemodels/plugin.properties
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/plugin.properties
rename to bundles/org.eclipse.capra.generic.tracemodels/plugin.properties
diff --git a/org.eclipse.capra.generic.tracemodels/plugin.xml b/bundles/org.eclipse.capra.generic.tracemodels/plugin.xml
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/plugin.xml
rename to bundles/org.eclipse.capra.generic.tracemodels/plugin.xml
diff --git a/org.eclipse.capra.generic.tracemodels/pom.xml b/bundles/org.eclipse.capra.generic.tracemodels/pom.xml
similarity index 95%
rename from org.eclipse.capra.generic.tracemodels/pom.xml
rename to bundles/org.eclipse.capra.generic.tracemodels/pom.xml
index e9994ca..8cfbba2 100644
--- a/org.eclipse.capra.generic.tracemodels/pom.xml
+++ b/bundles/org.eclipse.capra.generic.tracemodels/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceMetaModelFactory.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceMetaModelFactory.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceMetaModelFactory.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceMetaModelFactory.java
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceMetaModelPackage.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceMetaModelPackage.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceMetaModelPackage.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceMetaModelPackage.java
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceModel.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceModel.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceModel.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/GenericTraceModel.java
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/RelatedTo.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/RelatedTo.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/RelatedTo.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/RelatedTo.java
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceMetaModelFactoryImpl.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceMetaModelFactoryImpl.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceMetaModelFactoryImpl.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceMetaModelFactoryImpl.java
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceMetaModelPackageImpl.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceMetaModelPackageImpl.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceMetaModelPackageImpl.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceMetaModelPackageImpl.java
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceModelImpl.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceModelImpl.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceModelImpl.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/GenericTraceModelImpl.java
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/RelatedToImpl.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/RelatedToImpl.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/RelatedToImpl.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/impl/RelatedToImpl.java
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/util/GenericTraceMetaModelAdapterFactory.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/util/GenericTraceMetaModelAdapterFactory.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/util/GenericTraceMetaModelAdapterFactory.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/util/GenericTraceMetaModelAdapterFactory.java
diff --git a/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/util/GenericTraceMetaModelSwitch.java b/bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/util/GenericTraceMetaModelSwitch.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/util/GenericTraceMetaModelSwitch.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src-gen/org/eclipse/capra/GenericTraceMetaModel/util/GenericTraceMetaModelSwitch.java
diff --git a/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java b/bundles/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
similarity index 100%
rename from org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
rename to bundles/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
diff --git a/org.eclipse.capra.handler.cdt/.classpath b/bundles/org.eclipse.capra.handler.cdt/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.cdt/.classpath
rename to bundles/org.eclipse.capra.handler.cdt/.classpath
diff --git a/org.eclipse.capra.handler.cdt/.gitignore b/bundles/org.eclipse.capra.handler.cdt/.gitignore
similarity index 100%
rename from org.eclipse.capra.handler.cdt/.gitignore
rename to bundles/org.eclipse.capra.handler.cdt/.gitignore
diff --git a/org.eclipse.capra.handler.cdt/.project b/bundles/org.eclipse.capra.handler.cdt/.project
similarity index 100%
rename from org.eclipse.capra.handler.cdt/.project
rename to bundles/org.eclipse.capra.handler.cdt/.project
diff --git a/org.eclipse.capra.handler.cdt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.cdt/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.cdt/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.cdt/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.cdt/build.properties b/bundles/org.eclipse.capra.handler.cdt/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.cdt/build.properties
rename to bundles/org.eclipse.capra.handler.cdt/build.properties
diff --git a/org.eclipse.capra.handler.cdt/plugin.xml b/bundles/org.eclipse.capra.handler.cdt/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.cdt/plugin.xml
rename to bundles/org.eclipse.capra.handler.cdt/plugin.xml
diff --git a/org.eclipse.capra.handler.cdt/pom.xml b/bundles/org.eclipse.capra.handler.cdt/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.cdt/pom.xml
rename to bundles/org.eclipse.capra.handler.cdt/pom.xml
index f8397af..01abd14 100644
--- a/org.eclipse.capra.handler.cdt/pom.xml
+++ b/bundles/org.eclipse.capra.handler.cdt/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/Activator.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/Activator.java
similarity index 100%
rename from org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/Activator.java
rename to bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/Activator.java
diff --git a/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTAnnotate.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTAnnotate.java
similarity index 100%
rename from org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTAnnotate.java
rename to bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTAnnotate.java
diff --git a/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTHandler.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTHandler.java
rename to bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTHandler.java
diff --git a/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/CElementChangeListener.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/CElementChangeListener.java
similarity index 100%
rename from org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/CElementChangeListener.java
rename to bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/CElementChangeListener.java
diff --git a/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/StartUp.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/StartUp.java
similarity index 100%
rename from org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/StartUp.java
rename to bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/StartUp.java
diff --git a/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/preferences/CDTPreferences.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/preferences/CDTPreferences.java
similarity index 100%
rename from org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/preferences/CDTPreferences.java
rename to bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/preferences/CDTPreferences.java
diff --git a/org.eclipse.capra.handler.emf/.classpath b/bundles/org.eclipse.capra.handler.emf/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.emf/.classpath
rename to bundles/org.eclipse.capra.handler.emf/.classpath
diff --git a/org.eclipse.capra.handler.emf/.gitignore b/bundles/org.eclipse.capra.handler.emf/.gitignore
similarity index 100%
rename from org.eclipse.capra.handler.emf/.gitignore
rename to bundles/org.eclipse.capra.handler.emf/.gitignore
diff --git a/org.eclipse.capra.handler.emf/.project b/bundles/org.eclipse.capra.handler.emf/.project
similarity index 100%
rename from org.eclipse.capra.handler.emf/.project
rename to bundles/org.eclipse.capra.handler.emf/.project
diff --git a/org.eclipse.capra.handler.emf/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.emf/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.emf/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.emf/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.emf/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.emf/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.emf/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.emf/build.properties b/bundles/org.eclipse.capra.handler.emf/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.emf/build.properties
rename to bundles/org.eclipse.capra.handler.emf/build.properties
diff --git a/org.eclipse.capra.handler.emf/plugin.xml b/bundles/org.eclipse.capra.handler.emf/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.emf/plugin.xml
rename to bundles/org.eclipse.capra.handler.emf/plugin.xml
diff --git a/org.eclipse.capra.handler.emf/pom.xml b/bundles/org.eclipse.capra.handler.emf/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.emf/pom.xml
rename to bundles/org.eclipse.capra.handler.emf/pom.xml
index 97505b2..46e8067 100644
--- a/org.eclipse.capra.handler.emf/pom.xml
+++ b/bundles/org.eclipse.capra.handler.emf/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/EMFHandler.java b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/EMFHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/EMFHandler.java
rename to bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/EMFHandler.java
diff --git a/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/EditorListener.java b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/EditorListener.java
similarity index 100%
rename from org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/EditorListener.java
rename to bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/EditorListener.java
diff --git a/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/ModelChangeListener.java b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/ModelChangeListener.java
similarity index 100%
rename from org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/ModelChangeListener.java
rename to bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/ModelChangeListener.java
diff --git a/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/StartUp.java b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/StartUp.java
similarity index 100%
rename from org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/StartUp.java
rename to bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/StartUp.java
diff --git a/org.eclipse.capra.handler.featureide/.classpath b/bundles/org.eclipse.capra.handler.featureide/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.featureide/.classpath
rename to bundles/org.eclipse.capra.handler.featureide/.classpath
diff --git a/org.eclipse.capra.handler.featureide/.project b/bundles/org.eclipse.capra.handler.featureide/.project
similarity index 100%
rename from org.eclipse.capra.handler.featureide/.project
rename to bundles/org.eclipse.capra.handler.featureide/.project
diff --git a/org.eclipse.capra.handler.featureide/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.featureide/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.featureide/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.featureide/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.featureide/.settings/org.eclipse.m2e.core.prefs b/bundles/org.eclipse.capra.handler.featureide/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.featureide/.settings/org.eclipse.m2e.core.prefs
rename to bundles/org.eclipse.capra.handler.featureide/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.capra.handler.featureide/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.featureide/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.featureide/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.featureide/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.featureide/build.properties b/bundles/org.eclipse.capra.handler.featureide/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.featureide/build.properties
rename to bundles/org.eclipse.capra.handler.featureide/build.properties
diff --git a/org.eclipse.capra.handler.featureide/plugin.xml b/bundles/org.eclipse.capra.handler.featureide/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.featureide/plugin.xml
rename to bundles/org.eclipse.capra.handler.featureide/plugin.xml
diff --git a/org.eclipse.capra.handler.featureide/pom.xml b/bundles/org.eclipse.capra.handler.featureide/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.featureide/pom.xml
rename to bundles/org.eclipse.capra.handler.featureide/pom.xml
index 3b1c9b8..12f825e 100644
--- a/org.eclipse.capra.handler.featureide/pom.xml
+++ b/bundles/org.eclipse.capra.handler.featureide/pom.xml
@@ -9,6 +9,6 @@
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java b/bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java
rename to bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java
diff --git a/org.eclipse.capra.handler.file/.classpath b/bundles/org.eclipse.capra.handler.file/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.file/.classpath
rename to bundles/org.eclipse.capra.handler.file/.classpath
diff --git a/org.eclipse.capra.handler.file/.gitignore b/bundles/org.eclipse.capra.handler.file/.gitignore
similarity index 100%
rename from org.eclipse.capra.handler.file/.gitignore
rename to bundles/org.eclipse.capra.handler.file/.gitignore
diff --git a/org.eclipse.capra.handler.file/.project b/bundles/org.eclipse.capra.handler.file/.project
similarity index 100%
rename from org.eclipse.capra.handler.file/.project
rename to bundles/org.eclipse.capra.handler.file/.project
diff --git a/org.eclipse.capra.handler.file/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.file/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.file/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.file/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.file/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.file/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.file/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.file/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.file/build.properties b/bundles/org.eclipse.capra.handler.file/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.file/build.properties
rename to bundles/org.eclipse.capra.handler.file/build.properties
diff --git a/org.eclipse.capra.handler.file/plugin.xml b/bundles/org.eclipse.capra.handler.file/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.file/plugin.xml
rename to bundles/org.eclipse.capra.handler.file/plugin.xml
diff --git a/org.eclipse.capra.handler.file/pom.xml b/bundles/org.eclipse.capra.handler.file/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.file/pom.xml
rename to bundles/org.eclipse.capra.handler.file/pom.xml
index 978327e..fa85f86 100644
--- a/org.eclipse.capra.handler.file/pom.xml
+++ b/bundles/org.eclipse.capra.handler.file/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/IFileHandler.java b/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/IFileHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/IFileHandler.java
rename to bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/IFileHandler.java
diff --git a/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/FileChangeListener.java b/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/FileChangeListener.java
similarity index 100%
rename from org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/FileChangeListener.java
rename to bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/FileChangeListener.java
diff --git a/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/StartUp.java b/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/StartUp.java
similarity index 100%
rename from org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/StartUp.java
rename to bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/StartUp.java
diff --git a/org.eclipse.capra.handler.gef/.classpath b/bundles/org.eclipse.capra.handler.gef/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.gef/.classpath
rename to bundles/org.eclipse.capra.handler.gef/.classpath
diff --git a/org.eclipse.capra.handler.gef/.gitignore b/bundles/org.eclipse.capra.handler.gef/.gitignore
similarity index 100%
rename from org.eclipse.capra.handler.gef/.gitignore
rename to bundles/org.eclipse.capra.handler.gef/.gitignore
diff --git a/org.eclipse.capra.handler.gef/.project b/bundles/org.eclipse.capra.handler.gef/.project
similarity index 100%
rename from org.eclipse.capra.handler.gef/.project
rename to bundles/org.eclipse.capra.handler.gef/.project
diff --git a/org.eclipse.capra.handler.gef/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.gef/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.gef/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.gef/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.gef/build.properties b/bundles/org.eclipse.capra.handler.gef/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.gef/build.properties
rename to bundles/org.eclipse.capra.handler.gef/build.properties
diff --git a/org.eclipse.capra.handler.gef/plugin.xml b/bundles/org.eclipse.capra.handler.gef/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.gef/plugin.xml
rename to bundles/org.eclipse.capra.handler.gef/plugin.xml
diff --git a/org.eclipse.capra.handler.gef/pom.xml b/bundles/org.eclipse.capra.handler.gef/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.gef/pom.xml
rename to bundles/org.eclipse.capra.handler.gef/pom.xml
index 4a4a593..22f233b 100644
--- a/org.eclipse.capra.handler.gef/pom.xml
+++ b/bundles/org.eclipse.capra.handler.gef/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.gef/src/org/eclipse/capra/handler/gef/GEFHandler.java b/bundles/org.eclipse.capra.handler.gef/src/org/eclipse/capra/handler/gef/GEFHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.gef/src/org/eclipse/capra/handler/gef/GEFHandler.java
rename to bundles/org.eclipse.capra.handler.gef/src/org/eclipse/capra/handler/gef/GEFHandler.java
diff --git a/org.eclipse.capra.handler.hudson/.classpath b/bundles/org.eclipse.capra.handler.hudson/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.hudson/.classpath
rename to bundles/org.eclipse.capra.handler.hudson/.classpath
diff --git a/org.eclipse.capra.handler.hudson/.gitignore b/bundles/org.eclipse.capra.handler.hudson/.gitignore
similarity index 100%
rename from org.eclipse.capra.handler.hudson/.gitignore
rename to bundles/org.eclipse.capra.handler.hudson/.gitignore
diff --git a/org.eclipse.capra.handler.hudson/.project b/bundles/org.eclipse.capra.handler.hudson/.project
similarity index 100%
rename from org.eclipse.capra.handler.hudson/.project
rename to bundles/org.eclipse.capra.handler.hudson/.project
diff --git a/org.eclipse.capra.handler.hudson/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.hudson/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.hudson/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.hudson/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.hudson/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.hudson/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.hudson/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.hudson/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.hudson/build.properties b/bundles/org.eclipse.capra.handler.hudson/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.hudson/build.properties
rename to bundles/org.eclipse.capra.handler.hudson/build.properties
diff --git a/org.eclipse.capra.handler.hudson/plugin.xml b/bundles/org.eclipse.capra.handler.hudson/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.hudson/plugin.xml
rename to bundles/org.eclipse.capra.handler.hudson/plugin.xml
diff --git a/org.eclipse.capra.handler.hudson/pom.xml b/bundles/org.eclipse.capra.handler.hudson/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.hudson/pom.xml
rename to bundles/org.eclipse.capra.handler.hudson/pom.xml
index a61b3ad..5ab476c 100644
--- a/org.eclipse.capra.handler.hudson/pom.xml
+++ b/bundles/org.eclipse.capra.handler.hudson/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/BuildElementHandler.java b/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/BuildElementHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/BuildElementHandler.java
rename to bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/BuildElementHandler.java
diff --git a/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/TestElementHandler.java b/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/TestElementHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/TestElementHandler.java
rename to bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/TestElementHandler.java
diff --git a/org.eclipse.capra.handler.jdt/.classpath b/bundles/org.eclipse.capra.handler.jdt/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.jdt/.classpath
rename to bundles/org.eclipse.capra.handler.jdt/.classpath
diff --git a/org.eclipse.capra.handler.jdt/.gitignore b/bundles/org.eclipse.capra.handler.jdt/.gitignore
similarity index 100%
rename from org.eclipse.capra.handler.jdt/.gitignore
rename to bundles/org.eclipse.capra.handler.jdt/.gitignore
diff --git a/org.eclipse.capra.handler.jdt/.project b/bundles/org.eclipse.capra.handler.jdt/.project
similarity index 100%
rename from org.eclipse.capra.handler.jdt/.project
rename to bundles/org.eclipse.capra.handler.jdt/.project
diff --git a/org.eclipse.capra.handler.jdt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.jdt/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.jdt/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.jdt/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.jdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.jdt/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.jdt/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.jdt/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.jdt/build.properties b/bundles/org.eclipse.capra.handler.jdt/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.jdt/build.properties
rename to bundles/org.eclipse.capra.handler.jdt/build.properties
diff --git a/org.eclipse.capra.handler.jdt/plugin.xml b/bundles/org.eclipse.capra.handler.jdt/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.jdt/plugin.xml
rename to bundles/org.eclipse.capra.handler.jdt/plugin.xml
diff --git a/org.eclipse.capra.handler.jdt/pom.xml b/bundles/org.eclipse.capra.handler.jdt/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.jdt/pom.xml
rename to bundles/org.eclipse.capra.handler.jdt/pom.xml
index 1527bcf..df69090 100644
--- a/org.eclipse.capra.handler.jdt/pom.xml
+++ b/bundles/org.eclipse.capra.handler.jdt/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/Activator.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/Activator.java
similarity index 100%
rename from org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/Activator.java
rename to bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/Activator.java
diff --git a/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JDTAnnotate.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JDTAnnotate.java
similarity index 100%
rename from org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JDTAnnotate.java
rename to bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JDTAnnotate.java
diff --git a/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JavaElementHandler.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JavaElementHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JavaElementHandler.java
rename to bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JavaElementHandler.java
diff --git a/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/JavaElementChangeListener.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/JavaElementChangeListener.java
similarity index 100%
rename from org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/JavaElementChangeListener.java
rename to bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/JavaElementChangeListener.java
diff --git a/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/StartUp.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/StartUp.java
similarity index 100%
rename from org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/StartUp.java
rename to bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/StartUp.java
diff --git a/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/preferences/JDTPreferences.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/preferences/JDTPreferences.java
similarity index 100%
rename from org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/preferences/JDTPreferences.java
rename to bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/preferences/JDTPreferences.java
diff --git a/org.eclipse.capra.handler.marker/.classpath b/bundles/org.eclipse.capra.handler.marker/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.marker/.classpath
rename to bundles/org.eclipse.capra.handler.marker/.classpath
diff --git a/org.eclipse.capra.handler.marker/.project b/bundles/org.eclipse.capra.handler.marker/.project
similarity index 100%
rename from org.eclipse.capra.handler.marker/.project
rename to bundles/org.eclipse.capra.handler.marker/.project
diff --git a/org.eclipse.capra.handler.marker/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.marker/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.marker/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.marker/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.marker/build.properties b/bundles/org.eclipse.capra.handler.marker/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.marker/build.properties
rename to bundles/org.eclipse.capra.handler.marker/build.properties
diff --git a/org.eclipse.capra.handler.marker/plugin.xml b/bundles/org.eclipse.capra.handler.marker/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.marker/plugin.xml
rename to bundles/org.eclipse.capra.handler.marker/plugin.xml
diff --git a/org.eclipse.capra.handler.marker/pom.xml b/bundles/org.eclipse.capra.handler.marker/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.marker/pom.xml
rename to bundles/org.eclipse.capra.handler.marker/pom.xml
index 9ec3fb7..6063c60 100644
--- a/org.eclipse.capra.handler.marker/pom.xml
+++ b/bundles/org.eclipse.capra.handler.marker/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.marker/src/org/eclipse/capra/handler/marker/MarkerHandler.java b/bundles/org.eclipse.capra.handler.marker/src/org/eclipse/capra/handler/marker/MarkerHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.marker/src/org/eclipse/capra/handler/marker/MarkerHandler.java
rename to bundles/org.eclipse.capra.handler.marker/src/org/eclipse/capra/handler/marker/MarkerHandler.java
diff --git a/org.eclipse.capra.handler.mylyn/.classpath b/bundles/org.eclipse.capra.handler.mylyn/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.mylyn/.classpath
rename to bundles/org.eclipse.capra.handler.mylyn/.classpath
diff --git a/org.eclipse.capra.handler.mylyn/.gitignore b/bundles/org.eclipse.capra.handler.mylyn/.gitignore
similarity index 100%
rename from org.eclipse.capra.handler.mylyn/.gitignore
rename to bundles/org.eclipse.capra.handler.mylyn/.gitignore
diff --git a/org.eclipse.capra.handler.mylyn/.project b/bundles/org.eclipse.capra.handler.mylyn/.project
similarity index 100%
rename from org.eclipse.capra.handler.mylyn/.project
rename to bundles/org.eclipse.capra.handler.mylyn/.project
diff --git a/org.eclipse.capra.handler.mylyn/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.mylyn/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.mylyn/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.mylyn/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.mylyn/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.mylyn/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.mylyn/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.mylyn/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.mylyn/build.properties b/bundles/org.eclipse.capra.handler.mylyn/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.mylyn/build.properties
rename to bundles/org.eclipse.capra.handler.mylyn/build.properties
diff --git a/org.eclipse.capra.handler.mylyn/plugin.xml b/bundles/org.eclipse.capra.handler.mylyn/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.mylyn/plugin.xml
rename to bundles/org.eclipse.capra.handler.mylyn/plugin.xml
diff --git a/org.eclipse.capra.handler.mylyn/pom.xml b/bundles/org.eclipse.capra.handler.mylyn/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.mylyn/pom.xml
rename to bundles/org.eclipse.capra.handler.mylyn/pom.xml
index bb59f7c..0ac6551 100644
--- a/org.eclipse.capra.handler.mylyn/pom.xml
+++ b/bundles/org.eclipse.capra.handler.mylyn/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.mylyn/src/org/eclipse/capra/handler/mylyn/MylynHandler.java b/bundles/org.eclipse.capra.handler.mylyn/src/org/eclipse/capra/handler/mylyn/MylynHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.mylyn/src/org/eclipse/capra/handler/mylyn/MylynHandler.java
rename to bundles/org.eclipse.capra.handler.mylyn/src/org/eclipse/capra/handler/mylyn/MylynHandler.java
diff --git a/org.eclipse.capra.handler.office/.classpath b/bundles/org.eclipse.capra.handler.office/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.office/.classpath
rename to bundles/org.eclipse.capra.handler.office/.classpath
diff --git a/org.eclipse.capra.handler.office/.project b/bundles/org.eclipse.capra.handler.office/.project
similarity index 100%
rename from org.eclipse.capra.handler.office/.project
rename to bundles/org.eclipse.capra.handler.office/.project
diff --git a/org.eclipse.capra.handler.office/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.office/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.office/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.office/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.office/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.office/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.office/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.office/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.office/build.properties b/bundles/org.eclipse.capra.handler.office/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.office/build.properties
rename to bundles/org.eclipse.capra.handler.office/build.properties
diff --git a/org.eclipse.capra.handler.office/plugin.xml b/bundles/org.eclipse.capra.handler.office/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.office/plugin.xml
rename to bundles/org.eclipse.capra.handler.office/plugin.xml
diff --git a/org.eclipse.capra.handler.office/pom.xml b/bundles/org.eclipse.capra.handler.office/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.office/pom.xml
rename to bundles/org.eclipse.capra.handler.office/pom.xml
index 2b62fa8..3cf9aab 100644
--- a/org.eclipse.capra.handler.office/pom.xml
+++ b/bundles/org.eclipse.capra.handler.office/pom.xml
@@ -19,7 +19,7 @@
<artifactId>parent</artifactId>
<groupId>org.eclipse.capra</groupId>
<version>0.7.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java b/bundles/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java
rename to bundles/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java
diff --git a/org.eclipse.capra.handler.papyrus/.classpath b/bundles/org.eclipse.capra.handler.papyrus/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.papyrus/.classpath
rename to bundles/org.eclipse.capra.handler.papyrus/.classpath
diff --git a/org.eclipse.capra.handler.papyrus/.gitignore b/bundles/org.eclipse.capra.handler.papyrus/.gitignore
similarity index 100%
rename from org.eclipse.capra.handler.papyrus/.gitignore
rename to bundles/org.eclipse.capra.handler.papyrus/.gitignore
diff --git a/org.eclipse.capra.handler.papyrus/.project b/bundles/org.eclipse.capra.handler.papyrus/.project
similarity index 100%
rename from org.eclipse.capra.handler.papyrus/.project
rename to bundles/org.eclipse.capra.handler.papyrus/.project
diff --git a/org.eclipse.capra.handler.papyrus/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.papyrus/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.papyrus/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.papyrus/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.papyrus/build.properties b/bundles/org.eclipse.capra.handler.papyrus/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.papyrus/build.properties
rename to bundles/org.eclipse.capra.handler.papyrus/build.properties
diff --git a/org.eclipse.capra.handler.papyrus/plugin.xml b/bundles/org.eclipse.capra.handler.papyrus/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.papyrus/plugin.xml
rename to bundles/org.eclipse.capra.handler.papyrus/plugin.xml
diff --git a/org.eclipse.capra.handler.papyrus/pom.xml b/bundles/org.eclipse.capra.handler.papyrus/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.papyrus/pom.xml
rename to bundles/org.eclipse.capra.handler.papyrus/pom.xml
index 4b36e92..1622879 100644
--- a/org.eclipse.capra.handler.papyrus/pom.xml
+++ b/bundles/org.eclipse.capra.handler.papyrus/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.papyrus/src/org/eclipse/capra/handler/papyrus/PapyrusHandler.java b/bundles/org.eclipse.capra.handler.papyrus/src/org/eclipse/capra/handler/papyrus/PapyrusHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.papyrus/src/org/eclipse/capra/handler/papyrus/PapyrusHandler.java
rename to bundles/org.eclipse.capra.handler.papyrus/src/org/eclipse/capra/handler/papyrus/PapyrusHandler.java
diff --git a/org.eclipse.capra.handler.php/.classpath b/bundles/org.eclipse.capra.handler.php/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.php/.classpath
rename to bundles/org.eclipse.capra.handler.php/.classpath
diff --git a/org.eclipse.capra.handler.php/.project b/bundles/org.eclipse.capra.handler.php/.project
similarity index 100%
rename from org.eclipse.capra.handler.php/.project
rename to bundles/org.eclipse.capra.handler.php/.project
diff --git a/org.eclipse.capra.handler.php/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.php/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.php/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.php/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.php/build.properties b/bundles/org.eclipse.capra.handler.php/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.php/build.properties
rename to bundles/org.eclipse.capra.handler.php/build.properties
diff --git a/org.eclipse.capra.handler.php/plugin.xml b/bundles/org.eclipse.capra.handler.php/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.php/plugin.xml
rename to bundles/org.eclipse.capra.handler.php/plugin.xml
diff --git a/org.eclipse.capra.handler.php/pom.xml b/bundles/org.eclipse.capra.handler.php/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.php/pom.xml
rename to bundles/org.eclipse.capra.handler.php/pom.xml
index ec44378..b30d494 100644
--- a/org.eclipse.capra.handler.php/pom.xml
+++ b/bundles/org.eclipse.capra.handler.php/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/PhpHandler.java b/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/PhpHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/PhpHandler.java
rename to bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/PhpHandler.java
diff --git a/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/PHPElementChangeListener.java b/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/PHPElementChangeListener.java
similarity index 100%
rename from org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/PHPElementChangeListener.java
rename to bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/PHPElementChangeListener.java
diff --git a/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/StartUp.java b/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/StartUp.java
similarity index 100%
rename from org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/StartUp.java
rename to bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/StartUp.java
diff --git a/org.eclipse.capra.handler.reqIf/.classpath b/bundles/org.eclipse.capra.handler.reqIf/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.reqIf/.classpath
rename to bundles/org.eclipse.capra.handler.reqIf/.classpath
diff --git a/org.eclipse.capra.handler.reqIf/.project b/bundles/org.eclipse.capra.handler.reqIf/.project
similarity index 100%
rename from org.eclipse.capra.handler.reqIf/.project
rename to bundles/org.eclipse.capra.handler.reqIf/.project
diff --git a/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.reqIf/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.m2e.core.prefs b/bundles/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.reqIf/.settings/org.eclipse.m2e.core.prefs
rename to bundles/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.capra.handler.reqIf/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.reqIf/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.reqIf/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.reqIf/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.reqIf/build.properties b/bundles/org.eclipse.capra.handler.reqIf/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.reqIf/build.properties
rename to bundles/org.eclipse.capra.handler.reqIf/build.properties
diff --git a/org.eclipse.capra.handler.reqIf/plugin.xml b/bundles/org.eclipse.capra.handler.reqIf/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.reqIf/plugin.xml
rename to bundles/org.eclipse.capra.handler.reqIf/plugin.xml
diff --git a/org.eclipse.capra.handler.reqIf/pom.xml b/bundles/org.eclipse.capra.handler.reqIf/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.reqIf/pom.xml
rename to bundles/org.eclipse.capra.handler.reqIf/pom.xml
index 1076f32..89222c5 100644
--- a/org.eclipse.capra.handler.reqIf/pom.xml
+++ b/bundles/org.eclipse.capra.handler.reqIf/pom.xml
@@ -9,6 +9,6 @@
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/org.eclipse.capra.handler.reqIf/src/org/eclipse/capra/handler/reqif/ReqIfHandler.java b/bundles/org.eclipse.capra.handler.reqIf/src/org/eclipse/capra/handler/reqif/ReqIfHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.reqIf/src/org/eclipse/capra/handler/reqif/ReqIfHandler.java
rename to bundles/org.eclipse.capra.handler.reqIf/src/org/eclipse/capra/handler/reqif/ReqIfHandler.java
diff --git a/org.eclipse.capra.handler.uml/.classpath b/bundles/org.eclipse.capra.handler.uml/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.uml/.classpath
rename to bundles/org.eclipse.capra.handler.uml/.classpath
diff --git a/org.eclipse.capra.handler.uml/.project b/bundles/org.eclipse.capra.handler.uml/.project
similarity index 100%
rename from org.eclipse.capra.handler.uml/.project
rename to bundles/org.eclipse.capra.handler.uml/.project
diff --git a/org.eclipse.capra.handler.uml/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.uml/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.uml/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.handler.uml/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.uml/build.properties b/bundles/org.eclipse.capra.handler.uml/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.uml/build.properties
rename to bundles/org.eclipse.capra.handler.uml/build.properties
diff --git a/org.eclipse.capra.handler.uml/plugin.xml b/bundles/org.eclipse.capra.handler.uml/plugin.xml
similarity index 100%
rename from org.eclipse.capra.handler.uml/plugin.xml
rename to bundles/org.eclipse.capra.handler.uml/plugin.xml
diff --git a/org.eclipse.capra.handler.uml/pom.xml b/bundles/org.eclipse.capra.handler.uml/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.uml/pom.xml
rename to bundles/org.eclipse.capra.handler.uml/pom.xml
index e2d73bc..e7b0960 100644
--- a/org.eclipse.capra.handler.uml/pom.xml
+++ b/bundles/org.eclipse.capra.handler.uml/pom.xml
@@ -9,6 +9,6 @@
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/org.eclipse.capra.handler.uml/src/org/eclipse/capra/handler/uml/UMLHandler.java b/bundles/org.eclipse.capra.handler.uml/src/org/eclipse/capra/handler/uml/UMLHandler.java
similarity index 100%
rename from org.eclipse.capra.handler.uml/src/org/eclipse/capra/handler/uml/UMLHandler.java
rename to bundles/org.eclipse.capra.handler.uml/src/org/eclipse/capra/handler/uml/UMLHandler.java
diff --git a/org.eclipse.capra.ui.cdt/.classpath b/bundles/org.eclipse.capra.ui.cdt/.classpath
similarity index 100%
rename from org.eclipse.capra.ui.cdt/.classpath
rename to bundles/org.eclipse.capra.ui.cdt/.classpath
diff --git a/org.eclipse.capra.ui.cdt/.project b/bundles/org.eclipse.capra.ui.cdt/.project
similarity index 100%
rename from org.eclipse.capra.ui.cdt/.project
rename to bundles/org.eclipse.capra.ui.cdt/.project
diff --git a/org.eclipse.capra.ui.cdt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.cdt/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.ui.cdt/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.ui.cdt/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.ui.cdt/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.cdt/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.capra.ui.cdt/OSGI-INF/l10n/bundle.properties
rename to bundles/org.eclipse.capra.ui.cdt/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.capra.ui.cdt/build.properties b/bundles/org.eclipse.capra.ui.cdt/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.cdt/build.properties
rename to bundles/org.eclipse.capra.ui.cdt/build.properties
diff --git a/org.eclipse.capra.ui.cdt/plugin.xml b/bundles/org.eclipse.capra.ui.cdt/plugin.xml
similarity index 100%
rename from org.eclipse.capra.ui.cdt/plugin.xml
rename to bundles/org.eclipse.capra.ui.cdt/plugin.xml
diff --git a/org.eclipse.capra.ui.cdt/pom.xml b/bundles/org.eclipse.capra.ui.cdt/pom.xml
similarity index 95%
rename from org.eclipse.capra.ui.cdt/pom.xml
rename to bundles/org.eclipse.capra.ui.cdt/pom.xml
index b552ab8..2b1efaa 100644
--- a/org.eclipse.capra.ui.cdt/pom.xml
+++ b/bundles/org.eclipse.capra.ui.cdt/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/Activator.java b/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/Activator.java
similarity index 100%
rename from org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/Activator.java
rename to bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/Activator.java
diff --git a/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferenceInitializer.java b/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferenceInitializer.java
similarity index 100%
rename from org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferenceInitializer.java
rename to bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferenceInitializer.java
diff --git a/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferencePage.java b/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferencePage.java
similarity index 100%
rename from org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferencePage.java
rename to bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferencePage.java
diff --git a/org.eclipse.capra.ui.drive/.classpath b/bundles/org.eclipse.capra.ui.drive/.classpath
similarity index 100%
rename from org.eclipse.capra.ui.drive/.classpath
rename to bundles/org.eclipse.capra.ui.drive/.classpath
diff --git a/org.eclipse.capra.ui.drive/.project b/bundles/org.eclipse.capra.ui.drive/.project
similarity index 100%
rename from org.eclipse.capra.ui.drive/.project
rename to bundles/org.eclipse.capra.ui.drive/.project
diff --git a/org.eclipse.capra.ui.drive/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.drive/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.ui.drive/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.ui.drive/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.ui.drive/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.drive/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.ui.drive/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.ui.drive/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.ui.drive/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.drive/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.capra.ui.drive/OSGI-INF/l10n/bundle.properties
rename to bundles/org.eclipse.capra.ui.drive/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.capra.ui.drive/build.properties b/bundles/org.eclipse.capra.ui.drive/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.drive/build.properties
rename to bundles/org.eclipse.capra.ui.drive/build.properties
diff --git a/org.eclipse.capra.ui.drive/client_secret.json b/bundles/org.eclipse.capra.ui.drive/client_secret.json
similarity index 100%
rename from org.eclipse.capra.ui.drive/client_secret.json
rename to bundles/org.eclipse.capra.ui.drive/client_secret.json
diff --git a/org.eclipse.capra.ui.drive/icons/excel.png b/bundles/org.eclipse.capra.ui.drive/icons/excel.png
similarity index 100%
rename from org.eclipse.capra.ui.drive/icons/excel.png
rename to bundles/org.eclipse.capra.ui.drive/icons/excel.png
Binary files differ
diff --git a/org.eclipse.capra.ui.drive/icons/selectionView.png b/bundles/org.eclipse.capra.ui.drive/icons/selectionView.png
similarity index 100%
rename from org.eclipse.capra.ui.drive/icons/selectionView.png
rename to bundles/org.eclipse.capra.ui.drive/icons/selectionView.png
Binary files differ
diff --git a/org.eclipse.capra.ui.drive/lib/google-api-client-1.22.0.jar b/bundles/org.eclipse.capra.ui.drive/lib/google-api-client-1.22.0.jar
similarity index 100%
rename from org.eclipse.capra.ui.drive/lib/google-api-client-1.22.0.jar
rename to bundles/org.eclipse.capra.ui.drive/lib/google-api-client-1.22.0.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.drive/lib/google-api-services-drive-v3-rev61-1.22.0.jar b/bundles/org.eclipse.capra.ui.drive/lib/google-api-services-drive-v3-rev61-1.22.0.jar
similarity index 100%
rename from org.eclipse.capra.ui.drive/lib/google-api-services-drive-v3-rev61-1.22.0.jar
rename to bundles/org.eclipse.capra.ui.drive/lib/google-api-services-drive-v3-rev61-1.22.0.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.drive/lib/google-http-client-1.22.0.jar b/bundles/org.eclipse.capra.ui.drive/lib/google-http-client-1.22.0.jar
similarity index 100%
rename from org.eclipse.capra.ui.drive/lib/google-http-client-1.22.0.jar
rename to bundles/org.eclipse.capra.ui.drive/lib/google-http-client-1.22.0.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.drive/lib/google-http-client-jackson2-1.22.0.jar b/bundles/org.eclipse.capra.ui.drive/lib/google-http-client-jackson2-1.22.0.jar
similarity index 100%
rename from org.eclipse.capra.ui.drive/lib/google-http-client-jackson2-1.22.0.jar
rename to bundles/org.eclipse.capra.ui.drive/lib/google-http-client-jackson2-1.22.0.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.drive/lib/google-oauth-client-1.22.0.jar b/bundles/org.eclipse.capra.ui.drive/lib/google-oauth-client-1.22.0.jar
similarity index 100%
rename from org.eclipse.capra.ui.drive/lib/google-oauth-client-1.22.0.jar
rename to bundles/org.eclipse.capra.ui.drive/lib/google-oauth-client-1.22.0.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.drive/lib/google-oauth-client-java6-1.22.0.jar b/bundles/org.eclipse.capra.ui.drive/lib/google-oauth-client-java6-1.22.0.jar
similarity index 100%
rename from org.eclipse.capra.ui.drive/lib/google-oauth-client-java6-1.22.0.jar
rename to bundles/org.eclipse.capra.ui.drive/lib/google-oauth-client-java6-1.22.0.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.drive/lib/google-oauth-client-jetty-1.22.0.jar b/bundles/org.eclipse.capra.ui.drive/lib/google-oauth-client-jetty-1.22.0.jar
similarity index 100%
rename from org.eclipse.capra.ui.drive/lib/google-oauth-client-jetty-1.22.0.jar
rename to bundles/org.eclipse.capra.ui.drive/lib/google-oauth-client-jetty-1.22.0.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.drive/plugin.xml b/bundles/org.eclipse.capra.ui.drive/plugin.xml
similarity index 100%
rename from org.eclipse.capra.ui.drive/plugin.xml
rename to bundles/org.eclipse.capra.ui.drive/plugin.xml
diff --git a/org.eclipse.capra.ui.drive/pom.xml b/bundles/org.eclipse.capra.ui.drive/pom.xml
similarity index 95%
rename from org.eclipse.capra.ui.drive/pom.xml
rename to bundles/org.eclipse.capra.ui.drive/pom.xml
index 773e1b7..d58e0d4 100644
--- a/org.eclipse.capra.ui.drive/pom.xml
+++ b/bundles/org.eclipse.capra.ui.drive/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/CapraGoogleDriveView.java b/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/CapraGoogleDriveView.java
similarity index 100%
rename from org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/CapraGoogleDriveView.java
rename to bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/CapraGoogleDriveView.java
diff --git a/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInBrowserHandler.java b/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInBrowserHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInBrowserHandler.java
rename to bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInBrowserHandler.java
diff --git a/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInOfficeViewHandler.java b/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInOfficeViewHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInOfficeViewHandler.java
rename to bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInOfficeViewHandler.java
diff --git a/org.eclipse.capra.ui.jdt/.classpath b/bundles/org.eclipse.capra.ui.jdt/.classpath
similarity index 100%
rename from org.eclipse.capra.ui.jdt/.classpath
rename to bundles/org.eclipse.capra.ui.jdt/.classpath
diff --git a/org.eclipse.capra.ui.jdt/.project b/bundles/org.eclipse.capra.ui.jdt/.project
similarity index 100%
rename from org.eclipse.capra.ui.jdt/.project
rename to bundles/org.eclipse.capra.ui.jdt/.project
diff --git a/org.eclipse.capra.ui.jdt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.jdt/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.ui.jdt/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.ui.jdt/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.ui.jdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.jdt/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.ui.jdt/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.ui.jdt/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.ui.jdt/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.jdt/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.capra.ui.jdt/OSGI-INF/l10n/bundle.properties
rename to bundles/org.eclipse.capra.ui.jdt/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.capra.ui.jdt/build.properties b/bundles/org.eclipse.capra.ui.jdt/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.jdt/build.properties
rename to bundles/org.eclipse.capra.ui.jdt/build.properties
diff --git a/org.eclipse.capra.ui.jdt/plugin.xml b/bundles/org.eclipse.capra.ui.jdt/plugin.xml
similarity index 100%
rename from org.eclipse.capra.ui.jdt/plugin.xml
rename to bundles/org.eclipse.capra.ui.jdt/plugin.xml
diff --git a/org.eclipse.capra.ui.jdt/pom.xml b/bundles/org.eclipse.capra.ui.jdt/pom.xml
similarity index 95%
rename from org.eclipse.capra.ui.jdt/pom.xml
rename to bundles/org.eclipse.capra.ui.jdt/pom.xml
index dd712e5..839b18d 100644
--- a/org.eclipse.capra.ui.jdt/pom.xml
+++ b/bundles/org.eclipse.capra.ui.jdt/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/Activator.java b/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/Activator.java
similarity index 100%
rename from org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/Activator.java
rename to bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/Activator.java
diff --git a/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferenceInitializer.java b/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferenceInitializer.java
similarity index 100%
rename from org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferenceInitializer.java
rename to bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferenceInitializer.java
diff --git a/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferencePage.java b/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferencePage.java
similarity index 100%
rename from org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferencePage.java
rename to bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferencePage.java
diff --git a/org.eclipse.capra.ui.notification/.classpath b/bundles/org.eclipse.capra.ui.notification/.classpath
similarity index 100%
rename from org.eclipse.capra.ui.notification/.classpath
rename to bundles/org.eclipse.capra.ui.notification/.classpath
diff --git a/org.eclipse.capra.ui.notification/.gitignore b/bundles/org.eclipse.capra.ui.notification/.gitignore
similarity index 100%
rename from org.eclipse.capra.ui.notification/.gitignore
rename to bundles/org.eclipse.capra.ui.notification/.gitignore
diff --git a/org.eclipse.capra.ui.notification/.project b/bundles/org.eclipse.capra.ui.notification/.project
similarity index 100%
rename from org.eclipse.capra.ui.notification/.project
rename to bundles/org.eclipse.capra.ui.notification/.project
diff --git a/org.eclipse.capra.ui.notification/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.notification/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.ui.notification/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.ui.notification/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.ui.notification/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.notification/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.ui.notification/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.ui.notification/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.ui.notification/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.notification/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.capra.ui.notification/OSGI-INF/l10n/bundle.properties
rename to bundles/org.eclipse.capra.ui.notification/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.capra.ui.notification/build.properties b/bundles/org.eclipse.capra.ui.notification/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.notification/build.properties
rename to bundles/org.eclipse.capra.ui.notification/build.properties
diff --git a/org.eclipse.capra.ui.notification/plugin.xml b/bundles/org.eclipse.capra.ui.notification/plugin.xml
similarity index 100%
rename from org.eclipse.capra.ui.notification/plugin.xml
rename to bundles/org.eclipse.capra.ui.notification/plugin.xml
diff --git a/org.eclipse.capra.ui.notification/pom.xml b/bundles/org.eclipse.capra.ui.notification/pom.xml
similarity index 95%
rename from org.eclipse.capra.ui.notification/pom.xml
rename to bundles/org.eclipse.capra.ui.notification/pom.xml
index 69041af..fc228e6 100644
--- a/org.eclipse.capra.ui.notification/pom.xml
+++ b/bundles/org.eclipse.capra.ui.notification/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/CapraNotificationHelper.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/CapraNotificationHelper.java
similarity index 100%
rename from org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/CapraNotificationHelper.java
rename to bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/CapraNotificationHelper.java
diff --git a/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/ChangeQuickFix.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/ChangeQuickFix.java
similarity index 100%
rename from org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/ChangeQuickFix.java
rename to bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/ChangeQuickFix.java
diff --git a/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/DeleteQuickFix.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/DeleteQuickFix.java
similarity index 100%
rename from org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/DeleteQuickFix.java
rename to bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/DeleteQuickFix.java
diff --git a/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/MarkerResolutionGenerator.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/MarkerResolutionGenerator.java
similarity index 100%
rename from org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/MarkerResolutionGenerator.java
rename to bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/MarkerResolutionGenerator.java
diff --git a/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/RenameOrMoveQuickFix.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/RenameOrMoveQuickFix.java
similarity index 100%
rename from org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/RenameOrMoveQuickFix.java
rename to bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/RenameOrMoveQuickFix.java
diff --git a/org.eclipse.capra.ui.office/.classpath b/bundles/org.eclipse.capra.ui.office/.classpath
similarity index 100%
rename from org.eclipse.capra.ui.office/.classpath
rename to bundles/org.eclipse.capra.ui.office/.classpath
diff --git a/org.eclipse.capra.ui.office/.project b/bundles/org.eclipse.capra.ui.office/.project
similarity index 100%
rename from org.eclipse.capra.ui.office/.project
rename to bundles/org.eclipse.capra.ui.office/.project
diff --git a/org.eclipse.capra.ui.office/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.capra.ui.office/.settings/org.eclipse.core.resources.prefs
rename to bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.capra.ui.office/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.ui.office/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.ui.office/.settings/org.eclipse.m2e.core.prefs b/bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.capra.ui.office/.settings/org.eclipse.m2e.core.prefs
rename to bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.ui.office/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.ui.office/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.office/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.capra.ui.office/OSGI-INF/l10n/bundle.properties
rename to bundles/org.eclipse.capra.ui.office/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.capra.ui.office/build.properties b/bundles/org.eclipse.capra.ui.office/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.office/build.properties
rename to bundles/org.eclipse.capra.ui.office/build.properties
diff --git a/org.eclipse.capra.ui.office/icons/capra.png b/bundles/org.eclipse.capra.ui.office/icons/capra.png
similarity index 100%
rename from org.eclipse.capra.ui.office/icons/capra.png
rename to bundles/org.eclipse.capra.ui.office/icons/capra.png
Binary files differ
diff --git a/org.eclipse.capra.ui.office/icons/selectionView.png b/bundles/org.eclipse.capra.ui.office/icons/selectionView.png
similarity index 100%
rename from org.eclipse.capra.ui.office/icons/selectionView.png
rename to bundles/org.eclipse.capra.ui.office/icons/selectionView.png
Binary files differ
diff --git a/org.eclipse.capra.ui.office/lib/poi-3.10.1-20140818.jar b/bundles/org.eclipse.capra.ui.office/lib/poi-3.10.1-20140818.jar
similarity index 100%
rename from org.eclipse.capra.ui.office/lib/poi-3.10.1-20140818.jar
rename to bundles/org.eclipse.capra.ui.office/lib/poi-3.10.1-20140818.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.office/lib/poi-ooxml-3.10.1-filtered.jar b/bundles/org.eclipse.capra.ui.office/lib/poi-ooxml-3.10.1-filtered.jar
similarity index 100%
rename from org.eclipse.capra.ui.office/lib/poi-ooxml-3.10.1-filtered.jar
rename to bundles/org.eclipse.capra.ui.office/lib/poi-ooxml-3.10.1-filtered.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.office/lib/poi-ooxml-schemas-3.10.1-20140818.jar b/bundles/org.eclipse.capra.ui.office/lib/poi-ooxml-schemas-3.10.1-20140818.jar
similarity index 100%
rename from org.eclipse.capra.ui.office/lib/poi-ooxml-schemas-3.10.1-20140818.jar
rename to bundles/org.eclipse.capra.ui.office/lib/poi-ooxml-schemas-3.10.1-20140818.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.office/lib/xmlbeans-2.6.0.jar b/bundles/org.eclipse.capra.ui.office/lib/xmlbeans-2.6.0.jar
similarity index 100%
rename from org.eclipse.capra.ui.office/lib/xmlbeans-2.6.0.jar
rename to bundles/org.eclipse.capra.ui.office/lib/xmlbeans-2.6.0.jar
Binary files differ
diff --git a/org.eclipse.capra.ui.office/plugin.xml b/bundles/org.eclipse.capra.ui.office/plugin.xml
similarity index 100%
rename from org.eclipse.capra.ui.office/plugin.xml
rename to bundles/org.eclipse.capra.ui.office/plugin.xml
diff --git a/org.eclipse.capra.ui.office/pom.xml b/bundles/org.eclipse.capra.ui.office/pom.xml
similarity index 95%
rename from org.eclipse.capra.ui.office/pom.xml
rename to bundles/org.eclipse.capra.ui.office/pom.xml
index 2691c29..63a545c 100644
--- a/org.eclipse.capra.ui.office/pom.xml
+++ b/bundles/org.eclipse.capra.ui.office/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/Activator.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/Activator.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/Activator.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/Activator.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeFileNotSupportedException.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeFileNotSupportedException.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeFileNotSupportedException.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeFileNotSupportedException.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeObjectNotFound.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeObjectNotFound.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeObjectNotFound.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeObjectNotFound.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ClearSelectionHandler.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ClearSelectionHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ClearSelectionHandler.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ClearSelectionHandler.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/OpenFileHandler.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/OpenFileHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/OpenFileHandler.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/OpenFileHandler.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ShowObjectDetailsHandler.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ShowObjectDetailsHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ShowObjectDetailsHandler.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ShowObjectDetailsHandler.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraExcelRow.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraExcelRow.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraExcelRow.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraExcelRow.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraGoogleSheetsRow.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraGoogleSheetsRow.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraGoogleSheetsRow.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraGoogleSheetsRow.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraOfficeObject.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraOfficeObject.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraOfficeObject.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraOfficeObject.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraWordRequirement.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraWordRequirement.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraWordRequirement.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraWordRequirement.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/PreferenceInitializer.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/PreferenceInitializer.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/PreferenceInitializer.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/PreferenceInitializer.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/CapraOfficeUtils.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/CapraOfficeUtils.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/CapraOfficeUtils.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/CapraOfficeUtils.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficePropertyTester.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficePropertyTester.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficePropertyTester.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficePropertyTester.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeSourceProvider.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeSourceProvider.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeSourceProvider.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeSourceProvider.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeTransferType.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeTransferType.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeTransferType.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeTransferType.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/OfficeView.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/OfficeView.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/OfficeView.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/OfficeView.java
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/SelectSheetDynamicMenu.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/SelectSheetDynamicMenu.java
similarity index 100%
rename from org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/SelectSheetDynamicMenu.java
rename to bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/SelectSheetDynamicMenu.java
diff --git a/org.eclipse.capra.ui.plantuml/.classpath b/bundles/org.eclipse.capra.ui.plantuml/.classpath
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/.classpath
rename to bundles/org.eclipse.capra.ui.plantuml/.classpath
diff --git a/org.eclipse.capra.ui.plantuml/.gitignore b/bundles/org.eclipse.capra.ui.plantuml/.gitignore
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/.gitignore
rename to bundles/org.eclipse.capra.ui.plantuml/.gitignore
diff --git a/org.eclipse.capra.ui.plantuml/.project b/bundles/org.eclipse.capra.ui.plantuml/.project
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/.project
rename to bundles/org.eclipse.capra.ui.plantuml/.project
diff --git a/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/.settings/org.eclipse.core.resources.prefs
rename to bundles/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.ui.plantuml/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.plantuml/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.ui.plantuml/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.ui.plantuml/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.plantuml/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/OSGI-INF/l10n/bundle.properties
rename to bundles/org.eclipse.capra.ui.plantuml/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.capra.ui.plantuml/build.properties b/bundles/org.eclipse.capra.ui.plantuml/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/build.properties
rename to bundles/org.eclipse.capra.ui.plantuml/build.properties
diff --git a/org.eclipse.capra.ui.plantuml/plugin.xml b/bundles/org.eclipse.capra.ui.plantuml/plugin.xml
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/plugin.xml
rename to bundles/org.eclipse.capra.ui.plantuml/plugin.xml
diff --git a/org.eclipse.capra.ui.plantuml/pom.xml b/bundles/org.eclipse.capra.ui.plantuml/pom.xml
similarity index 95%
rename from org.eclipse.capra.ui.plantuml/pom.xml
rename to bundles/org.eclipse.capra.ui.plantuml/pom.xml
index 5f56d2f..1ca1e79 100644
--- a/org.eclipse.capra.ui.plantuml/pom.xml
+++ b/bundles/org.eclipse.capra.ui.plantuml/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java
rename to bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java
diff --git a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DiagramTextProviderHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DiagramTextProviderHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DiagramTextProviderHandler.java
rename to bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DiagramTextProviderHandler.java
diff --git a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DisplayInternalLinksHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DisplayInternalLinksHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DisplayInternalLinksHandler.java
rename to bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DisplayInternalLinksHandler.java
diff --git a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/SelectRelationshipsHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/SelectRelationshipsHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/SelectRelationshipsHandler.java
rename to bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/SelectRelationshipsHandler.java
diff --git a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleDisplayGraphHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleDisplayGraphHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleDisplayGraphHandler.java
rename to bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleDisplayGraphHandler.java
diff --git a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleTransitivityHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleTransitivityHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleTransitivityHandler.java
rename to bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleTransitivityHandler.java
diff --git a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/TransitivityDepthHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/TransitivityDepthHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/TransitivityDepthHandler.java
rename to bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/TransitivityDepthHandler.java
diff --git a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/VisualizationHelper.xtend b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/VisualizationHelper.xtend
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/VisualizationHelper.xtend
rename to bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/VisualizationHelper.xtend
diff --git a/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.VisualizationHelper.xtendbin b/bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.VisualizationHelper.xtendbin
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.VisualizationHelper.xtendbin
rename to bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.VisualizationHelper.xtendbin
Binary files differ
diff --git a/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.gitignore b/bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.gitignore
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.gitignore
rename to bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.gitignore
diff --git a/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/VisualizationHelper.java b/bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/VisualizationHelper.java
similarity index 100%
rename from org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/VisualizationHelper.java
rename to bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/VisualizationHelper.java
diff --git a/org.eclipse.capra.ui.zest/.classpath b/bundles/org.eclipse.capra.ui.zest/.classpath
similarity index 100%
rename from org.eclipse.capra.ui.zest/.classpath
rename to bundles/org.eclipse.capra.ui.zest/.classpath
diff --git a/org.eclipse.capra.ui.zest/.gitignore b/bundles/org.eclipse.capra.ui.zest/.gitignore
similarity index 100%
rename from org.eclipse.capra.ui.zest/.gitignore
rename to bundles/org.eclipse.capra.ui.zest/.gitignore
diff --git a/org.eclipse.capra.ui.zest/.project b/bundles/org.eclipse.capra.ui.zest/.project
similarity index 100%
rename from org.eclipse.capra.ui.zest/.project
rename to bundles/org.eclipse.capra.ui.zest/.project
diff --git a/org.eclipse.capra.ui.zest/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.zest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.ui.zest/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.ui.zest/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.ui.zest/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.zest/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.ui.zest/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.ui.zest/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.ui.zest/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.zest/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.capra.ui.zest/OSGI-INF/l10n/bundle.properties
rename to bundles/org.eclipse.capra.ui.zest/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.capra.ui.zest/build.properties b/bundles/org.eclipse.capra.ui.zest/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.zest/build.properties
rename to bundles/org.eclipse.capra.ui.zest/build.properties
diff --git a/org.eclipse.capra.ui.zest/icons/capra.png b/bundles/org.eclipse.capra.ui.zest/icons/capra.png
similarity index 100%
rename from org.eclipse.capra.ui.zest/icons/capra.png
rename to bundles/org.eclipse.capra.ui.zest/icons/capra.png
Binary files differ
diff --git a/org.eclipse.capra.ui.zest/plugin.xml b/bundles/org.eclipse.capra.ui.zest/plugin.xml
similarity index 100%
rename from org.eclipse.capra.ui.zest/plugin.xml
rename to bundles/org.eclipse.capra.ui.zest/plugin.xml
diff --git a/org.eclipse.capra.ui.zest/pom.xml b/bundles/org.eclipse.capra.ui.zest/pom.xml
similarity index 95%
rename from org.eclipse.capra.ui.zest/pom.xml
rename to bundles/org.eclipse.capra.ui.zest/pom.xml
index fa7cf56..fe2f540 100644
--- a/org.eclipse.capra.ui.zest/pom.xml
+++ b/bundles/org.eclipse.capra.ui.zest/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ToggleTransitivityHandler.java b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ToggleTransitivityHandler.java
similarity index 100%
rename from org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ToggleTransitivityHandler.java
rename to bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ToggleTransitivityHandler.java
diff --git a/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeContentProvider.java b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeContentProvider.java
similarity index 100%
rename from org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeContentProvider.java
rename to bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeContentProvider.java
diff --git a/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeLabelProvider.java b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeLabelProvider.java
similarity index 100%
rename from org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeLabelProvider.java
rename to bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeLabelProvider.java
diff --git a/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ZestView.java b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ZestView.java
similarity index 100%
rename from org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ZestView.java
rename to bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ZestView.java
diff --git a/org.eclipse.capra.ui/.classpath b/bundles/org.eclipse.capra.ui/.classpath
similarity index 100%
rename from org.eclipse.capra.ui/.classpath
rename to bundles/org.eclipse.capra.ui/.classpath
diff --git a/org.eclipse.capra.ui/.gitignore b/bundles/org.eclipse.capra.ui/.gitignore
similarity index 100%
rename from org.eclipse.capra.ui/.gitignore
rename to bundles/org.eclipse.capra.ui/.gitignore
diff --git a/org.eclipse.capra.ui/.project b/bundles/org.eclipse.capra.ui/.project
similarity index 100%
rename from org.eclipse.capra.ui/.project
rename to bundles/org.eclipse.capra.ui/.project
diff --git a/org.eclipse.capra.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.ui/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.capra.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.ui/CREDITS_FOR_LICENSE.txt b/bundles/org.eclipse.capra.ui/CREDITS_FOR_LICENSE.txt
similarity index 100%
rename from org.eclipse.capra.ui/CREDITS_FOR_LICENSE.txt
rename to bundles/org.eclipse.capra.ui/CREDITS_FOR_LICENSE.txt
diff --git a/org.eclipse.capra.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.ui/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.capra.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.ui/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.capra.ui/OSGI-INF/l10n/bundle.properties
rename to bundles/org.eclipse.capra.ui/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.capra.ui/build.properties b/bundles/org.eclipse.capra.ui/build.properties
similarity index 100%
rename from org.eclipse.capra.ui/build.properties
rename to bundles/org.eclipse.capra.ui/build.properties
diff --git a/org.eclipse.capra.ui/contexts.xml b/bundles/org.eclipse.capra.ui/contexts.xml
similarity index 100%
rename from org.eclipse.capra.ui/contexts.xml
rename to bundles/org.eclipse.capra.ui/contexts.xml
diff --git a/org.eclipse.capra.ui/icons/capra.png b/bundles/org.eclipse.capra.ui/icons/capra.png
similarity index 100%
rename from org.eclipse.capra.ui/icons/capra.png
rename to bundles/org.eclipse.capra.ui/icons/capra.png
Binary files differ
diff --git a/org.eclipse.capra.ui/icons/selectionView.png b/bundles/org.eclipse.capra.ui/icons/selectionView.png
similarity index 100%
rename from org.eclipse.capra.ui/icons/selectionView.png
rename to bundles/org.eclipse.capra.ui/icons/selectionView.png
Binary files differ
diff --git a/org.eclipse.capra.ui/plugin.xml b/bundles/org.eclipse.capra.ui/plugin.xml
similarity index 100%
rename from org.eclipse.capra.ui/plugin.xml
rename to bundles/org.eclipse.capra.ui/plugin.xml
diff --git a/org.eclipse.capra.ui/pom.xml b/bundles/org.eclipse.capra.ui/pom.xml
similarity index 95%
rename from org.eclipse.capra.ui/pom.xml
rename to bundles/org.eclipse.capra.ui/pom.xml
index cd419f0..6baf67e 100644
--- a/org.eclipse.capra.ui/pom.xml
+++ b/bundles/org.eclipse.capra.ui/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui/schema/org.eclipse.capra.ui.transfers.exsd b/bundles/org.eclipse.capra.ui/schema/org.eclipse.capra.ui.transfers.exsd
similarity index 100%
rename from org.eclipse.capra.ui/schema/org.eclipse.capra.ui.transfers.exsd
rename to bundles/org.eclipse.capra.ui/schema/org.eclipse.capra.ui.transfers.exsd
diff --git a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java
similarity index 100%
rename from org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java
rename to bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java
diff --git a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/AddtoSelection.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/AddtoSelection.java
similarity index 100%
rename from org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/AddtoSelection.java
rename to bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/AddtoSelection.java
diff --git a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/ClearSelectionHandler.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/ClearSelectionHandler.java
similarity index 100%
rename from org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/ClearSelectionHandler.java
rename to bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/ClearSelectionHandler.java
diff --git a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/RemoveSelectionHandler.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/RemoveSelectionHandler.java
similarity index 100%
rename from org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/RemoveSelectionHandler.java
rename to bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/RemoveSelectionHandler.java
diff --git a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/helpers/TraceCreationHelper.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/helpers/TraceCreationHelper.java
similarity index 100%
rename from org.eclipse.capra.ui/src/org/eclipse/capra/ui/helpers/TraceCreationHelper.java
rename to bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/helpers/TraceCreationHelper.java
diff --git a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/perspective/CapraPerspective.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/perspective/CapraPerspective.java
similarity index 100%
rename from org.eclipse.capra.ui/src/org/eclipse/capra/ui/perspective/CapraPerspective.java
rename to bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/perspective/CapraPerspective.java
diff --git a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/preferences/CapraPreferences.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/preferences/CapraPreferences.java
similarity index 100%
rename from org.eclipse.capra.ui/src/org/eclipse/capra/ui/preferences/CapraPreferences.java
rename to bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/preferences/CapraPreferences.java
diff --git a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/views/SelectionView.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/views/SelectionView.java
similarity index 100%
rename from org.eclipse.capra.ui/src/org/eclipse/capra/ui/views/SelectionView.java
rename to bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/views/SelectionView.java
diff --git a/org.eclipse.capra.core.feature/.project b/features/org.eclipse.capra.core.feature/.project
similarity index 100%
rename from org.eclipse.capra.core.feature/.project
rename to features/org.eclipse.capra.core.feature/.project
diff --git a/org.eclipse.capra.core.feature/build.properties b/features/org.eclipse.capra.core.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.core.feature/build.properties
rename to features/org.eclipse.capra.core.feature/build.properties
diff --git a/org.eclipse.capra.core.feature/epl-v10.html b/features/org.eclipse.capra.core.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.core.feature/epl-v10.html
rename to features/org.eclipse.capra.core.feature/epl-v10.html
diff --git a/org.eclipse.capra.core.feature/feature.xml b/features/org.eclipse.capra.core.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.core.feature/feature.xml
rename to features/org.eclipse.capra.core.feature/feature.xml
diff --git a/org.eclipse.capra.core.feature/pom.xml b/features/org.eclipse.capra.core.feature/pom.xml
similarity index 90%
rename from org.eclipse.capra.core.feature/pom.xml
rename to features/org.eclipse.capra.core.feature/pom.xml
index da92ac8..d67ca0f 100644
--- a/org.eclipse.capra.core.feature/pom.xml
+++ b/features/org.eclipse.capra.core.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.feature/.project b/features/org.eclipse.capra.feature/.project
similarity index 100%
rename from org.eclipse.capra.feature/.project
rename to features/org.eclipse.capra.feature/.project
diff --git a/org.eclipse.capra.feature/build.properties b/features/org.eclipse.capra.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.feature/build.properties
rename to features/org.eclipse.capra.feature/build.properties
diff --git a/org.eclipse.capra.feature/epl-v10.html b/features/org.eclipse.capra.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.feature/epl-v10.html
rename to features/org.eclipse.capra.feature/epl-v10.html
diff --git a/org.eclipse.capra.feature/feature.xml b/features/org.eclipse.capra.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.feature/feature.xml
rename to features/org.eclipse.capra.feature/feature.xml
diff --git a/org.eclipse.capra.feature/pom.xml b/features/org.eclipse.capra.feature/pom.xml
similarity index 90%
rename from org.eclipse.capra.feature/pom.xml
rename to features/org.eclipse.capra.feature/pom.xml
index 5bde0d6..3661cdd 100644
--- a/org.eclipse.capra.feature/pom.xml
+++ b/features/org.eclipse.capra.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.generic.feature/.project b/features/org.eclipse.capra.generic.feature/.project
similarity index 100%
rename from org.eclipse.capra.generic.feature/.project
rename to features/org.eclipse.capra.generic.feature/.project
diff --git a/org.eclipse.capra.generic.feature/build.properties b/features/org.eclipse.capra.generic.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.generic.feature/build.properties
rename to features/org.eclipse.capra.generic.feature/build.properties
diff --git a/org.eclipse.capra.generic.feature/epl-v10.html b/features/org.eclipse.capra.generic.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.generic.feature/epl-v10.html
rename to features/org.eclipse.capra.generic.feature/epl-v10.html
diff --git a/org.eclipse.capra.generic.feature/feature.xml b/features/org.eclipse.capra.generic.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.generic.feature/feature.xml
rename to features/org.eclipse.capra.generic.feature/feature.xml
diff --git a/org.eclipse.capra.generic.feature/pom.xml b/features/org.eclipse.capra.generic.feature/pom.xml
similarity index 90%
rename from org.eclipse.capra.generic.feature/pom.xml
rename to features/org.eclipse.capra.generic.feature/pom.xml
index 0d2e304..3a4b374 100644
--- a/org.eclipse.capra.generic.feature/pom.xml
+++ b/features/org.eclipse.capra.generic.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.cdt.feature/.project b/features/org.eclipse.capra.handler.cdt.feature/.project
similarity index 100%
rename from org.eclipse.capra.handler.cdt.feature/.project
rename to features/org.eclipse.capra.handler.cdt.feature/.project
diff --git a/org.eclipse.capra.handler.cdt.feature/build.properties b/features/org.eclipse.capra.handler.cdt.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.cdt.feature/build.properties
rename to features/org.eclipse.capra.handler.cdt.feature/build.properties
diff --git a/org.eclipse.capra.handler.cdt.feature/epl-v10.html b/features/org.eclipse.capra.handler.cdt.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.handler.cdt.feature/epl-v10.html
rename to features/org.eclipse.capra.handler.cdt.feature/epl-v10.html
diff --git a/org.eclipse.capra.handler.cdt.feature/feature.xml b/features/org.eclipse.capra.handler.cdt.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.handler.cdt.feature/feature.xml
rename to features/org.eclipse.capra.handler.cdt.feature/feature.xml
diff --git a/org.eclipse.capra.handler.cdt.feature/pom.xml b/features/org.eclipse.capra.handler.cdt.feature/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.cdt.feature/pom.xml
rename to features/org.eclipse.capra.handler.cdt.feature/pom.xml
index 1846eda..07db155 100644
--- a/org.eclipse.capra.handler.cdt.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.cdt.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.featureide.feature/.project b/features/org.eclipse.capra.handler.featureide.feature/.project
similarity index 100%
rename from org.eclipse.capra.handler.featureide.feature/.project
rename to features/org.eclipse.capra.handler.featureide.feature/.project
diff --git a/org.eclipse.capra.handler.featureide.feature/build.properties b/features/org.eclipse.capra.handler.featureide.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.featureide.feature/build.properties
rename to features/org.eclipse.capra.handler.featureide.feature/build.properties
diff --git a/org.eclipse.capra.handler.featureide.feature/epl-v10.html b/features/org.eclipse.capra.handler.featureide.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.handler.featureide.feature/epl-v10.html
rename to features/org.eclipse.capra.handler.featureide.feature/epl-v10.html
diff --git a/org.eclipse.capra.handler.featureide.feature/feature.xml b/features/org.eclipse.capra.handler.featureide.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.handler.featureide.feature/feature.xml
rename to features/org.eclipse.capra.handler.featureide.feature/feature.xml
diff --git a/org.eclipse.capra.handler.featureide.feature/pom.xml b/features/org.eclipse.capra.handler.featureide.feature/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.featureide.feature/pom.xml
rename to features/org.eclipse.capra.handler.featureide.feature/pom.xml
index 3b7bb3a..af688b0 100644
--- a/org.eclipse.capra.handler.featureide.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.featureide.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.hudson.feature/.project b/features/org.eclipse.capra.handler.hudson.feature/.project
similarity index 100%
rename from org.eclipse.capra.handler.hudson.feature/.project
rename to features/org.eclipse.capra.handler.hudson.feature/.project
diff --git a/org.eclipse.capra.handler.hudson.feature/build.properties b/features/org.eclipse.capra.handler.hudson.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.hudson.feature/build.properties
rename to features/org.eclipse.capra.handler.hudson.feature/build.properties
diff --git a/org.eclipse.capra.handler.hudson.feature/epl-v10.html b/features/org.eclipse.capra.handler.hudson.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.handler.hudson.feature/epl-v10.html
rename to features/org.eclipse.capra.handler.hudson.feature/epl-v10.html
diff --git a/org.eclipse.capra.handler.hudson.feature/feature.xml b/features/org.eclipse.capra.handler.hudson.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.handler.hudson.feature/feature.xml
rename to features/org.eclipse.capra.handler.hudson.feature/feature.xml
diff --git a/org.eclipse.capra.handler.hudson.feature/pom.xml b/features/org.eclipse.capra.handler.hudson.feature/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.hudson.feature/pom.xml
rename to features/org.eclipse.capra.handler.hudson.feature/pom.xml
index 03fe264..b044449 100644
--- a/org.eclipse.capra.handler.hudson.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.hudson.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.jdt.feature/.project b/features/org.eclipse.capra.handler.jdt.feature/.project
similarity index 100%
rename from org.eclipse.capra.handler.jdt.feature/.project
rename to features/org.eclipse.capra.handler.jdt.feature/.project
diff --git a/org.eclipse.capra.handler.jdt.feature/build.properties b/features/org.eclipse.capra.handler.jdt.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.jdt.feature/build.properties
rename to features/org.eclipse.capra.handler.jdt.feature/build.properties
diff --git a/org.eclipse.capra.handler.jdt.feature/epl-v10.html b/features/org.eclipse.capra.handler.jdt.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.handler.jdt.feature/epl-v10.html
rename to features/org.eclipse.capra.handler.jdt.feature/epl-v10.html
diff --git a/org.eclipse.capra.handler.jdt.feature/feature.xml b/features/org.eclipse.capra.handler.jdt.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.handler.jdt.feature/feature.xml
rename to features/org.eclipse.capra.handler.jdt.feature/feature.xml
diff --git a/org.eclipse.capra.handler.jdt.feature/pom.xml b/features/org.eclipse.capra.handler.jdt.feature/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.jdt.feature/pom.xml
rename to features/org.eclipse.capra.handler.jdt.feature/pom.xml
index 95c7c38..13ac763 100644
--- a/org.eclipse.capra.handler.jdt.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.jdt.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.office.feature/.project b/features/org.eclipse.capra.handler.office.feature/.project
similarity index 100%
rename from org.eclipse.capra.handler.office.feature/.project
rename to features/org.eclipse.capra.handler.office.feature/.project
diff --git a/org.eclipse.capra.handler.office.feature/build.properties b/features/org.eclipse.capra.handler.office.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.office.feature/build.properties
rename to features/org.eclipse.capra.handler.office.feature/build.properties
diff --git a/org.eclipse.capra.handler.office.feature/epl-v10.html b/features/org.eclipse.capra.handler.office.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.handler.office.feature/epl-v10.html
rename to features/org.eclipse.capra.handler.office.feature/epl-v10.html
diff --git a/org.eclipse.capra.handler.office.feature/feature.xml b/features/org.eclipse.capra.handler.office.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.handler.office.feature/feature.xml
rename to features/org.eclipse.capra.handler.office.feature/feature.xml
diff --git a/org.eclipse.capra.handler.office.feature/pom.xml b/features/org.eclipse.capra.handler.office.feature/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.office.feature/pom.xml
rename to features/org.eclipse.capra.handler.office.feature/pom.xml
index e0a64e4..3cc6b46 100644
--- a/org.eclipse.capra.handler.office.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.office.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.papyrus.feature/.project b/features/org.eclipse.capra.handler.papyrus.feature/.project
similarity index 100%
rename from org.eclipse.capra.handler.papyrus.feature/.project
rename to features/org.eclipse.capra.handler.papyrus.feature/.project
diff --git a/org.eclipse.capra.handler.papyrus.feature/build.properties b/features/org.eclipse.capra.handler.papyrus.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.papyrus.feature/build.properties
rename to features/org.eclipse.capra.handler.papyrus.feature/build.properties
diff --git a/org.eclipse.capra.handler.papyrus.feature/epl-v10.html b/features/org.eclipse.capra.handler.papyrus.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.handler.papyrus.feature/epl-v10.html
rename to features/org.eclipse.capra.handler.papyrus.feature/epl-v10.html
diff --git a/org.eclipse.capra.handler.papyrus.feature/feature.xml b/features/org.eclipse.capra.handler.papyrus.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.handler.papyrus.feature/feature.xml
rename to features/org.eclipse.capra.handler.papyrus.feature/feature.xml
diff --git a/org.eclipse.capra.handler.papyrus.feature/pom.xml b/features/org.eclipse.capra.handler.papyrus.feature/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.papyrus.feature/pom.xml
rename to features/org.eclipse.capra.handler.papyrus.feature/pom.xml
index 900cf1d..d387f78 100644
--- a/org.eclipse.capra.handler.papyrus.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.papyrus.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.php.feature/.project b/features/org.eclipse.capra.handler.php.feature/.project
similarity index 100%
rename from org.eclipse.capra.handler.php.feature/.project
rename to features/org.eclipse.capra.handler.php.feature/.project
diff --git a/org.eclipse.capra.handler.php.feature/build.properties b/features/org.eclipse.capra.handler.php.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.php.feature/build.properties
rename to features/org.eclipse.capra.handler.php.feature/build.properties
diff --git a/org.eclipse.capra.handler.php.feature/epl-v10.html b/features/org.eclipse.capra.handler.php.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.handler.php.feature/epl-v10.html
rename to features/org.eclipse.capra.handler.php.feature/epl-v10.html
diff --git a/org.eclipse.capra.handler.php.feature/feature.xml b/features/org.eclipse.capra.handler.php.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.handler.php.feature/feature.xml
rename to features/org.eclipse.capra.handler.php.feature/feature.xml
diff --git a/org.eclipse.capra.handler.php.feature/pom.xml b/features/org.eclipse.capra.handler.php.feature/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.php.feature/pom.xml
rename to features/org.eclipse.capra.handler.php.feature/pom.xml
index 48099e4..104a919 100644
--- a/org.eclipse.capra.handler.php.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.php.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.reqIf.feature/.project b/features/org.eclipse.capra.handler.reqIf.feature/.project
similarity index 100%
rename from org.eclipse.capra.handler.reqIf.feature/.project
rename to features/org.eclipse.capra.handler.reqIf.feature/.project
diff --git a/org.eclipse.capra.handler.reqIf.feature/build.properties b/features/org.eclipse.capra.handler.reqIf.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.reqIf.feature/build.properties
rename to features/org.eclipse.capra.handler.reqIf.feature/build.properties
diff --git a/org.eclipse.capra.handler.reqIf.feature/epl-v10.html b/features/org.eclipse.capra.handler.reqIf.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.handler.reqIf.feature/epl-v10.html
rename to features/org.eclipse.capra.handler.reqIf.feature/epl-v10.html
diff --git a/org.eclipse.capra.handler.reqIf.feature/feature.xml b/features/org.eclipse.capra.handler.reqIf.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.handler.reqIf.feature/feature.xml
rename to features/org.eclipse.capra.handler.reqIf.feature/feature.xml
diff --git a/org.eclipse.capra.handler.reqIf.feature/pom.xml b/features/org.eclipse.capra.handler.reqIf.feature/pom.xml
similarity index 91%
rename from org.eclipse.capra.handler.reqIf.feature/pom.xml
rename to features/org.eclipse.capra.handler.reqIf.feature/pom.xml
index 8a40e0c..7a4a699 100644
--- a/org.eclipse.capra.handler.reqIf.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.reqIf.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.feature/.project b/features/org.eclipse.capra.ui.feature/.project
similarity index 100%
rename from org.eclipse.capra.ui.feature/.project
rename to features/org.eclipse.capra.ui.feature/.project
diff --git a/org.eclipse.capra.ui.feature/build.properties b/features/org.eclipse.capra.ui.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.feature/build.properties
rename to features/org.eclipse.capra.ui.feature/build.properties
diff --git a/org.eclipse.capra.ui.feature/epl-v10.html b/features/org.eclipse.capra.ui.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.ui.feature/epl-v10.html
rename to features/org.eclipse.capra.ui.feature/epl-v10.html
diff --git a/org.eclipse.capra.ui.feature/feature.xml b/features/org.eclipse.capra.ui.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.ui.feature/feature.xml
rename to features/org.eclipse.capra.ui.feature/feature.xml
diff --git a/org.eclipse.capra.ui.feature/pom.xml b/features/org.eclipse.capra.ui.feature/pom.xml
similarity index 90%
rename from org.eclipse.capra.ui.feature/pom.xml
rename to features/org.eclipse.capra.ui.feature/pom.xml
index 3bdf010..d7ea2e2 100644
--- a/org.eclipse.capra.ui.feature/pom.xml
+++ b/features/org.eclipse.capra.ui.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.plantuml.feature/.project b/features/org.eclipse.capra.ui.plantuml.feature/.project
similarity index 100%
rename from org.eclipse.capra.ui.plantuml.feature/.project
rename to features/org.eclipse.capra.ui.plantuml.feature/.project
diff --git a/org.eclipse.capra.ui.plantuml.feature/build.properties b/features/org.eclipse.capra.ui.plantuml.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.plantuml.feature/build.properties
rename to features/org.eclipse.capra.ui.plantuml.feature/build.properties
diff --git a/org.eclipse.capra.ui.plantuml.feature/epl-v10.html b/features/org.eclipse.capra.ui.plantuml.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.ui.plantuml.feature/epl-v10.html
rename to features/org.eclipse.capra.ui.plantuml.feature/epl-v10.html
diff --git a/org.eclipse.capra.ui.plantuml.feature/feature.xml b/features/org.eclipse.capra.ui.plantuml.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.ui.plantuml.feature/feature.xml
rename to features/org.eclipse.capra.ui.plantuml.feature/feature.xml
diff --git a/org.eclipse.capra.ui.plantuml.feature/pom.xml b/features/org.eclipse.capra.ui.plantuml.feature/pom.xml
similarity index 91%
rename from org.eclipse.capra.ui.plantuml.feature/pom.xml
rename to features/org.eclipse.capra.ui.plantuml.feature/pom.xml
index 583b320..c253c48 100644
--- a/org.eclipse.capra.ui.plantuml.feature/pom.xml
+++ b/features/org.eclipse.capra.ui.plantuml.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.ui.zest.feature/.project b/features/org.eclipse.capra.ui.zest.feature/.project
similarity index 100%
rename from org.eclipse.capra.ui.zest.feature/.project
rename to features/org.eclipse.capra.ui.zest.feature/.project
diff --git a/org.eclipse.capra.ui.zest.feature/build.properties b/features/org.eclipse.capra.ui.zest.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.ui.zest.feature/build.properties
rename to features/org.eclipse.capra.ui.zest.feature/build.properties
diff --git a/org.eclipse.capra.ui.zest.feature/epl-v10.html b/features/org.eclipse.capra.ui.zest.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.capra.ui.zest.feature/epl-v10.html
rename to features/org.eclipse.capra.ui.zest.feature/epl-v10.html
diff --git a/org.eclipse.capra.ui.zest.feature/feature.xml b/features/org.eclipse.capra.ui.zest.feature/feature.xml
similarity index 100%
rename from org.eclipse.capra.ui.zest.feature/feature.xml
rename to features/org.eclipse.capra.ui.zest.feature/feature.xml
diff --git a/org.eclipse.capra.ui.zest.feature/pom.xml b/features/org.eclipse.capra.ui.zest.feature/pom.xml
similarity index 90%
rename from org.eclipse.capra.ui.zest.feature/pom.xml
rename to features/org.eclipse.capra.ui.zest.feature/pom.xml
index 3b39010..7a9e00e 100644
--- a/org.eclipse.capra.ui.zest.feature/pom.xml
+++ b/features/org.eclipse.capra.ui.zest.feature/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/pom.xml b/pom.xml
index 3d735a9..3e6156d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,54 +19,61 @@
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Capra</name>
+ <name>Capra</name>
<modules>
- <module>org.eclipse.capra.core</module>
- <module>org.eclipse.capra.core.feature</module>
- <module>org.eclipse.capra.documentation</module>
- <module>org.eclipse.capra.generic.persistence</module>
- <module>org.eclipse.capra.generic.priority</module>
- <module>org.eclipse.capra.generic.tracemodels</module>
- <module>org.eclipse.capra.generic.artifactmodel</module>
- <module>org.eclipse.capra.generic.feature</module>
- <module>org.eclipse.capra.handler.cdt</module>
- <module>org.eclipse.capra.handler.cdt.tests</module>
- <module>org.eclipse.capra.handler.cdt.feature</module>
- <module>org.eclipse.capra.handler.emf</module>
- <module>org.eclipse.capra.handler.file</module>
- <module>org.eclipse.capra.handler.gef</module>
- <module>org.eclipse.capra.handler.jdt</module>
- <module>org.eclipse.capra.handler.hudson</module>
- <module>org.eclipse.capra.handler.hudson.feature</module>
- <module>org.eclipse.capra.handler.office</module>
- <module>org.eclipse.capra.handler.office.feature</module>
- <module>org.eclipse.capra.handler.jdt.tests</module>
- <module>org.eclipse.capra.handler.jdt.feature</module>
- <module>org.eclipse.capra.handler.reqIf</module>
- <module>org.eclipse.capra.handler.marker</module>
- <module>org.eclipse.capra.handler.mylyn</module>
- <module>org.eclipse.capra.handler.reqIf.feature</module>
- <module>org.eclipse.capra.handler.papyrus</module>
- <module>org.eclipse.capra.handler.papyrus.feature</module>
- <module>org.eclipse.capra.handler.php</module>
- <module>org.eclipse.capra.handler.php.feature</module>
- <module>org.eclipse.capra.handler.uml</module>
- <module>org.eclipse.capra.ui</module>
- <module>org.eclipse.capra.ui.feature</module>
- <module>org.eclipse.capra.ui.notification</module>
- <module>org.eclipse.capra.ui.plantuml</module>
- <module>org.eclipse.capra.ui.plantuml.feature</module>
- <module>org.eclipse.capra.ui.cdt</module>
- <module>org.eclipse.capra.ui.jdt</module>
- <module>org.eclipse.capra.ui.office</module>
- <module>org.eclipse.capra.ui.drive</module>
- <module>org.eclipse.capra.ui.zest</module>
- <module>org.eclipse.capra.ui.zest.feature</module>
- <module>org.eclipse.capra.testsuite</module>
- <module>org.eclipse.capra.feature</module>
- <module>org.eclipse.capra.releng.target</module>
- <module>org.eclipse.capra.releng.p2</module>
+ <module>bundles/org.eclipse.capra.core</module>
+ <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.artifactmodel</module>
+ <module>bundles/org.eclipse.capra.handler.cdt</module>
+ <module>bundles/org.eclipse.capra.handler.emf</module>
+ <module>bundles/org.eclipse.capra.handler.file</module>
+ <module>bundles/org.eclipse.capra.handler.gef</module>
+ <module>bundles/org.eclipse.capra.handler.jdt</module>
+ <module>bundles/org.eclipse.capra.handler.hudson</module>
+ <module>bundles/org.eclipse.capra.handler.office</module>
+ <module>bundles/org.eclipse.capra.handler.reqIf</module>
+ <module>bundles/org.eclipse.capra.handler.marker</module>
+ <module>bundles/org.eclipse.capra.handler.mylyn</module>
+ <module>bundles/org.eclipse.capra.handler.papyrus</module>
+ <module>bundles/org.eclipse.capra.handler.php</module>
+ <module>bundles/org.eclipse.capra.handler.uml</module>
+ <module>bundles/org.eclipse.capra.ui</module>
+ <module>bundles/org.eclipse.capra.ui.notification</module>
+ <module>bundles/org.eclipse.capra.ui.plantuml</module>
+ <module>bundles/org.eclipse.capra.ui.cdt</module>
+ <module>bundles/org.eclipse.capra.ui.jdt</module>
+ <module>bundles/org.eclipse.capra.ui.office</module>
+ <module>bundles/org.eclipse.capra.ui.drive</module>
+ <module>bundles/org.eclipse.capra.ui.zest</module>
+
+ <!-- Tests -->
+ <module>tests/org.eclipse.capra.testsuite</module>
+ <module>tests/org.eclipse.capra.handler.cdt.tests</module>
+ <module>tests/org.eclipse.capra.handler.jdt.tests</module>
+
+ <!-- Features -->
+ <module>features/org.eclipse.capra.feature</module>
+ <module>features/org.eclipse.capra.core.feature</module>
+ <module>features/org.eclipse.capra.generic.feature</module>
+ <module>features/org.eclipse.capra.handler.cdt.feature</module>
+ <module>features/org.eclipse.capra.handler.hudson.feature</module>
+ <module>features/org.eclipse.capra.handler.office.feature</module>
+ <module>features/org.eclipse.capra.handler.jdt.feature</module>
+ <module>features/org.eclipse.capra.handler.reqIf.feature</module>
+ <module>features/org.eclipse.capra.handler.papyrus.feature</module>
+ <module>features/org.eclipse.capra.handler.php.feature</module>
+ <module>features/org.eclipse.capra.ui.feature</module>
+ <module>features/org.eclipse.capra.ui.plantuml.feature</module>
+ <module>features/org.eclipse.capra.ui.zest.feature</module>
+
+ <!-- Releng -->
+ <module>releng/org.eclipse.capra.releng.target</module>
+ <module>releng/org.eclipse.capra.releng.p2</module>
+
</modules>
<properties>
diff --git a/org.eclipse.capra.releng.p2/.project b/releng/org.eclipse.capra.releng.p2/.project
similarity index 100%
rename from org.eclipse.capra.releng.p2/.project
rename to releng/org.eclipse.capra.releng.p2/.project
diff --git a/org.eclipse.capra.releng.p2/category.xml b/releng/org.eclipse.capra.releng.p2/category.xml
similarity index 100%
rename from org.eclipse.capra.releng.p2/category.xml
rename to releng/org.eclipse.capra.releng.p2/category.xml
diff --git a/org.eclipse.capra.releng.p2/pom.xml b/releng/org.eclipse.capra.releng.p2/pom.xml
similarity index 97%
rename from org.eclipse.capra.releng.p2/pom.xml
rename to releng/org.eclipse.capra.releng.p2/pom.xml
index f954cc0..3f52f62 100644
--- a/org.eclipse.capra.releng.p2/pom.xml
+++ b/releng/org.eclipse.capra.releng.p2/pom.xml
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.releng.p2/siteTemplate/index.html b/releng/org.eclipse.capra.releng.p2/siteTemplate/index.html
similarity index 100%
rename from org.eclipse.capra.releng.p2/siteTemplate/index.html
rename to releng/org.eclipse.capra.releng.p2/siteTemplate/index.html
diff --git a/org.eclipse.capra.releng.target/.project b/releng/org.eclipse.capra.releng.target/.project
similarity index 100%
rename from org.eclipse.capra.releng.target/.project
rename to releng/org.eclipse.capra.releng.target/.project
diff --git a/org.eclipse.capra.releng.target/2018-09.tpd b/releng/org.eclipse.capra.releng.target/2018-09.tpd
similarity index 100%
rename from org.eclipse.capra.releng.target/2018-09.tpd
rename to releng/org.eclipse.capra.releng.target/2018-09.tpd
diff --git a/org.eclipse.capra.releng.target/Neon.tpd b/releng/org.eclipse.capra.releng.target/Neon.tpd
similarity index 100%
rename from org.eclipse.capra.releng.target/Neon.tpd
rename to releng/org.eclipse.capra.releng.target/Neon.tpd
diff --git a/org.eclipse.capra.releng.target/Oxygen.tpd b/releng/org.eclipse.capra.releng.target/Oxygen.tpd
similarity index 100%
rename from org.eclipse.capra.releng.target/Oxygen.tpd
rename to releng/org.eclipse.capra.releng.target/Oxygen.tpd
diff --git a/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target b/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
similarity index 100%
rename from org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
rename to releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
diff --git a/org.eclipse.capra.releng.target/pom.xml b/releng/org.eclipse.capra.releng.target/pom.xml
similarity index 93%
rename from org.eclipse.capra.releng.target/pom.xml
rename to releng/org.eclipse.capra.releng.target/pom.xml
index 0158a1e..606bf67 100644
--- a/org.eclipse.capra.releng.target/pom.xml
+++ b/releng/org.eclipse.capra.releng.target/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.releng.target/readme.md b/releng/org.eclipse.capra.releng.target/readme.md
similarity index 100%
rename from org.eclipse.capra.releng.target/readme.md
rename to releng/org.eclipse.capra.releng.target/readme.md
diff --git a/org.eclipse.capra.handler.cdt.tests/.classpath b/tests/org.eclipse.capra.handler.cdt.tests/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.cdt.tests/.classpath
rename to tests/org.eclipse.capra.handler.cdt.tests/.classpath
diff --git a/org.eclipse.capra.handler.cdt.tests/.project b/tests/org.eclipse.capra.handler.cdt.tests/.project
similarity index 100%
rename from org.eclipse.capra.handler.cdt.tests/.project
rename to tests/org.eclipse.capra.handler.cdt.tests/.project
diff --git a/org.eclipse.capra.handler.cdt.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.capra.handler.cdt.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.cdt.tests/.settings/org.eclipse.jdt.core.prefs
rename to tests/org.eclipse.capra.handler.cdt.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
rename to tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.cdt.tests/build.properties b/tests/org.eclipse.capra.handler.cdt.tests/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.cdt.tests/build.properties
rename to tests/org.eclipse.capra.handler.cdt.tests/build.properties
diff --git a/org.eclipse.capra.handler.cdt.tests/pom.xml b/tests/org.eclipse.capra.handler.cdt.tests/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.cdt.tests/pom.xml
rename to tests/org.eclipse.capra.handler.cdt.tests/pom.xml
index 00a61e5..5a9e610 100644
--- a/org.eclipse.capra.handler.cdt.tests/pom.xml
+++ b/tests/org.eclipse.capra.handler.cdt.tests/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTAnnotateTest.java b/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTAnnotateTest.java
similarity index 100%
rename from org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTAnnotateTest.java
rename to tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTAnnotateTest.java
diff --git a/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTCommentUpdateTest.java b/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTCommentUpdateTest.java
similarity index 100%
rename from org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTCommentUpdateTest.java
rename to tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTCommentUpdateTest.java
diff --git a/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/TestUtil.java b/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/TestUtil.java
similarity index 100%
rename from org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/TestUtil.java
rename to tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/TestUtil.java
diff --git a/org.eclipse.capra.handler.jdt.tests/.classpath b/tests/org.eclipse.capra.handler.jdt.tests/.classpath
similarity index 100%
rename from org.eclipse.capra.handler.jdt.tests/.classpath
rename to tests/org.eclipse.capra.handler.jdt.tests/.classpath
diff --git a/org.eclipse.capra.handler.jdt.tests/.project b/tests/org.eclipse.capra.handler.jdt.tests/.project
similarity index 100%
rename from org.eclipse.capra.handler.jdt.tests/.project
rename to tests/org.eclipse.capra.handler.jdt.tests/.project
diff --git a/org.eclipse.capra.handler.jdt.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.capra.handler.jdt.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.handler.jdt.tests/.settings/org.eclipse.jdt.core.prefs
rename to tests/org.eclipse.capra.handler.jdt.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
rename to tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.handler.jdt.tests/build.properties b/tests/org.eclipse.capra.handler.jdt.tests/build.properties
similarity index 100%
rename from org.eclipse.capra.handler.jdt.tests/build.properties
rename to tests/org.eclipse.capra.handler.jdt.tests/build.properties
diff --git a/org.eclipse.capra.handler.jdt.tests/pom.xml b/tests/org.eclipse.capra.handler.jdt.tests/pom.xml
similarity index 95%
rename from org.eclipse.capra.handler.jdt.tests/pom.xml
rename to tests/org.eclipse.capra.handler.jdt.tests/pom.xml
index 405407b..6b50844 100644
--- a/org.eclipse.capra.handler.jdt.tests/pom.xml
+++ b/tests/org.eclipse.capra.handler.jdt.tests/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/JDTAnnotateTest.java b/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/JDTAnnotateTest.java
similarity index 100%
rename from org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/JDTAnnotateTest.java
rename to tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/JDTAnnotateTest.java
diff --git a/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/TestUtil.java b/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/TestUtil.java
similarity index 100%
rename from org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/TestUtil.java
rename to tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/TestUtil.java
diff --git a/org.eclipse.capra.testsuite/.classpath b/tests/org.eclipse.capra.testsuite/.classpath
similarity index 100%
rename from org.eclipse.capra.testsuite/.classpath
rename to tests/org.eclipse.capra.testsuite/.classpath
diff --git a/org.eclipse.capra.testsuite/.gitignore b/tests/org.eclipse.capra.testsuite/.gitignore
similarity index 100%
rename from org.eclipse.capra.testsuite/.gitignore
rename to tests/org.eclipse.capra.testsuite/.gitignore
diff --git a/org.eclipse.capra.testsuite/.project b/tests/org.eclipse.capra.testsuite/.project
similarity index 100%
rename from org.eclipse.capra.testsuite/.project
rename to tests/org.eclipse.capra.testsuite/.project
diff --git a/org.eclipse.capra.testsuite/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.capra.testsuite/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.capra.testsuite/.settings/org.eclipse.jdt.core.prefs
rename to tests/org.eclipse.capra.testsuite/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
rename to tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
diff --git a/org.eclipse.capra.testsuite/build.properties b/tests/org.eclipse.capra.testsuite/build.properties
similarity index 100%
rename from org.eclipse.capra.testsuite/build.properties
rename to tests/org.eclipse.capra.testsuite/build.properties
diff --git a/org.eclipse.capra.testsuite/plugin.xml b/tests/org.eclipse.capra.testsuite/plugin.xml
similarity index 100%
rename from org.eclipse.capra.testsuite/plugin.xml
rename to tests/org.eclipse.capra.testsuite/plugin.xml
diff --git a/org.eclipse.capra.testsuite/pom.xml b/tests/org.eclipse.capra.testsuite/pom.xml
similarity index 95%
rename from org.eclipse.capra.testsuite/pom.xml
rename to tests/org.eclipse.capra.testsuite/pom.xml
index d6bc3f5..cc05d44 100644
--- a/org.eclipse.capra.testsuite/pom.xml
+++ b/tests/org.eclipse.capra.testsuite/pom.xml
@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<groupId>org.eclipse.capra</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestCreateTrace.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestCreateTrace.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestCreateTrace.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestCreateTrace.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestDefaultPriorityHandler.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestDefaultPriorityHandler.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestDefaultPriorityHandler.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestDefaultPriorityHandler.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestGraphicalVisualization.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestGraphicalVisualization.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestGraphicalVisualization.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestGraphicalVisualization.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestHelper.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestHelper.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestHelper.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestHelper.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestRetry.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestRetry.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestRetry.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestRetry.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestTraceabiltyMatrix.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestTraceabiltyMatrix.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestTraceabiltyMatrix.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestTraceabiltyMatrix.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestUiExtensionPoint.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestUiExtensionPoint.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestUiExtensionPoint.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestUiExtensionPoint.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/extension/UiTransferExtensionDummy.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/extension/UiTransferExtensionDummy.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/extension/UiTransferExtensionDummy.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/extension/UiTransferExtensionDummy.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationCMethod.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationCMethod.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationCMethod.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationCMethod.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationEObject.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationEObject.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationEObject.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationEObject.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationFile.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationFile.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationFile.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationFile.java
diff --git a/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationJavaMethod.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationJavaMethod.java
similarity index 100%
rename from org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationJavaMethod.java
rename to tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationJavaMethod.java
