diff --git a/core/pom.xml b/core/pom.xml
index d8452a69..299b5610 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,12 +7,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-ws-core</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Spring WS Core</name>
     <description>Spring Web Services Core package.</description>
     <profiles>
         <profile>
-            <id>jdk14-jdk15</id>
+            <id>jdk15</id>
             <activation>
                 <jdk>!1.6</jdk>
             </activation>
@@ -40,34 +40,19 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.1</version>
                 <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.springframework.bundle.ws.core</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.ws*;version="${pom.version}"</Export-Package>
-                        <Import-Package>
-                            org.apache.commons.logging*,
-                            javax.activation*,
-                            javax.servlet*,
-                            javax.xml.namespace*,
-                            javax.xml.parsers*,
-                            javax.xml.stream*,
-                            javax.xml.transform*,
-                            org.xml.sax*,
-                            org.w3c.dom*,
-                            org.springframework.xml*;version="[${pom.version},${pom.version}]",
-                            org.springframework.oxm*;version="[${pom.version},${pom.version}]",
-                            org.springframework.ws*;version="[${pom.version},${pom.version}]",
-                            org.springframework*;version="[2.0,4.0)",
-                            *;resolution:=optional
-                        </Import-Package>
-                        <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
-                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
-                    </instructions>
+                    <excludes>
+                        <!--TODO: include-->
+                        <exclude>org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/core/template.mf b/core/template.mf
new file mode 100644
index 00000000..a9335b5e
--- /dev/null
+++ b/core/template.mf
@@ -0,0 +1,37 @@
+Bundle-SymbolicName: org.springframework.ws
+Bundle-Name: Spring Web Services Core
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Template: 
+ javax.activation.*;version="[1.1.0, 2.0.0)",
+ javax.servlet.*;version="[2.4.0, 3.0.0)",
+ javax.wsdl.*;version="[1.6.1, 2.0.0)";resolution:=optional,
+ javax.xml.namespace.*;version="0",
+ javax.xml.parsers.*;version="0",
+ javax.xml.transform.*;version="0",
+ javax.xml.xpath.*;version="0",
+ javax.xml.soap.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ javax.xml.stream.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ nu.xom.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ org.apache.axiom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
+ org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
+ org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+ org.dom4j.*;version="[1.6.1, 2.0.0)";resolution:=optional,
+ org.jdom.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ org.springframework.aop.*;version="[3.0.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.oxm.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.stereotype.*;version="[3.0.0, 4.0.0)",
+ org.springframework.validation.*;version="[3.0.0, 4.0.0)",
+ org.springframework.web.*;version="[3.0.0, 4.0.0)",
+ org.springframework.xml.*;version="[${version}, ${version}]",
+ org.w3c.dom.*;version="0",
+ org.xml.sax.*;version="0"
+Ignored-Existing-Headers: 
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/parent/pom.xml b/parent/pom.xml
index b8b8eb73..ac6ecc51 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -49,12 +49,19 @@
             <layout>legacy</layout>
         </repository>
     </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>com.springsource.repository.bundles.release</id>
+            <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+            <url>http://repository.springsource.com/maven/bundles/release/</url>
+        </pluginRepository>
+    </pluginRepositories>
     <build>
         <extensions>
             <extension>
-                <groupId>org.springframework.aws</groupId>
-                <artifactId>spring-aws-maven</artifactId>
-                <version>1.2.2</version>
+                <groupId>org.springframework.build.aws</groupId>
+                <artifactId>org.springframework.build.aws.maven</artifactId>
+                <version>2.0.0.RELEASE</version>
             </extension>
         </extensions>
         <pluginManagement>
@@ -80,15 +87,24 @@
                     <version>2.3</version>
                     <configuration>
                         <archive>
