Merge branch 'master' of ssh://git.eclipse.org:29418/bpel/org.eclipse.bpel
diff --git a/features/pom.xml b/features/pom.xml
index 017e3a1..0ee98cc 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,7 +18,7 @@
 		<module>org.eclipse.bpel.source.feature</module>

 		<!-- <module>org.eclipse.bpel.tests.feature</module> -->

 		<module>org.eclipse.bpel.apache.ode.runtime.feature</module>

-		<module>org.eclipse.bpel.jboss.riftsaw.runtime.feature</module>

+		<!--  <module>org.eclipse.bpel.jboss.riftsaw.runtime.feature</module> -->

 	</modules>

 </project>

 	

diff --git a/plugins/org.eclipse.bpel.common.ui.noEmbeddedEditors/schema/paletteAdditions.exsd b/plugins/org.eclipse.bpel.common.ui.noEmbeddedEditors/schema/paletteAdditions.exsd
index 17927e1..1536423 100644
--- a/plugins/org.eclipse.bpel.common.ui.noEmbeddedEditors/schema/paletteAdditions.exsd
+++ b/plugins/org.eclipse.bpel.common.ui.noEmbeddedEditors/schema/paletteAdditions.exsd
@@ -3,7 +3,7 @@
 <schema targetNamespace="org.eclipse.bpel.common.ui">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.bpel.common.ui" id="paletteAdditions" name="Palette Additions"/>
+         <meta.schema plugin="org.eclipse.bpel.common.ui" id="org.eclipse.bpel.common.ui.paletteAdditions" name="Palette Additions"/>
       </appInfo>
       <documentation>
          This exension point allows for contributing BPEL pallette items. You can either create an individual addition for each palette element or you can create a bulk addition by specifying a palette provider.
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 595e489..dafc7a3 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -34,7 +34,6 @@
 				<module>org.eclipse.bpel.common.model</module>
 				<module>org.eclipse.bpel.common.ui</module>
 				<module>org.eclipse.bpel.common.wsdl</module>
-				<module>org.eclipse.bpel.jboss.riftsaw.runtime</module>
 				<module>org.eclipse.bpel.model</module>
 				<module>org.eclipse.bpel.runtimes</module>
 				<module>org.eclipse.bpel.ui</module>
@@ -63,7 +62,6 @@
 				<module>org.eclipse.bpel.common.model</module>
 				<module>org.eclipse.bpel.common.ui</module>
 				<module>org.eclipse.bpel.common.wsdl</module>
-				<module>org.eclipse.bpel.jboss.riftsaw.runtime</module>
 				<module>org.eclipse.bpel.model</module>
 				<module>org.eclipse.bpel.runtimes</module>
 				<module>org.eclipse.bpel.ui</module>
@@ -92,7 +90,6 @@
 				<module>org.eclipse.bpel.common.model</module>
 				<module>org.eclipse.bpel.common.ui.noEmbeddedEditors</module>
 				<module>org.eclipse.bpel.common.wsdl</module>
-				<module>org.eclipse.bpel.jboss.riftsaw.runtime</module>
 				<module>org.eclipse.bpel.model</module>
 				<module>org.eclipse.bpel.runtimes</module>
 				<module>org.eclipse.bpel.ui.noEmbeddedEditors</module>