diff --git a/nuxeo-distribution-resources/src/main/resources/templates-common/common/META-INF/nuxeo-preprocessor.xml b/nuxeo-distribution-resources/src/main/resources/templates-jboss/common/META-INF/nuxeo-preprocessor.xml
rename from nuxeo-distribution-resources/src/main/resources/templates-common/common/META-INF/nuxeo-preprocessor.xml
rename to nuxeo-distribution-resources/src/main/resources/templates-jboss/common/META-INF/nuxeo-preprocessor.xml
diff --git a/nuxeo-distribution-resources/src/main/resources/templates-common/common/META-INF/nuxeo-preprocessor.xml b/nuxeo-distribution-resources/src/main/resources/templates-tomcat/common/META-INF/nuxeo-preprocessor.xml
copy from nuxeo-distribution-resources/src/main/resources/templates-common/common/META-INF/nuxeo-preprocessor.xml
copy to nuxeo-distribution-resources/src/main/resources/templates-tomcat/common/META-INF/nuxeo-preprocessor.xml
--- a/nuxeo-distribution-resources/src/main/resources/templates-common/common/META-INF/nuxeo-preprocessor.xml
+++ b/nuxeo-distribution-resources/src/main/resources/templates-tomcat/common/META-INF/nuxeo-preprocessor.xml
@@ -3,9 +3,8 @@
-
+
@@ -18,8 +17,8 @@
-
+
bundles
plugins
@@ -28,14 +27,14 @@
-
+
-
+
-
+
diff --git a/nuxeo-distribution-tomcat/pom.xml b/nuxeo-distribution-tomcat/pom.xml
--- a/nuxeo-distribution-tomcat/pom.xml
+++ b/nuxeo-distribution-tomcat/pom.xml
@@ -24,6 +24,14 @@
nuxeo-core-storage-sql-ra
+ org.nuxeo.ecm.platform
+ nuxeo-platform-ws-sun-jaxws
+
+
+ org.nuxeo.ecm.platform
+ nuxeo-platform-audit-ws
+
+
org.apache.derby
derby
@@ -55,6 +63,14 @@
org.jboss
jboss-common-core
+
+ metro.webservices
+ webservices-rt
+
+
+ metro.webservices
+ webservices-tools
+
diff --git a/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml b/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
--- a/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
+++ b/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
@@ -232,6 +232,7 @@
+
diff --git a/nuxeo-distribution-tomcat/src/main/resources-coreserver/common/META-INF/nuxeo-preprocessor.xml b/nuxeo-distribution-tomcat/src/main/resources-coreserver/common/META-INF/nuxeo-preprocessor.xml
--- a/nuxeo-distribution-tomcat/src/main/resources-coreserver/common/META-INF/nuxeo-preprocessor.xml
+++ b/nuxeo-distribution-tomcat/src/main/resources-coreserver/common/META-INF/nuxeo-preprocessor.xml
@@ -15,6 +15,9 @@
+
+
bundles
plugins