extension point servings fixed
diff --git a/org.eclipse.emf.refactor.metrics.papyrus/build.properties b/org.eclipse.emf.refactor.metrics.papyrus/build.properties
index 34d2e4d..e9863e2 100644
--- a/org.eclipse.emf.refactor.metrics.papyrus/build.properties
+++ b/org.eclipse.emf.refactor.metrics.papyrus/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.xml
diff --git a/org.eclipse.emf.refactor.metrics.papyrus/plugin.xml b/org.eclipse.emf.refactor.metrics.papyrus/plugin.xml
new file mode 100644
index 0000000..42bae56
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.papyrus/plugin.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         id="org.eclipse.emf.refactor.papyrus.menu"
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="true"
+            locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+         <menu
+               id="org.eclipse.emf.refactor.papyrus.menu"
+               label="EMF Quality Assurance">
+            <command
+                  commandId="org.eclipse.emf.refactor.metrics.papyrus.calculateMetricsOnElementCommand"
+                  label="Calculate Configured Metrics (on element)"
+                  style="push">
+               <visibleWhen 
+                     checkEnabled="true">
+                  <iterate
+                        ifEmpty="false">
+                     <or>
+                     	<instanceof
+                           value="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
+                     	</instanceof>
+                     	<instanceof
+                           value="org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem">
+                     	</instanceof>
+                     </or>
+                  </iterate>
+               </visibleWhen>
+            </command>
+            <command
+                  commandId="org.eclipse.emf.refactor.metrics.papyrus.calculateMetricsTransitivelyCommand"
+                  label="Calculate Configured Metrics (transitively)"
+                  style="push">
+               <visibleWhen
+                     checkEnabled="true">
+                  <iterate
+                        ifEmpty="false">
+                     <or>
+                     	<instanceof
+                           value="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
+                     	</instanceof>
+                     	<instanceof
+                           value="org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem">
+                     	</instanceof>
+                     </or>
+                  </iterate>
+               </visibleWhen>
+            </command>
+            <command
+                  commandId="org.eclipse.emf.refactor.metrics.papyrus.generateNewMetricJavaCommand"
+                  label="Generate New Metric (specified in Java)"
+                  style="push">
+               <visibleWhen
+                     checkEnabled="true">
+                  <iterate
+                        ifEmpty="false">
+                     <or>
+                     	<instanceof
+                           value="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
+                     	</instanceof>
+                     	<instanceof
+                           value="org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem">
+                     	</instanceof>
+                     </or>
+                  </iterate>
+               </visibleWhen>
+            </command>
+            <command
+                  commandId="org.eclipse.emf.refactor.metrics.papyrus.generateNewMetricCompositeCommand"
+                  label="Generate New Metric (compositional)"
+                  style="push">
+               <visibleWhen
+                     checkEnabled="true">
+                  <iterate
+                        ifEmpty="false">
+                     <or>
+                     	<instanceof
+                           value="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
+                     	</instanceof>
+                     	<instanceof
+                           value="org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem">
+                     	</instanceof>
+                     </or>
+                  </iterate>
+               </visibleWhen>
+            </command>
+         </menu>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            id="org.eclipse.emf.refactor.metrics.papyrus.calculateMetricsOnElementCommand"
+            name="CalculateMetricsOnElementCommand">
+      </command>
+      <command
+            id="org.eclipse.emf.refactor.metrics.papyrus.calculateMetricsTransitivelyCommand"
+            name="CalculateMetricsTransitivelyCommand">
+      </command>
+      <command
+            id="org.eclipse.emf.refactor.metrics.papyrus.generateNewMetricJavaCommand"
+            name="GenerateNewMetricJavaCommand">
+      </command>
+      <command
+            id="org.eclipse.emf.refactor.metrics.papyrus.generateNewMetricCompositeCommand"
+            name="GenerateNewMetricCompositeCommand">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.emf.refactor.metrics.papyrus.handler.CalculateMetricsOnElementCommandHandler"
+            commandId="org.eclipse.emf.refactor.metrics.papyrus.calculateMetricsOnElementCommand">
+      </handler>
+      <handler
+            class="org.eclipse.emf.refactor.metrics.papyrus.handler.CalculateMetricsTransitivelyCommandHandler"
+            commandId="org.eclipse.emf.refactor.metrics.papyrus.calculateMetricsTransitivelyCommand">
+      </handler>
+      <handler
+            class="org.eclipse.emf.refactor.metrics.papyrus.handler.GenerateNewMetricJavaCommandHandler"
+            commandId="org.eclipse.emf.refactor.metrics.papyrus.generateNewMetricJavaCommand">
+      </handler>
+      <handler
+            class="org.eclipse.emf.refactor.metrics.papyrus.handler.GenerateNewMetricCompositeCommandHandler"
+            commandId="org.eclipse.emf.refactor.metrics.papyrus.generateNewMetricCompositeCommand">
+      </handler>
+   </extension>
+</plugin>