Update reactor pom

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1695282 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index d680c7d..d9ee246 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,6 @@
     <modules>
         <module>bundlerepository</module>
         <module>bundlerepository.osgi-ct</module>
-        <module>bundleplugin</module>
         <module>configadmin</module>
         <module>deploymentadmin</module>
         <module>eventadmin</module>
@@ -59,12 +58,20 @@
         <module>prefs</module>
         <module>resolver</module>
         <module>scr</module>
-        <module>scrplugin</module>
         <module>shell</module>
         <module>shell.tui</module>
         <module>shell.gui</module>
         <module>shell.gui.plugin</module>
         <module>shell.remote</module>
+        
+        <module>tools/maven-bundle-plugin</module>
+        <module>tools/maven-scr-plugin</module>
+        <module>tools/org.apache.felix.scr.annotations</module>
+        <module>tools/org.apache.felix.scr.ant</module>
+        <module>tools/org.apache.felix.scr.bnd</module>
+        <module>tools/org.apache.felix.scr.ds-annotations</module>
+        <module>tools/org.apache.felix.scr.generator</module>
+
         <module>transaction</module>
         <module>upnp</module>
         <module>useradmin</module>
diff --git a/tools/scrplugin/pom.xml b/tools/scrplugin/pom.xml
deleted file mode 100644
index e23f80a..0000000
--- a/tools/scrplugin/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-    http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License. 
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>scr-plugin-reactor</artifactId>
-    <version>1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>Maven SCR Plugin/Task support reactor</name>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scrplugin</developerConnection>
-        <url>http://svn.apache.org/repos/asf/felix/scrplugin</url>
-    </scm>
-
-    <modules>
-        <module>generator</module>
-        <module>annotations</module>
-        <module>ds-annotations</module>
-        <module>maven-scr-plugin</module>
-        <module>scrtask</module>
-        <module>bnd-scr-plugin</module>
-    </modules>
-
-</project>