-                            <manifest>
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            </manifest>
-                            <manifestEntries>
-                                <Spring-WS-Version>${pom.version}</Spring-WS-Version>
-                            </manifestEntries>
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                         </archive>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>com.springsource.bundlor</groupId>
+                    <artifactId>com.springsource.bundlor.maven</artifactId>
+                    <version>1.0.0.RELEASE</version>
+                    <executions>
+                        <execution>
+                            <id>bundlor</id>
+                            <goals>
+                                <goal>bundlor</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <!--remove-->
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
diff --git a/security/pom.xml b/security/pom.xml
index 102a846d..fb53c207 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -7,7 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-ws-security</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Spring WS Security</name>
     <description>Spring-WS WS-Security implementation</description>
     <repositories>
@@ -25,7 +25,7 @@
     </repositories>
     <profiles>
         <profile>
-            <id>jdk14-jdk15</id>
+            <id>jdk15</id>
             <activation>
                 <jdk>!1.6</jdk>
             </activation>
@@ -47,6 +47,11 @@
     </profiles>
     <build>
         <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+<!--
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -71,6 +76,7 @@
                     </instructions>
                 </configuration>
             </plugin>
+-->
         </plugins>
     </build>
     <dependencies>
diff --git a/security/template.mf b/security/template.mf
new file mode 100644
index 00000000..f2f64c35
--- /dev/null
+++ b/security/template.mf
@@ -0,0 +1,26 @@
+Bundle-SymbolicName: org.springframework.ws.soap.security
+Bundle-Name: Spring Web Services SOAP Security
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Template: 
+ com.sun.xml.wss.*;version="0",
+ javax.crypto.*;version="0",
+ javax.security.auth.*;version="0",
+ javax.xml.namespace.*;version="0",
+ javax.xml.soap.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ org.apache.axiom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
+ org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+ org.apache.ws.security.*;version="[1.5.8, 2.0.0)";resolution:=optional,
+ org.apache.xml.security.*;version="[1.0.5.D2, 2.0.0)";resolution:=optional,
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.dao.*;version="[3.0.0, 4.0.0)",
+ org.springframework.security.*;version="[3.0.0.A, 4.0.0)",
+ org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.ws.*;version="[${version}, ${version}]",
+ org.w3c.dom.*;version="0"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/xml/pom.xml b/xml/pom.xml
index 03ab8a94..870107f5 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -7,12 +7,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-xml</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Spring XML</name>
     <description>Various XML support classes for Spring Web Services</description>
     <profiles>
         <profile>
-            <id>jdk14-jdk15</id>
+            <id>jdk15</id>
             <activation>
                 <jdk>!1.6</jdk>
             </activation>
@@ -27,29 +27,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.springframework.bundle.ws.xml</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.xml*;version="${pom.version}"</Export-Package>
-                        <Import-Package>
-                            org.apache.commons.logging*,
-                            javax.xml.namespace*,
-                            javax.xml.parsers*,
-                            javax.xml.transform.stax;resolution:=optional,
-                            javax.xml.transform*,
-                            org.xml.sax*,
-                            org.w3c.dom*,
-                            org.springframework.xml*;version="[${pom.version},${pom.version}]",
-                            org.springframework*;version="[2.0,4.0)",
-                            *;resolution:=optional
-                        </Import-Package>
-                        <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
-                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
-                    </instructions>
-                </configuration>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/xml/template.mf b/xml/template.mf
new file mode 100644
index 00000000..9c143df7
--- /dev/null
+++ b/xml/template.mf
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Bundle-SymbolicName: org.springframework.ws.xml
+Bundle-Name: Spring XML
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Template: 
+ javax.xml.namespace.*;version="0",
+ javax.xml.parsers.*;version="0",
+ javax.xml.stream.*;version="[1.0.1, 2.0.0)",
+ javax.xml.transform.*;version="0",
+ javax.xml.transform.stax.*;version="0";resolution:=optional,
+ javax.xml.validation.*;version="0",
+ javax.xml.xpath.*;version="0",
+ org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ org.apache.ws.commons.schema.*;version="[1.3.2, 2.0.0)";resolution:=optional,
+ org.jaxen.*;version="[1.1.1, 2.0.0)";resolution:=optional,
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.w3c.dom.*;version="0",
+ org.xml.sax.*;version="0"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ DynamicImport-Package,
+ Import-Package,
+ Export-Package,
+ Tool