diff --git a/org.springframework.web/build.xml b/org.springframework.web/build.xml
index ac4c8153a52b1fe8d9b4a8aebf8efbc30a3b3669..479c9926a24f1a17c67e03333298c7756a374fbf 100644
--- a/org.springframework.web/build.xml
+++ b/org.springframework.web/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.orm">
+<project name="org.springframework.web">
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf
index 6173054df7a3558035fc2e59c228d514993b2a64..a755864e08ec69c3a685903f8cb84d2c5978cb8a 100644
--- a/org.springframework.web/template.mf
+++ b/org.springframework.web/template.mf
@@ -1,74 +1,39 @@
-Bundle-SymbolicName: org.springframework.orm
-Bundle-Name: Spring ORM
+Bundle-SymbolicName: org.springframework.web
+Bundle-Name: Spring Web
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package: 
- com.ibatis.sqlmap.engine.transaction.external;version="[2.3.0.677, 3.0.0)";resolution:=optional,
- oracle.toplink.essentials.expressions;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional,
- org.eclipse.persistence.expressions;version="[1.0.0, 2.0.0)";resolution:=optional
 Import-Template: 
- com.ibatis.*;version="[2.3.0.677, 3.0.0)";resolution:=optional,
- javax.jdo.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
- javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- oracle.toplink.essentials.*;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional,
- oracle.toplink.exceptions;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.expressions;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.internal.databaseaccess;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.jndi;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.logging;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.publicinterface;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.queryframework;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.sessionbroker;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.sessions;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.threetier;version="[10.1.3, 11.0.0)";resolution:=optional,
- oracle.toplink.tools.*;version="[10.1.3, 11.0.0)";resolution:=optional,
+ com.caucho.*;version="[3.1.5, 4.0.0)";resolution:=optional,
+ com.sun.net.*;resolution:=optional,
+ javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional,
+ javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional,
+ javax.jws.*;resolution:=optional,
+ javax.servlet;version="[2.4.0, 3.0.0)",
+ javax.servlet.http;version="[2.4.0, 3.0.0)",
+ javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional,
+ javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional,
+ javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
+ org.apache.axis.*;version="[1.4.0, 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.apache.openjpa.persistence.*;version="[1.0.2, 2.0.0)";resolution:=optional,
- org.eclipse.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.hibernate;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.cache;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.cfg;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.classic;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.connection;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.context;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.criterion;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.dialect;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.ejb;version="[3.3.0.ga, 3.4.0)";resolution:=optional,
- org.hibernate.engine;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.event.*;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.exception;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.impl;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.jdbc;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.persister.entity;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.tool.hbm2ddl;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.transaction;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.type;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.usertype;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.hibernate.util;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
+ org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
+ org.apache.taglibs.*;version="[1.1.2, 2.0.0)";resolution:=optional,
  org.springframework.aop.*;version="[2.5.5.A, 2.5.5.A]",
  org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
  org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]",
  org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.dao.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.instrument.classloading.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.jdbc.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional
+ org.springframework.remoting.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
+ org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]",
+ org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]"
 Unversioned-Imports: 
- javax.naming.*,
- javax.sql.*,
- javax.xml.parsers.*,
- org.w3c.dom.*,
- org.xml.sax
+ com.sun.net.*,
+ javax.jws.*,
+ javax.xml.namespace.*,
+ org.xml.sax.*
 Ignored-Existing-Headers: 
  Bnd-LastModified,
- DynamicImport-Package,
  Import-Package,
  Export-Package,
  Tool