diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..525c5fe3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+target/
+target
+**/target/
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..ad5c06ac
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+FROM openjdk:8-jdk-slim
+
+# Install Ant
+RUN apt-get update && \
+    apt-get install -y ant && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+# Copy the project files
+COPY . .
+
+# Set Java home
+ENV JAVA_HOME=/usr/local/openjdk-8
+ENV PATH=$JAVA_HOME/bin:$PATH
+
+# Run tests
+CMD ["sh", "-c", "ant clean build && cd core && ant test -Dtest.name.undefined=true"]
\ No newline at end of file
diff --git a/client/build.xml b/client/build.xml
index 970f5be7..38f5edcb 100755
--- a/client/build.xml
+++ b/client/build.xml
@@ -82,8 +82,8 @@
             classpathref="lib.path"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/classes">
             <fileset dir="src/java" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -95,7 +95,7 @@
         <jar destfile="target/${product.name}-${product.version}.jar">
             <fileset dir="target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${product.title}"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/common/build.xml b/common/build.xml
index d87581a5..533650dc 100755
--- a/common/build.xml
+++ b/common/build.xml
@@ -96,8 +96,8 @@
             classpathref="lib.path"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/classes">
             <fileset dir="src/java" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -109,7 +109,7 @@
         <jar destfile="target/${product.name}-${product.version}.jar">
             <fileset dir="target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${product.title}"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/conf/connections.xml b/conf/connections.xml
index 18aacc1a..fbe31b15 100644
--- a/conf/connections.xml
+++ b/conf/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/conf/directory.xml b/conf/directory.xml
index 177a8796..4b135b39 100644
--- a/conf/directory.xml
+++ b/conf/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/conf/mappings.xml b/conf/mappings.xml
index ad23c5e8..77d51eda 100755
--- a/conf/mappings.xml
+++ b/conf/mappings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mappings PUBLIC
-  "-//Penrose/DTD Mappings ${product.specification}//EN"
+  "-//Penrose/DTD Mappings 2.0//EN"
   "http://penrose.safehaus.org/dtd/mappings.dtd">
 
 <mappings>
diff --git a/conf/modules.xml b/conf/modules.xml
index 07d74d0d..24422ff3 100644
--- a/conf/modules.xml
+++ b/conf/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/conf/server.xml b/conf/server.xml
index f6d44bff..3093652a 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE server PUBLIC
-  "-//Penrose/DTD Server ${product.specification}//EN"
+  "-//Penrose/DTD Server 2.0//EN"
   "http://penrose.safehaus.org/dtd/server.dtd">
 
 <server>
diff --git a/conf/sources.xml b/conf/sources.xml
index d042d41e..cd5ccc1b 100644
--- a/conf/sources.xml
+++ b/conf/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/core/build.xml b/core/build.xml
index 2fcae8c4..09df1ada 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -98,8 +98,8 @@
             classpathref="lib.path"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/classes">
             <fileset dir="src/java" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -112,8 +112,8 @@
             classpathref="test.path"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/tests">
             <fileset dir="src/test" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -129,7 +129,7 @@
 
     <target name="singletest" depends="compile" unless="test.name.undefined">
         <mkdir dir="target/reports"/>
-        <junit fork="yes" showoutput="true" printsummary="yes">
+        <junit fork="no" showoutput="true" printsummary="yes">
             <classpath>
                 <fileset dir="../lib">
                     <include name="**/*.jar"/>
@@ -165,7 +165,7 @@
         <jar jarfile="target/${product.name}-${product.version}.jar">
             <fileset dir="target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${product.title}"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/ldap-backend/apacheds/build.xml b/ldap-backend/apacheds/build.xml
index 3b9a3c4c..1642c349 100755
--- a/ldap-backend/apacheds/build.xml
+++ b/ldap-backend/apacheds/build.xml
@@ -53,8 +53,8 @@
             classpathref="lib.path"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/classes">
             <fileset dir="src" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -62,7 +62,7 @@
         <jar jarfile="target/${product.fullName}.jar">
             <fileset dir="target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${product.title}"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/ldap-backend/build.xml b/ldap-backend/build.xml
index 58a46f01..3b3decf3 100755
--- a/ldap-backend/build.xml
+++ b/ldap-backend/build.xml
@@ -43,8 +43,8 @@
             classpathref="lib.path"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/classes">
             <fileset dir="src/java" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -52,7 +52,7 @@
         <jar jarfile="target/${product.name}-${product.version}.jar">
             <fileset dir="target/classes"/>
             <manifest>
-                <attribute name="Specification-Version"  value="${product.specification}"/>
+                <attribute name="Specification-Version"  value="2.0"/>
                 <attribute name="Implementation-Title"   value="${product.title}"/>
                 <attribute name="Implementation-Version" value="${product.version}"/>
                 <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/ldap-backend/mina/build.xml b/ldap-backend/mina/build.xml
index caf92e2c..cc317520 100755
--- a/ldap-backend/mina/build.xml
+++ b/ldap-backend/mina/build.xml
@@ -51,8 +51,8 @@
             classpathref="lib.path"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/classes">
             <fileset dir="src" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -60,7 +60,7 @@
         <jar jarfile="target/${product.fullName}.jar">
             <fileset dir="target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${product.title}"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/ldap-backend/opends/build.xml b/ldap-backend/opends/build.xml
index 46499044..c3327697 100755
--- a/ldap-backend/opends/build.xml
+++ b/ldap-backend/opends/build.xml
@@ -53,8 +53,8 @@
             classpathref="lib.path"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/classes">
             <fileset dir="src" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -62,7 +62,7 @@
         <jar jarfile="target/${product.fullName}.jar">
             <fileset dir="target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${product.title}"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/ldap-backend/openldap/build.xml b/ldap-backend/openldap/build.xml
index c4f21ad7..0859b7ff 100755
--- a/ldap-backend/openldap/build.xml
+++ b/ldap-backend/openldap/build.xml
@@ -101,8 +101,8 @@
             destdir="target/classes"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/classes">
             <fileset dir="src/java" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -114,7 +114,7 @@
         <jar jarfile="target/${product.name}-${product.version}.jar">
             <fileset dir="target/classes"/>
             <manifest>
-                <attribute name="Specification-Version"  value="${product.specification}"/>
+                <attribute name="Specification-Version"  value="2.0"/>
                 <attribute name="Implementation-Title"   value="${product.title}"/>
                 <attribute name="Implementation-Version" value="${product.version}"/>
                 <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/monitors/JMX/MONITOR-INF/monitor.xml b/monitors/JMX/MONITOR-INF/monitor.xml
index 794f2eff..848c9763 100644
--- a/monitors/JMX/MONITOR-INF/monitor.xml
+++ b/monitors/JMX/MONITOR-INF/monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE monitor PUBLIC
-  "-//Penrose/DTD Monitor ${product.specification}//EN"
+  "-//Penrose/DTD Monitor 2.0//EN"
   "http://penrose.safehaus.org/dtd/monitor.dtd">
 
 <monitor enabled="false">
diff --git a/monitors/JMX/build.xml b/monitors/JMX/build.xml
index aa4b3823..94236392 100644
--- a/monitors/JMX/build.xml
+++ b/monitors/JMX/build.xml
@@ -64,7 +64,7 @@
         <jar jarfile="MONITOR-INF/target/${project.name}-${monitor.name}-monitor-${product.version}.jar">
             <fileset dir="MONITOR-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} ${monitor.title} Monitor"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/monitors/LDAP/MONITOR-INF/monitor.xml b/monitors/LDAP/MONITOR-INF/monitor.xml
index bc836308..17208643 100644
--- a/monitors/LDAP/MONITOR-INF/monitor.xml
+++ b/monitors/LDAP/MONITOR-INF/monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE monitor PUBLIC
-  "-//Penrose/DTD Monitor ${product.specification}//EN"
+  "-//Penrose/DTD Monitor 2.0//EN"
   "http://penrose.safehaus.org/dtd/monitor.dtd">
 
 <monitor enabled="true">
diff --git a/monitors/LDAP/build.xml b/monitors/LDAP/build.xml
index d078cdde..9f125afa 100644
--- a/monitors/LDAP/build.xml
+++ b/monitors/LDAP/build.xml
@@ -60,7 +60,7 @@
         <jar jarfile="MONITOR-INF/target/${project.name}-${monitor.name}-monitor-${product.version}.jar">
             <fileset dir="MONITOR-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} ${monitor.title} Monitor"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/samples/abandon/DIR-INF/connections.xml b/samples/abandon/DIR-INF/connections.xml
index 18aacc1a..fbe31b15 100755
--- a/samples/abandon/DIR-INF/connections.xml
+++ b/samples/abandon/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/abandon/DIR-INF/directory.xml b/samples/abandon/DIR-INF/directory.xml
index 43321abb..eb5d9de6 100755
--- a/samples/abandon/DIR-INF/directory.xml
+++ b/samples/abandon/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/abandon/DIR-INF/modules.xml b/samples/abandon/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100755
--- a/samples/abandon/DIR-INF/modules.xml
+++ b/samples/abandon/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/abandon/DIR-INF/partition.xml b/samples/abandon/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/abandon/DIR-INF/partition.xml
+++ b/samples/abandon/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/abandon/DIR-INF/sources.xml b/samples/abandon/DIR-INF/sources.xml
index d042d41e..cd5ccc1b 100755
--- a/samples/abandon/DIR-INF/sources.xml
+++ b/samples/abandon/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/acl/DIR-INF/connections.xml b/samples/acl/DIR-INF/connections.xml
index d75fd786..1d6b3111 100644
--- a/samples/acl/DIR-INF/connections.xml
+++ b/samples/acl/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/acl/DIR-INF/directory.xml b/samples/acl/DIR-INF/directory.xml
index 80bfcf32..2a57e0bb 100644
--- a/samples/acl/DIR-INF/directory.xml
+++ b/samples/acl/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/acl/DIR-INF/modules.xml b/samples/acl/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/acl/DIR-INF/modules.xml
+++ b/samples/acl/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/acl/DIR-INF/partition.xml b/samples/acl/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/acl/DIR-INF/partition.xml
+++ b/samples/acl/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/acl/DIR-INF/sources.xml b/samples/acl/DIR-INF/sources.xml
index bd5d836a..5071a58e 100644
--- a/samples/acl/DIR-INF/sources.xml
+++ b/samples/acl/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/activeDirectory/DIR-INF/connections.xml b/samples/activeDirectory/DIR-INF/connections.xml
index 5a5a1f21..6031cf26 100644
--- a/samples/activeDirectory/DIR-INF/connections.xml
+++ b/samples/activeDirectory/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/activeDirectory/DIR-INF/directory.xml b/samples/activeDirectory/DIR-INF/directory.xml
index 5ad74612..a7d6602e 100644
--- a/samples/activeDirectory/DIR-INF/directory.xml
+++ b/samples/activeDirectory/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/activeDirectory/DIR-INF/modules.xml b/samples/activeDirectory/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/activeDirectory/DIR-INF/modules.xml
+++ b/samples/activeDirectory/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/activeDirectory/DIR-INF/partition.xml b/samples/activeDirectory/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/activeDirectory/DIR-INF/partition.xml
+++ b/samples/activeDirectory/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/activeDirectory/DIR-INF/sources.xml b/samples/activeDirectory/DIR-INF/sources.xml
index 67fee0d1..828b842e 100644
--- a/samples/activeDirectory/DIR-INF/sources.xml
+++ b/samples/activeDirectory/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/ad_merge/DIR-INF/connections.xml b/samples/ad_merge/DIR-INF/connections.xml
index 00035079..ad66e619 100755
--- a/samples/ad_merge/DIR-INF/connections.xml
+++ b/samples/ad_merge/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/ad_merge/DIR-INF/directory.xml b/samples/ad_merge/DIR-INF/directory.xml
index 22f99a5c..f982c0b4 100755
--- a/samples/ad_merge/DIR-INF/directory.xml
+++ b/samples/ad_merge/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/ad_merge/DIR-INF/modules.xml b/samples/ad_merge/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100755
--- a/samples/ad_merge/DIR-INF/modules.xml
+++ b/samples/ad_merge/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/ad_merge/DIR-INF/partition.xml b/samples/ad_merge/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/ad_merge/DIR-INF/partition.xml
+++ b/samples/ad_merge/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/ad_merge/DIR-INF/sources.xml b/samples/ad_merge/DIR-INF/sources.xml
index f641e7ff..355bf0ab 100755
--- a/samples/ad_merge/DIR-INF/sources.xml
+++ b/samples/ad_merge/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/ad_schema/DIR-INF/connections.xml b/samples/ad_schema/DIR-INF/connections.xml
index 93f37a19..b2aeace5 100644
--- a/samples/ad_schema/DIR-INF/connections.xml
+++ b/samples/ad_schema/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/ad_schema/DIR-INF/directory.xml b/samples/ad_schema/DIR-INF/directory.xml
index ee715c03..5d931903 100644
--- a/samples/ad_schema/DIR-INF/directory.xml
+++ b/samples/ad_schema/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/ad_schema/DIR-INF/modules.xml b/samples/ad_schema/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/ad_schema/DIR-INF/modules.xml
+++ b/samples/ad_schema/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/ad_schema/DIR-INF/partition.xml b/samples/ad_schema/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/ad_schema/DIR-INF/partition.xml
+++ b/samples/ad_schema/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/ad_schema/DIR-INF/sources.xml b/samples/ad_schema/DIR-INF/sources.xml
index b57a2678..3a728cb6 100644
--- a/samples/ad_schema/DIR-INF/sources.xml
+++ b/samples/ad_schema/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/ad_sync/DIR-INF/connections.xml b/samples/ad_sync/DIR-INF/connections.xml
index 4873b387..09526c08 100755
--- a/samples/ad_sync/DIR-INF/connections.xml
+++ b/samples/ad_sync/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/ad_sync/DIR-INF/directory.xml b/samples/ad_sync/DIR-INF/directory.xml
index 9161c37f..259ca9d3 100755
--- a/samples/ad_sync/DIR-INF/directory.xml
+++ b/samples/ad_sync/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/ad_sync/DIR-INF/modules.xml b/samples/ad_sync/DIR-INF/modules.xml
index 8946b966..32d65357 100755
--- a/samples/ad_sync/DIR-INF/modules.xml
+++ b/samples/ad_sync/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/ad_sync/DIR-INF/partition.xml b/samples/ad_sync/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/ad_sync/DIR-INF/partition.xml
+++ b/samples/ad_sync/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/ad_sync/DIR-INF/sources.xml b/samples/ad_sync/DIR-INF/sources.xml
index 760348a9..d617dd8c 100755
--- a/samples/ad_sync/DIR-INF/sources.xml
+++ b/samples/ad_sync/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/ad_sync/build.xml b/samples/ad_sync/build.xml
index ea16b9c5..b62a1349 100755
--- a/samples/ad_sync/build.xml
+++ b/samples/ad_sync/build.xml
@@ -58,7 +58,7 @@
         <jar jarfile="DIR-INF/lib/${project.name}-ad-sync-module-${product.version}.jar">
             <fileset dir="DIR-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} Server"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/samples/adapter/DIR-INF/connections.xml b/samples/adapter/DIR-INF/connections.xml
index 2df15d80..a2882d13 100644
--- a/samples/adapter/DIR-INF/connections.xml
+++ b/samples/adapter/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/adapter/DIR-INF/directory.xml b/samples/adapter/DIR-INF/directory.xml
index cf856cb1..be93d0be 100644
--- a/samples/adapter/DIR-INF/directory.xml
+++ b/samples/adapter/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/adapter/DIR-INF/modules.xml b/samples/adapter/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/adapter/DIR-INF/modules.xml
+++ b/samples/adapter/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/adapter/DIR-INF/partition.xml b/samples/adapter/DIR-INF/partition.xml
index 040fa7ec..aceb02bb 100644
--- a/samples/adapter/DIR-INF/partition.xml
+++ b/samples/adapter/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/adapter/DIR-INF/sources.xml b/samples/adapter/DIR-INF/sources.xml
index aa72c4b7..956d39b4 100644
--- a/samples/adapter/DIR-INF/sources.xml
+++ b/samples/adapter/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/cache/DIR-INF/connections.xml b/samples/cache/DIR-INF/connections.xml
index 008284e4..4371a11a 100644
--- a/samples/cache/DIR-INF/connections.xml
+++ b/samples/cache/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/cache/DIR-INF/directory.xml b/samples/cache/DIR-INF/directory.xml
index cce2a066..604064c7 100644
--- a/samples/cache/DIR-INF/directory.xml
+++ b/samples/cache/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/cache/DIR-INF/modules.xml b/samples/cache/DIR-INF/modules.xml
index a24053e5..437115fe 100644
--- a/samples/cache/DIR-INF/modules.xml
+++ b/samples/cache/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/cache/DIR-INF/partition.xml b/samples/cache/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/cache/DIR-INF/partition.xml
+++ b/samples/cache/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/cache/DIR-INF/sources.xml b/samples/cache/DIR-INF/sources.xml
index 85b25dcc..8ba61388 100644
--- a/samples/cache/DIR-INF/sources.xml
+++ b/samples/cache/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/changelog/DIR-INF/connections.xml b/samples/changelog/DIR-INF/connections.xml
index 9b2e596f..7ea8e124 100644
--- a/samples/changelog/DIR-INF/connections.xml
+++ b/samples/changelog/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/changelog/DIR-INF/directory.xml b/samples/changelog/DIR-INF/directory.xml
index 45e97b1a..5a5da05c 100644
--- a/samples/changelog/DIR-INF/directory.xml
+++ b/samples/changelog/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/changelog/DIR-INF/modules.xml b/samples/changelog/DIR-INF/modules.xml
index 7769c1ff..f36d90a3 100644
--- a/samples/changelog/DIR-INF/modules.xml
+++ b/samples/changelog/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/changelog/DIR-INF/partition.xml b/samples/changelog/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/changelog/DIR-INF/partition.xml
+++ b/samples/changelog/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/changelog/DIR-INF/sources.xml b/samples/changelog/DIR-INF/sources.xml
index ec776189..bfb3d21e 100644
--- a/samples/changelog/DIR-INF/sources.xml
+++ b/samples/changelog/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/changelog/build.xml b/samples/changelog/build.xml
index 3d65d63e..e1d8bbd9 100644
--- a/samples/changelog/build.xml
+++ b/samples/changelog/build.xml
@@ -37,6 +37,9 @@
         <fileset dir="../../common/lib">
             <include name="**/*.jar"/>
         </fileset>
+        <fileset dir="../../common/target">
+            <include name="**/*.jar"/>
+        </fileset>
         <fileset dir="../../core/lib">
             <include name="**/*.jar"/>
         </fileset>
@@ -63,7 +66,7 @@
         <jar jarfile="DIR-INF/target/${project.name}-changelog-module-${product.version}.jar">
             <fileset dir="DIR-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} Server"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/samples/encryption/DIR-INF/connections.xml b/samples/encryption/DIR-INF/connections.xml
index 47601a49..974f1033 100644
--- a/samples/encryption/DIR-INF/connections.xml
+++ b/samples/encryption/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/encryption/DIR-INF/directory.xml b/samples/encryption/DIR-INF/directory.xml
index e415b20f..fef5ee51 100644
--- a/samples/encryption/DIR-INF/directory.xml
+++ b/samples/encryption/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/encryption/DIR-INF/modules.xml b/samples/encryption/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/encryption/DIR-INF/modules.xml
+++ b/samples/encryption/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/encryption/DIR-INF/partition.xml b/samples/encryption/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/encryption/DIR-INF/partition.xml
+++ b/samples/encryption/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/encryption/DIR-INF/sources.xml b/samples/encryption/DIR-INF/sources.xml
index 183458b1..5cb2424e 100644
--- a/samples/encryption/DIR-INF/sources.xml
+++ b/samples/encryption/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/federation/DIR-INF/connections.xml b/samples/federation/DIR-INF/connections.xml
index c0d224bc..a237be56 100644
--- a/samples/federation/DIR-INF/connections.xml
+++ b/samples/federation/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/federation/DIR-INF/directory.xml b/samples/federation/DIR-INF/directory.xml
index 03aa23ec..11550d62 100644
--- a/samples/federation/DIR-INF/directory.xml
+++ b/samples/federation/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/federation/DIR-INF/federation.xml b/samples/federation/DIR-INF/federation.xml
index 6682afbc..70fd0036 100755
--- a/samples/federation/DIR-INF/federation.xml
+++ b/samples/federation/DIR-INF/federation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE federation PUBLIC
-  "-//Penrose/DTD Federation ${product.specification}//EN"
+  "-//Penrose/DTD Federation 2.0//EN"
   "http://penrose.safehaus.org/dtd/federation.dtd">
 
 <federation>
diff --git a/samples/federation/DIR-INF/modules.xml b/samples/federation/DIR-INF/modules.xml
index 6f3dc369..92b260ad 100644
--- a/samples/federation/DIR-INF/modules.xml
+++ b/samples/federation/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/federation/DIR-INF/partition.xml b/samples/federation/DIR-INF/partition.xml
index 03d0962c..8a5d0dc7 100644
--- a/samples/federation/DIR-INF/partition.xml
+++ b/samples/federation/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition/>
diff --git a/samples/federation/DIR-INF/sources.xml b/samples/federation/DIR-INF/sources.xml
index 9671e8b2..b4ba40e1 100644
--- a/samples/federation/DIR-INF/sources.xml
+++ b/samples/federation/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/federation/templates/ad/DIR-INF/connections.xml b/samples/federation/templates/ad/DIR-INF/connections.xml
index aa317e29..e7716fdc 100755
--- a/samples/federation/templates/ad/DIR-INF/connections.xml
+++ b/samples/federation/templates/ad/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/federation/templates/ad/DIR-INF/directory.xml b/samples/federation/templates/ad/DIR-INF/directory.xml
index c23681e9..c29607b1 100755
--- a/samples/federation/templates/ad/DIR-INF/directory.xml
+++ b/samples/federation/templates/ad/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/federation/templates/ad/DIR-INF/mappings.xml b/samples/federation/templates/ad/DIR-INF/mappings.xml
index 8f960ea5..c58a35a2 100755
--- a/samples/federation/templates/ad/DIR-INF/mappings.xml
+++ b/samples/federation/templates/ad/DIR-INF/mappings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mappings PUBLIC
-  "-//Penrose/DTD Mappings ${product.specification}//EN"
+  "-//Penrose/DTD Mappings 2.0//EN"
   "http://penrose.safehaus.org/dtd/mappings.dtd">
 
 <mappings>
diff --git a/samples/federation/templates/ad/DIR-INF/modules.xml b/samples/federation/templates/ad/DIR-INF/modules.xml
index be2a28b1..10c52a29 100755
--- a/samples/federation/templates/ad/DIR-INF/modules.xml
+++ b/samples/federation/templates/ad/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/federation/templates/ad/DIR-INF/partition.xml b/samples/federation/templates/ad/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/federation/templates/ad/DIR-INF/partition.xml
+++ b/samples/federation/templates/ad/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/federation/templates/ad/DIR-INF/sources.xml b/samples/federation/templates/ad/DIR-INF/sources.xml
index a6c08490..c6bc5d91 100755
--- a/samples/federation/templates/ad/DIR-INF/sources.xml
+++ b/samples/federation/templates/ad/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/federation/templates/global/DIR-INF/connections.xml b/samples/federation/templates/global/DIR-INF/connections.xml
index 18aacc1a..fbe31b15 100644
--- a/samples/federation/templates/global/DIR-INF/connections.xml
+++ b/samples/federation/templates/global/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/federation/templates/global/DIR-INF/directory.xml b/samples/federation/templates/global/DIR-INF/directory.xml
index 73edc708..e7dd84d4 100644
--- a/samples/federation/templates/global/DIR-INF/directory.xml
+++ b/samples/federation/templates/global/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/federation/templates/global/DIR-INF/modules.xml b/samples/federation/templates/global/DIR-INF/modules.xml
index 77bc4cc0..5b3cb897 100644
--- a/samples/federation/templates/global/DIR-INF/modules.xml
+++ b/samples/federation/templates/global/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/federation/templates/global/DIR-INF/partition.xml b/samples/federation/templates/global/DIR-INF/partition.xml
index f3b8c5d8..64a8b5b6 100644
--- a/samples/federation/templates/global/DIR-INF/partition.xml
+++ b/samples/federation/templates/global/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition depends="federation,federation_ad">
diff --git a/samples/federation/templates/global/DIR-INF/sources.xml b/samples/federation/templates/global/DIR-INF/sources.xml
index 70ba538f..cc9ced83 100644
--- a/samples/federation/templates/global/DIR-INF/sources.xml
+++ b/samples/federation/templates/global/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/federation/templates/ldap/DIR-INF/connections.xml b/samples/federation/templates/ldap/DIR-INF/connections.xml
index aa317e29..e7716fdc 100644
--- a/samples/federation/templates/ldap/DIR-INF/connections.xml
+++ b/samples/federation/templates/ldap/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/federation/templates/ldap/DIR-INF/directory.xml b/samples/federation/templates/ldap/DIR-INF/directory.xml
index c23681e9..c29607b1 100644
--- a/samples/federation/templates/ldap/DIR-INF/directory.xml
+++ b/samples/federation/templates/ldap/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/federation/templates/ldap/DIR-INF/mappings.xml b/samples/federation/templates/ldap/DIR-INF/mappings.xml
index 59fb903b..1b971e64 100755
--- a/samples/federation/templates/ldap/DIR-INF/mappings.xml
+++ b/samples/federation/templates/ldap/DIR-INF/mappings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mappings PUBLIC
-  "-//Penrose/DTD Mappings ${product.specification}//EN"
+  "-//Penrose/DTD Mappings 2.0//EN"
   "http://penrose.safehaus.org/dtd/mappings.dtd">
 
 <mappings>
diff --git a/samples/federation/templates/ldap/DIR-INF/modules.xml b/samples/federation/templates/ldap/DIR-INF/modules.xml
index 35aa75c9..7bce3b73 100644
--- a/samples/federation/templates/ldap/DIR-INF/modules.xml
+++ b/samples/federation/templates/ldap/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/federation/templates/ldap/DIR-INF/partition.xml b/samples/federation/templates/ldap/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/federation/templates/ldap/DIR-INF/partition.xml
+++ b/samples/federation/templates/ldap/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/federation/templates/ldap/DIR-INF/sources.xml b/samples/federation/templates/ldap/DIR-INF/sources.xml
index f548b716..54c84baf 100644
--- a/samples/federation/templates/ldap/DIR-INF/sources.xml
+++ b/samples/federation/templates/ldap/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/federation/templates/nis/DIR-INF/connections.xml b/samples/federation/templates/nis/DIR-INF/connections.xml
index 5b11166f..51e0fc8c 100644
--- a/samples/federation/templates/nis/DIR-INF/connections.xml
+++ b/samples/federation/templates/nis/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/federation/templates/nis/DIR-INF/directory.xml b/samples/federation/templates/nis/DIR-INF/directory.xml
index c23681e9..c29607b1 100644
--- a/samples/federation/templates/nis/DIR-INF/directory.xml
+++ b/samples/federation/templates/nis/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/federation/templates/nis/DIR-INF/modules.xml b/samples/federation/templates/nis/DIR-INF/modules.xml
index 0de235ca..563bc796 100644
--- a/samples/federation/templates/nis/DIR-INF/modules.xml
+++ b/samples/federation/templates/nis/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/federation/templates/nis/DIR-INF/partition.xml b/samples/federation/templates/nis/DIR-INF/partition.xml
index fc454b43..d3949695 100644
--- a/samples/federation/templates/nis/DIR-INF/partition.xml
+++ b/samples/federation/templates/nis/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition depends="federation">
diff --git a/samples/federation/templates/nis/DIR-INF/sources.xml b/samples/federation/templates/nis/DIR-INF/sources.xml
index 21c773c0..48a2ce86 100644
--- a/samples/federation/templates/nis/DIR-INF/sources.xml
+++ b/samples/federation/templates/nis/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/federation/templates/nss/DIR-INF/connections.xml b/samples/federation/templates/nss/DIR-INF/connections.xml
index 18aacc1a..fbe31b15 100644
--- a/samples/federation/templates/nss/DIR-INF/connections.xml
+++ b/samples/federation/templates/nss/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/federation/templates/nss/DIR-INF/directory.xml b/samples/federation/templates/nss/DIR-INF/directory.xml
index efa8690f..3f8ceb05 100644
--- a/samples/federation/templates/nss/DIR-INF/directory.xml
+++ b/samples/federation/templates/nss/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/federation/templates/nss/DIR-INF/modules.xml b/samples/federation/templates/nss/DIR-INF/modules.xml
index 77bc4cc0..5b3cb897 100644
--- a/samples/federation/templates/nss/DIR-INF/modules.xml
+++ b/samples/federation/templates/nss/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/federation/templates/nss/DIR-INF/partition.xml b/samples/federation/templates/nss/DIR-INF/partition.xml
index 319343d1..b92a1a6e 100644
--- a/samples/federation/templates/nss/DIR-INF/partition.xml
+++ b/samples/federation/templates/nss/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition depends="federation,federation_${nis.name},federation_ad">
diff --git a/samples/federation/templates/nss/DIR-INF/sources.xml b/samples/federation/templates/nss/DIR-INF/sources.xml
index 55959ff7..f06cf951 100644
--- a/samples/federation/templates/nss/DIR-INF/sources.xml
+++ b/samples/federation/templates/nss/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/federation/templates/yp/DIR-INF/connections.xml b/samples/federation/templates/yp/DIR-INF/connections.xml
index 9cb50e21..1f1e155e 100644
--- a/samples/federation/templates/yp/DIR-INF/connections.xml
+++ b/samples/federation/templates/yp/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/federation/templates/yp/DIR-INF/directory.xml b/samples/federation/templates/yp/DIR-INF/directory.xml
index 050efdd9..fd890ea0 100644
--- a/samples/federation/templates/yp/DIR-INF/directory.xml
+++ b/samples/federation/templates/yp/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/federation/templates/yp/DIR-INF/modules.xml b/samples/federation/templates/yp/DIR-INF/modules.xml
index 77bc4cc0..5b3cb897 100644
--- a/samples/federation/templates/yp/DIR-INF/modules.xml
+++ b/samples/federation/templates/yp/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/federation/templates/yp/DIR-INF/partition.xml b/samples/federation/templates/yp/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/federation/templates/yp/DIR-INF/partition.xml
+++ b/samples/federation/templates/yp/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/federation/templates/yp/DIR-INF/sources.xml b/samples/federation/templates/yp/DIR-INF/sources.xml
index 10bcbf98..f8581ca1 100644
--- a/samples/federation/templates/yp/DIR-INF/sources.xml
+++ b/samples/federation/templates/yp/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/hsqldb/DIR-INF/connections.xml b/samples/hsqldb/DIR-INF/connections.xml
index 4871688c..e8e0e32e 100644
--- a/samples/hsqldb/DIR-INF/connections.xml
+++ b/samples/hsqldb/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/hsqldb/DIR-INF/directory.xml b/samples/hsqldb/DIR-INF/directory.xml
index 8e5e38fe..7b68dc4a 100644
--- a/samples/hsqldb/DIR-INF/directory.xml
+++ b/samples/hsqldb/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/hsqldb/DIR-INF/modules.xml b/samples/hsqldb/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/hsqldb/DIR-INF/modules.xml
+++ b/samples/hsqldb/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/hsqldb/DIR-INF/partition.xml b/samples/hsqldb/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/hsqldb/DIR-INF/partition.xml
+++ b/samples/hsqldb/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/hsqldb/DIR-INF/sources.xml b/samples/hsqldb/DIR-INF/sources.xml
index 0c350bf9..dd5a6525 100644
--- a/samples/hsqldb/DIR-INF/sources.xml
+++ b/samples/hsqldb/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/jdbc/DIR-INF/connections.xml b/samples/jdbc/DIR-INF/connections.xml
index f8fe13b7..7a94956d 100644
--- a/samples/jdbc/DIR-INF/connections.xml
+++ b/samples/jdbc/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/jdbc/DIR-INF/directory.xml b/samples/jdbc/DIR-INF/directory.xml
index 270a0621..8e39e152 100644
--- a/samples/jdbc/DIR-INF/directory.xml
+++ b/samples/jdbc/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/jdbc/DIR-INF/modules.xml b/samples/jdbc/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/jdbc/DIR-INF/modules.xml
+++ b/samples/jdbc/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/jdbc/DIR-INF/partition.xml b/samples/jdbc/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/jdbc/DIR-INF/partition.xml
+++ b/samples/jdbc/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/jdbc/DIR-INF/sources.xml b/samples/jdbc/DIR-INF/sources.xml
index 85b25dcc..8ba61388 100644
--- a/samples/jdbc/DIR-INF/sources.xml
+++ b/samples/jdbc/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/jdbc_join/DIR-INF/connections.xml b/samples/jdbc_join/DIR-INF/connections.xml
index e6926a4d..78aa3d78 100755
--- a/samples/jdbc_join/DIR-INF/connections.xml
+++ b/samples/jdbc_join/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/jdbc_join/DIR-INF/directory.xml b/samples/jdbc_join/DIR-INF/directory.xml
index 72b33db7..d6c3ce81 100755
--- a/samples/jdbc_join/DIR-INF/directory.xml
+++ b/samples/jdbc_join/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/jdbc_join/DIR-INF/modules.xml b/samples/jdbc_join/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100755
--- a/samples/jdbc_join/DIR-INF/modules.xml
+++ b/samples/jdbc_join/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/jdbc_join/DIR-INF/partition.xml b/samples/jdbc_join/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/jdbc_join/DIR-INF/partition.xml
+++ b/samples/jdbc_join/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/jdbc_join/DIR-INF/sources.xml b/samples/jdbc_join/DIR-INF/sources.xml
index fe37551a..6287670a 100755
--- a/samples/jdbc_join/DIR-INF/sources.xml
+++ b/samples/jdbc_join/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/jdbc_sync/DIR-INF/connections.xml b/samples/jdbc_sync/DIR-INF/connections.xml
index 1996665b..195f9156 100644
--- a/samples/jdbc_sync/DIR-INF/connections.xml
+++ b/samples/jdbc_sync/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/jdbc_sync/DIR-INF/directory.xml b/samples/jdbc_sync/DIR-INF/directory.xml
index 5c23da1a..04513b13 100644
--- a/samples/jdbc_sync/DIR-INF/directory.xml
+++ b/samples/jdbc_sync/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/jdbc_sync/DIR-INF/modules.xml b/samples/jdbc_sync/DIR-INF/modules.xml
index 1050b762..c0eb59ce 100644
--- a/samples/jdbc_sync/DIR-INF/modules.xml
+++ b/samples/jdbc_sync/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/jdbc_sync/DIR-INF/partition.xml b/samples/jdbc_sync/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/jdbc_sync/DIR-INF/partition.xml
+++ b/samples/jdbc_sync/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/jdbc_sync/DIR-INF/sources.xml b/samples/jdbc_sync/DIR-INF/sources.xml
index 3feff51a..876252c5 100644
--- a/samples/jdbc_sync/DIR-INF/sources.xml
+++ b/samples/jdbc_sync/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/jdbc_sync/build.xml b/samples/jdbc_sync/build.xml
index 2afdcf85..9cae9da7 100644
--- a/samples/jdbc_sync/build.xml
+++ b/samples/jdbc_sync/build.xml
@@ -37,6 +37,9 @@
         <fileset dir="../../common/lib">
             <include name="**/*.jar"/>
         </fileset>
+        <fileset dir="../../common/target">
+            <include name="**/*.jar"/>
+        </fileset>
         <fileset dir="../../core/lib">
             <include name="**/*.jar"/>
         </fileset>
@@ -63,7 +66,7 @@
         <jar jarfile="DIR-INF/target/${project.name}-jdbc-sync-module-${product.version}.jar">
             <fileset dir="DIR-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} Server"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/samples/join/DIR-INF/connections.xml b/samples/join/DIR-INF/connections.xml
index bc140359..2aea0e5f 100644
--- a/samples/join/DIR-INF/connections.xml
+++ b/samples/join/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/join/DIR-INF/directory.xml b/samples/join/DIR-INF/directory.xml
index f326655c..4a095554 100644
--- a/samples/join/DIR-INF/directory.xml
+++ b/samples/join/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/join/DIR-INF/modules.xml b/samples/join/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/join/DIR-INF/modules.xml
+++ b/samples/join/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/join/DIR-INF/partition.xml b/samples/join/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/join/DIR-INF/partition.xml
+++ b/samples/join/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/join/DIR-INF/sources.xml b/samples/join/DIR-INF/sources.xml
index 4ff21f6e..e7008afd 100644
--- a/samples/join/DIR-INF/sources.xml
+++ b/samples/join/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/ldap/DIR-INF/connections.xml b/samples/ldap/DIR-INF/connections.xml
index 3329dd71..27c1cb27 100644
--- a/samples/ldap/DIR-INF/connections.xml
+++ b/samples/ldap/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/ldap/DIR-INF/directory.xml b/samples/ldap/DIR-INF/directory.xml
index d5e4f068..f2f9482e 100644
--- a/samples/ldap/DIR-INF/directory.xml
+++ b/samples/ldap/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/ldap/DIR-INF/modules.xml b/samples/ldap/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/ldap/DIR-INF/modules.xml
+++ b/samples/ldap/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/ldap/DIR-INF/partition.xml b/samples/ldap/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/ldap/DIR-INF/partition.xml
+++ b/samples/ldap/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/ldap/DIR-INF/sources.xml b/samples/ldap/DIR-INF/sources.xml
index b411500f..6e59eab3 100644
--- a/samples/ldap/DIR-INF/sources.xml
+++ b/samples/ldap/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/ldap_merge/DIR-INF/connections.xml b/samples/ldap_merge/DIR-INF/connections.xml
index dea5e682..da26fe82 100755
--- a/samples/ldap_merge/DIR-INF/connections.xml
+++ b/samples/ldap_merge/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/ldap_merge/DIR-INF/directory.xml b/samples/ldap_merge/DIR-INF/directory.xml
index 86641fa8..4a74daa9 100755
--- a/samples/ldap_merge/DIR-INF/directory.xml
+++ b/samples/ldap_merge/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/ldap_merge/DIR-INF/modules.xml b/samples/ldap_merge/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100755
--- a/samples/ldap_merge/DIR-INF/modules.xml
+++ b/samples/ldap_merge/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/ldap_merge/DIR-INF/partition.xml b/samples/ldap_merge/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/ldap_merge/DIR-INF/partition.xml
+++ b/samples/ldap_merge/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/ldap_merge/DIR-INF/sources.xml b/samples/ldap_merge/DIR-INF/sources.xml
index 560ff869..21876530 100755
--- a/samples/ldap_merge/DIR-INF/sources.xml
+++ b/samples/ldap_merge/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/ldap_sync/DIR-INF/connections.xml b/samples/ldap_sync/DIR-INF/connections.xml
index 57f5d119..c02977b3 100644
--- a/samples/ldap_sync/DIR-INF/connections.xml
+++ b/samples/ldap_sync/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/ldap_sync/DIR-INF/directory.xml b/samples/ldap_sync/DIR-INF/directory.xml
index a131317c..dd5c647e 100644
--- a/samples/ldap_sync/DIR-INF/directory.xml
+++ b/samples/ldap_sync/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/ldap_sync/DIR-INF/modules.xml b/samples/ldap_sync/DIR-INF/modules.xml
index 0b954256..badbbfff 100644
--- a/samples/ldap_sync/DIR-INF/modules.xml
+++ b/samples/ldap_sync/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/ldap_sync/DIR-INF/partition.xml b/samples/ldap_sync/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/ldap_sync/DIR-INF/partition.xml
+++ b/samples/ldap_sync/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/ldap_sync/DIR-INF/sources.xml b/samples/ldap_sync/DIR-INF/sources.xml
index 3b4c2c17..d7dba6c8 100644
--- a/samples/ldap_sync/DIR-INF/sources.xml
+++ b/samples/ldap_sync/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/ldap_sync/build.xml b/samples/ldap_sync/build.xml
index d06f4437..88e74628 100644
--- a/samples/ldap_sync/build.xml
+++ b/samples/ldap_sync/build.xml
@@ -37,6 +37,9 @@
         <fileset dir="../../common/lib">
             <include name="**/*.jar"/>
         </fileset>
+        <fileset dir="../../common/target">
+            <include name="**/*.jar"/>
+        </fileset>
         <fileset dir="../../core/lib">
             <include name="**/*.jar"/>
         </fileset>
@@ -63,7 +66,7 @@
         <jar jarfile="DIR-INF/target/${project.name}-ldap-sync-module-${product.version}.jar">
             <fileset dir="DIR-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} Server"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/samples/ldif/DIR-INF/connections.xml b/samples/ldif/DIR-INF/connections.xml
index fab34d20..218b33cb 100755
--- a/samples/ldif/DIR-INF/connections.xml
+++ b/samples/ldif/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/ldif/DIR-INF/directory.xml b/samples/ldif/DIR-INF/directory.xml
index bf02a006..8a7f55a6 100755
--- a/samples/ldif/DIR-INF/directory.xml
+++ b/samples/ldif/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/ldif/DIR-INF/modules.xml b/samples/ldif/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100755
--- a/samples/ldif/DIR-INF/modules.xml
+++ b/samples/ldif/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/ldif/DIR-INF/partition.xml b/samples/ldif/DIR-INF/partition.xml
index b72f9dc4..bd076797 100755
--- a/samples/ldif/DIR-INF/partition.xml
+++ b/samples/ldif/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/ldif/DIR-INF/sources.xml b/samples/ldif/DIR-INF/sources.xml
index e0a61dcd..870471e6 100755
--- a/samples/ldif/DIR-INF/sources.xml
+++ b/samples/ldif/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/lockout/DIR-INF/connections.xml b/samples/lockout/DIR-INF/connections.xml
index 29451256..9921a9f1 100644
--- a/samples/lockout/DIR-INF/connections.xml
+++ b/samples/lockout/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/lockout/DIR-INF/directory.xml b/samples/lockout/DIR-INF/directory.xml
index 71375baf..d4f48f6a 100644
--- a/samples/lockout/DIR-INF/directory.xml
+++ b/samples/lockout/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/lockout/DIR-INF/modules.xml b/samples/lockout/DIR-INF/modules.xml
index 4f78571c..0aa58066 100644
--- a/samples/lockout/DIR-INF/modules.xml
+++ b/samples/lockout/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/lockout/DIR-INF/partition.xml b/samples/lockout/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/lockout/DIR-INF/partition.xml
+++ b/samples/lockout/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/lockout/DIR-INF/scheduler.xml b/samples/lockout/DIR-INF/scheduler.xml
index b86f0ad1..4ff73771 100644
--- a/samples/lockout/DIR-INF/scheduler.xml
+++ b/samples/lockout/DIR-INF/scheduler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE scheduler PUBLIC
-  "-//Penrose/DTD Scheduler ${product.specification}//EN"
+  "-//Penrose/DTD Scheduler 2.0//EN"
   "http://penrose.safehaus.org/dtd/scheduler.dtd">
 
 <scheduler enabled="true">
diff --git a/samples/lockout/DIR-INF/sources.xml b/samples/lockout/DIR-INF/sources.xml
index dfec0986..45c7f393 100644
--- a/samples/lockout/DIR-INF/sources.xml
+++ b/samples/lockout/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/lockout/build.xml b/samples/lockout/build.xml
index c1b134ee..efa6949c 100644
--- a/samples/lockout/build.xml
+++ b/samples/lockout/build.xml
@@ -37,6 +37,9 @@
         <fileset dir="../../common/lib">
             <include name="**/*.jar"/>
         </fileset>
+        <fileset dir="../../common/target">
+            <include name="**/*.jar"/>
+        </fileset>
         <fileset dir="../../core/lib">
             <include name="**/*.jar"/>
         </fileset>
@@ -65,7 +68,7 @@
         <jar jarfile="DIR-INF/target/${project.name}-lockout-module-${product.version}.jar">
             <fileset dir="DIR-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} Server"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/samples/merge/DIR-INF/connections.xml b/samples/merge/DIR-INF/connections.xml
index 070c4b7a..43636ad5 100755
--- a/samples/merge/DIR-INF/connections.xml
+++ b/samples/merge/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/merge/DIR-INF/directory.xml b/samples/merge/DIR-INF/directory.xml
index f2cf93c8..348493bb 100755
--- a/samples/merge/DIR-INF/directory.xml
+++ b/samples/merge/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/merge/DIR-INF/modules.xml b/samples/merge/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100755
--- a/samples/merge/DIR-INF/modules.xml
+++ b/samples/merge/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/merge/DIR-INF/partition.xml b/samples/merge/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/merge/DIR-INF/partition.xml
+++ b/samples/merge/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/merge/DIR-INF/sources.xml b/samples/merge/DIR-INF/sources.xml
index 4ff21f6e..e7008afd 100755
--- a/samples/merge/DIR-INF/sources.xml
+++ b/samples/merge/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/module/DIR-INF/connections.xml b/samples/module/DIR-INF/connections.xml
index 062183f4..8624a2fd 100644
--- a/samples/module/DIR-INF/connections.xml
+++ b/samples/module/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/module/DIR-INF/directory.xml b/samples/module/DIR-INF/directory.xml
index 9ab0334b..06ffa944 100644
--- a/samples/module/DIR-INF/directory.xml
+++ b/samples/module/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/module/DIR-INF/modules.xml b/samples/module/DIR-INF/modules.xml
index c4785f38..6e8829e0 100644
--- a/samples/module/DIR-INF/modules.xml
+++ b/samples/module/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/module/DIR-INF/partition.xml b/samples/module/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/module/DIR-INF/partition.xml
+++ b/samples/module/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/module/DIR-INF/sources.xml b/samples/module/DIR-INF/sources.xml
index 85b25dcc..8ba61388 100644
--- a/samples/module/DIR-INF/sources.xml
+++ b/samples/module/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/mysql/DIR-INF/connections.xml b/samples/mysql/DIR-INF/connections.xml
index 01e9a333..c19e8c15 100755
--- a/samples/mysql/DIR-INF/connections.xml
+++ b/samples/mysql/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/mysql/DIR-INF/directory.xml b/samples/mysql/DIR-INF/directory.xml
index 6cbd00c0..592bbb1f 100755
--- a/samples/mysql/DIR-INF/directory.xml
+++ b/samples/mysql/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/mysql/DIR-INF/modules.xml b/samples/mysql/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100755
--- a/samples/mysql/DIR-INF/modules.xml
+++ b/samples/mysql/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/mysql/DIR-INF/partition.xml b/samples/mysql/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/mysql/DIR-INF/partition.xml
+++ b/samples/mysql/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/mysql/DIR-INF/sources.xml b/samples/mysql/DIR-INF/sources.xml
index 0c350bf9..dd5a6525 100755
--- a/samples/mysql/DIR-INF/sources.xml
+++ b/samples/mysql/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/nested/DIR-INF/connections.xml b/samples/nested/DIR-INF/connections.xml
index 4d0bb503..7223875b 100644
--- a/samples/nested/DIR-INF/connections.xml
+++ b/samples/nested/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/nested/DIR-INF/directory.xml b/samples/nested/DIR-INF/directory.xml
index 867f0543..34bb4db2 100644
--- a/samples/nested/DIR-INF/directory.xml
+++ b/samples/nested/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/nested/DIR-INF/modules.xml b/samples/nested/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/nested/DIR-INF/modules.xml
+++ b/samples/nested/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/nested/DIR-INF/partition.xml b/samples/nested/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/nested/DIR-INF/partition.xml
+++ b/samples/nested/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/nested/DIR-INF/sources.xml b/samples/nested/DIR-INF/sources.xml
index c778ced7..040a8a64 100644
--- a/samples/nested/DIR-INF/sources.xml
+++ b/samples/nested/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/nis/DIR-INF/connections.xml b/samples/nis/DIR-INF/connections.xml
index 7949f27c..1f91ec63 100644
--- a/samples/nis/DIR-INF/connections.xml
+++ b/samples/nis/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/nis/DIR-INF/directory.xml b/samples/nis/DIR-INF/directory.xml
index a3a104f6..24e4c680 100644
--- a/samples/nis/DIR-INF/directory.xml
+++ b/samples/nis/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/nis/DIR-INF/modules.xml b/samples/nis/DIR-INF/modules.xml
index c2015de6..18be62b4 100644
--- a/samples/nis/DIR-INF/modules.xml
+++ b/samples/nis/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/nis/DIR-INF/partition.xml b/samples/nis/DIR-INF/partition.xml
index 54347580..ff557e75 100644
--- a/samples/nis/DIR-INF/partition.xml
+++ b/samples/nis/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/nis/DIR-INF/sources.xml b/samples/nis/DIR-INF/sources.xml
index 0585d77c..66e0c8e4 100644
--- a/samples/nis/DIR-INF/sources.xml
+++ b/samples/nis/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/operational/DIR-INF/connections.xml b/samples/operational/DIR-INF/connections.xml
index 5a67813b..fb9ab48f 100644
--- a/samples/operational/DIR-INF/connections.xml
+++ b/samples/operational/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/operational/DIR-INF/directory.xml b/samples/operational/DIR-INF/directory.xml
index d456a57e..b2a7ddb8 100644
--- a/samples/operational/DIR-INF/directory.xml
+++ b/samples/operational/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/operational/DIR-INF/modules.xml b/samples/operational/DIR-INF/modules.xml
index 6877eafc..110473c2 100644
--- a/samples/operational/DIR-INF/modules.xml
+++ b/samples/operational/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/operational/DIR-INF/partition.xml b/samples/operational/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/operational/DIR-INF/partition.xml
+++ b/samples/operational/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/operational/DIR-INF/sources.xml b/samples/operational/DIR-INF/sources.xml
index 9b6a3c9e..14235ffb 100644
--- a/samples/operational/DIR-INF/sources.xml
+++ b/samples/operational/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/outlook/DIR-INF/connections.xml b/samples/outlook/DIR-INF/connections.xml
index a7aeb59f..4867bfce 100644
--- a/samples/outlook/DIR-INF/connections.xml
+++ b/samples/outlook/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/outlook/DIR-INF/directory.xml b/samples/outlook/DIR-INF/directory.xml
index 6714c311..c8ed0f9b 100644
--- a/samples/outlook/DIR-INF/directory.xml
+++ b/samples/outlook/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/outlook/DIR-INF/modules.xml b/samples/outlook/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/outlook/DIR-INF/modules.xml
+++ b/samples/outlook/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/outlook/DIR-INF/partition.xml b/samples/outlook/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/outlook/DIR-INF/partition.xml
+++ b/samples/outlook/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/outlook/DIR-INF/sources.xml b/samples/outlook/DIR-INF/sources.xml
index c69d8870..e54d15bd 100644
--- a/samples/outlook/DIR-INF/sources.xml
+++ b/samples/outlook/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/posix/DIR-INF/connections.xml b/samples/posix/DIR-INF/connections.xml
index fb0d3f32..60a5c54a 100644
--- a/samples/posix/DIR-INF/connections.xml
+++ b/samples/posix/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/posix/DIR-INF/directory.xml b/samples/posix/DIR-INF/directory.xml
index 1ce76255..560204d4 100644
--- a/samples/posix/DIR-INF/directory.xml
+++ b/samples/posix/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/posix/DIR-INF/modules.xml b/samples/posix/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/posix/DIR-INF/modules.xml
+++ b/samples/posix/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/posix/DIR-INF/partition.xml b/samples/posix/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/posix/DIR-INF/partition.xml
+++ b/samples/posix/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/posix/DIR-INF/sources.xml b/samples/posix/DIR-INF/sources.xml
index 104bcf23..a99374c7 100644
--- a/samples/posix/DIR-INF/sources.xml
+++ b/samples/posix/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/postgresql/DIR-INF/connections.xml b/samples/postgresql/DIR-INF/connections.xml
index 519871a4..198346d1 100644
--- a/samples/postgresql/DIR-INF/connections.xml
+++ b/samples/postgresql/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/postgresql/DIR-INF/directory.xml b/samples/postgresql/DIR-INF/directory.xml
index e80bf437..4052b1e1 100644
--- a/samples/postgresql/DIR-INF/directory.xml
+++ b/samples/postgresql/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/postgresql/DIR-INF/modules.xml b/samples/postgresql/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/postgresql/DIR-INF/modules.xml
+++ b/samples/postgresql/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/postgresql/DIR-INF/partition.xml b/samples/postgresql/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/postgresql/DIR-INF/partition.xml
+++ b/samples/postgresql/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/postgresql/DIR-INF/sources.xml b/samples/postgresql/DIR-INF/sources.xml
index 1a33546c..188a4c05 100644
--- a/samples/postgresql/DIR-INF/sources.xml
+++ b/samples/postgresql/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/proxy/DIR-INF/connections.xml b/samples/proxy/DIR-INF/connections.xml
index 3329dd71..27c1cb27 100644
--- a/samples/proxy/DIR-INF/connections.xml
+++ b/samples/proxy/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/proxy/DIR-INF/directory.xml b/samples/proxy/DIR-INF/directory.xml
index deca5542..a5a19b8e 100644
--- a/samples/proxy/DIR-INF/directory.xml
+++ b/samples/proxy/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/proxy/DIR-INF/modules.xml b/samples/proxy/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/proxy/DIR-INF/modules.xml
+++ b/samples/proxy/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/proxy/DIR-INF/partition.xml b/samples/proxy/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/proxy/DIR-INF/partition.xml
+++ b/samples/proxy/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/proxy/DIR-INF/sources.xml b/samples/proxy/DIR-INF/sources.xml
index b325e9b8..c45b151c 100644
--- a/samples/proxy/DIR-INF/sources.xml
+++ b/samples/proxy/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/proxy_subtree/DIR-INF/connections.xml b/samples/proxy_subtree/DIR-INF/connections.xml
index 3329dd71..27c1cb27 100755
--- a/samples/proxy_subtree/DIR-INF/connections.xml
+++ b/samples/proxy_subtree/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/proxy_subtree/DIR-INF/directory.xml b/samples/proxy_subtree/DIR-INF/directory.xml
index 63ce28a2..50b4e8d2 100755
--- a/samples/proxy_subtree/DIR-INF/directory.xml
+++ b/samples/proxy_subtree/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/proxy_subtree/DIR-INF/modules.xml b/samples/proxy_subtree/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100755
--- a/samples/proxy_subtree/DIR-INF/modules.xml
+++ b/samples/proxy_subtree/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/proxy_subtree/DIR-INF/partition.xml b/samples/proxy_subtree/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/proxy_subtree/DIR-INF/partition.xml
+++ b/samples/proxy_subtree/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/proxy_subtree/DIR-INF/sources.xml b/samples/proxy_subtree/DIR-INF/sources.xml
index f1db3e06..aa4edf22 100755
--- a/samples/proxy_subtree/DIR-INF/sources.xml
+++ b/samples/proxy_subtree/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/referral/DIR-INF/connections.xml b/samples/referral/DIR-INF/connections.xml
index 4d0bb503..7223875b 100644
--- a/samples/referral/DIR-INF/connections.xml
+++ b/samples/referral/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/referral/DIR-INF/directory.xml b/samples/referral/DIR-INF/directory.xml
index bdcdc760..b25dd809 100644
--- a/samples/referral/DIR-INF/directory.xml
+++ b/samples/referral/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/referral/DIR-INF/modules.xml b/samples/referral/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/referral/DIR-INF/modules.xml
+++ b/samples/referral/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/referral/DIR-INF/partition.xml b/samples/referral/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/referral/DIR-INF/partition.xml
+++ b/samples/referral/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/referral/DIR-INF/sources.xml b/samples/referral/DIR-INF/sources.xml
index c778ced7..040a8a64 100644
--- a/samples/referral/DIR-INF/sources.xml
+++ b/samples/referral/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/samba/DIR-INF/connections.xml b/samples/samba/DIR-INF/connections.xml
index 5734749b..eea94b53 100644
--- a/samples/samba/DIR-INF/connections.xml
+++ b/samples/samba/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/samba/DIR-INF/directory.xml b/samples/samba/DIR-INF/directory.xml
index ffc8e409..799ced81 100644
--- a/samples/samba/DIR-INF/directory.xml
+++ b/samples/samba/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/samba/DIR-INF/modules.xml b/samples/samba/DIR-INF/modules.xml
index a8ee8e33..42e9b49a 100644
--- a/samples/samba/DIR-INF/modules.xml
+++ b/samples/samba/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/samba/DIR-INF/partition.xml b/samples/samba/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/samba/DIR-INF/partition.xml
+++ b/samples/samba/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/samba/DIR-INF/sources.xml b/samples/samba/DIR-INF/sources.xml
index c4083aae..3af6d6e9 100644
--- a/samples/samba/DIR-INF/sources.xml
+++ b/samples/samba/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/sasl/DIR-INF/connections.xml b/samples/sasl/DIR-INF/connections.xml
index 56d2d541..6e4fb11c 100644
--- a/samples/sasl/DIR-INF/connections.xml
+++ b/samples/sasl/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/sasl/DIR-INF/directory.xml b/samples/sasl/DIR-INF/directory.xml
index b848d9e4..920ed6ee 100644
--- a/samples/sasl/DIR-INF/directory.xml
+++ b/samples/sasl/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/sasl/DIR-INF/modules.xml b/samples/sasl/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/sasl/DIR-INF/modules.xml
+++ b/samples/sasl/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/sasl/DIR-INF/partition.xml b/samples/sasl/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/sasl/DIR-INF/partition.xml
+++ b/samples/sasl/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/sasl/DIR-INF/sources.xml b/samples/sasl/DIR-INF/sources.xml
index 85b25dcc..8ba61388 100644
--- a/samples/sasl/DIR-INF/sources.xml
+++ b/samples/sasl/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/scheduler/DIR-INF/connections.xml b/samples/scheduler/DIR-INF/connections.xml
index 18aacc1a..fbe31b15 100644
--- a/samples/scheduler/DIR-INF/connections.xml
+++ b/samples/scheduler/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/scheduler/DIR-INF/directory.xml b/samples/scheduler/DIR-INF/directory.xml
index c23681e9..c29607b1 100644
--- a/samples/scheduler/DIR-INF/directory.xml
+++ b/samples/scheduler/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/scheduler/DIR-INF/modules.xml b/samples/scheduler/DIR-INF/modules.xml
index 07d74d0d..24422ff3 100644
--- a/samples/scheduler/DIR-INF/modules.xml
+++ b/samples/scheduler/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/scheduler/DIR-INF/partition.xml b/samples/scheduler/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100644
--- a/samples/scheduler/DIR-INF/partition.xml
+++ b/samples/scheduler/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/scheduler/DIR-INF/scheduler.xml b/samples/scheduler/DIR-INF/scheduler.xml
index 00bf410a..48c441a5 100644
--- a/samples/scheduler/DIR-INF/scheduler.xml
+++ b/samples/scheduler/DIR-INF/scheduler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE scheduler PUBLIC
-  "-//Penrose/DTD Scheduler ${product.specification}//EN"
+  "-//Penrose/DTD Scheduler 2.0//EN"
   "http://penrose.safehaus.org/dtd/scheduler.dtd">
 
 <scheduler>
diff --git a/samples/scheduler/DIR-INF/sources.xml b/samples/scheduler/DIR-INF/sources.xml
index d042d41e..cd5ccc1b 100644
--- a/samples/scheduler/DIR-INF/sources.xml
+++ b/samples/scheduler/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/synchronization/DIR-INF/connections.xml b/samples/synchronization/DIR-INF/connections.xml
index 22ff5724..5837900b 100755
--- a/samples/synchronization/DIR-INF/connections.xml
+++ b/samples/synchronization/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/synchronization/DIR-INF/directory.xml b/samples/synchronization/DIR-INF/directory.xml
index c23681e9..c29607b1 100755
--- a/samples/synchronization/DIR-INF/directory.xml
+++ b/samples/synchronization/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/synchronization/DIR-INF/modules.xml b/samples/synchronization/DIR-INF/modules.xml
index 5556ef5c..24ab2432 100755
--- a/samples/synchronization/DIR-INF/modules.xml
+++ b/samples/synchronization/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/synchronization/DIR-INF/partition.xml b/samples/synchronization/DIR-INF/partition.xml
index 6cae8f31..1da66a55 100755
--- a/samples/synchronization/DIR-INF/partition.xml
+++ b/samples/synchronization/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/synchronization/DIR-INF/sources.xml b/samples/synchronization/DIR-INF/sources.xml
index 8c44952c..d9e58802 100755
--- a/samples/synchronization/DIR-INF/sources.xml
+++ b/samples/synchronization/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/samples/unix/DIR-INF/connections.xml b/samples/unix/DIR-INF/connections.xml
index b960f9b7..d49bd511 100644
--- a/samples/unix/DIR-INF/connections.xml
+++ b/samples/unix/DIR-INF/connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE connections PUBLIC
-  "-//Penrose/DTD Connections ${product.specification}//EN"
+  "-//Penrose/DTD Connections 2.0//EN"
   "http://penrose.safehaus.org/dtd/connections.dtd">
 
 <connections>
diff --git a/samples/unix/DIR-INF/directory.xml b/samples/unix/DIR-INF/directory.xml
index 9d2f933f..880784c0 100644
--- a/samples/unix/DIR-INF/directory.xml
+++ b/samples/unix/DIR-INF/directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE directory PUBLIC
-  "-//Penrose/DTD Directory ${product.specification}//EN"
+  "-//Penrose/DTD Directory 2.0//EN"
   "http://penrose.safehaus.org/dtd/directory.dtd">
 
 <directory>
diff --git a/samples/unix/DIR-INF/modules.xml b/samples/unix/DIR-INF/modules.xml
index 77bc4cc0..5b3cb897 100644
--- a/samples/unix/DIR-INF/modules.xml
+++ b/samples/unix/DIR-INF/modules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modules PUBLIC
-  "-//Penrose/DTD Modules ${product.specification}//EN"
+  "-//Penrose/DTD Modules 2.0//EN"
   "http://penrose.safehaus.org/dtd/modules.dtd">
 
 <modules>
diff --git a/samples/unix/DIR-INF/partition.xml b/samples/unix/DIR-INF/partition.xml
index 54347580..ff557e75 100644
--- a/samples/unix/DIR-INF/partition.xml
+++ b/samples/unix/DIR-INF/partition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE partition PUBLIC
-  "-//Penrose/DTD Partition ${product.specification}//EN"
+  "-//Penrose/DTD Partition 2.0//EN"
   "http://penrose.safehaus.org/dtd/partition.dtd">
 
 <partition>
diff --git a/samples/unix/DIR-INF/sources.xml b/samples/unix/DIR-INF/sources.xml
index ced5e945..987cd144 100644
--- a/samples/unix/DIR-INF/sources.xml
+++ b/samples/unix/DIR-INF/sources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sources PUBLIC
-  "-//Penrose/DTD Sources ${product.specification}//EN"
+  "-//Penrose/DTD Sources 2.0//EN"
   "http://penrose.safehaus.org/dtd/sources.dtd">
 
 <sources>
diff --git a/server/build.xml b/server/build.xml
index fca6c561..f4b7cd03 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -96,8 +96,8 @@
             classpathref="lib.path"
             debug="on"
             debuglevel="lines,vars,source"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
         />
         <copy todir="target/classes">
             <fileset dir="src/java" includes="**/*.properties,**/*.xml,**/*.dtd"/>
@@ -109,7 +109,7 @@
         <jar jarfile="target/${product.name}-${product.version}.jar">
             <fileset dir="target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${product.title}"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/services/ApacheDS/SERVICE-INF/service.xml b/services/ApacheDS/SERVICE-INF/service.xml
index ddd1f785..0060de1b 100644
--- a/services/ApacheDS/SERVICE-INF/service.xml
+++ b/services/ApacheDS/SERVICE-INF/service.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE service PUBLIC
-  "-//Penrose/DTD Service ${product.specification}//EN"
+  "-//Penrose/DTD Service 2.0//EN"
   "http://penrose.safehaus.org/dtd/service.dtd">
 
 <service enabled="false">
diff --git a/services/ApacheDS/build.xml b/services/ApacheDS/build.xml
index a8711c8c..be478a1e 100644
--- a/services/ApacheDS/build.xml
+++ b/services/ApacheDS/build.xml
@@ -70,7 +70,7 @@
         <jar jarfile="SERVICE-INF/target/${project.name}-${service.name}-service-${product.version}.jar">
             <fileset dir="SERVICE-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} ${service.title} Service"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/services/JMX/SERVICE-INF/service.xml b/services/JMX/SERVICE-INF/service.xml
index 37c75a08..08388ff1 100644
--- a/services/JMX/SERVICE-INF/service.xml
+++ b/services/JMX/SERVICE-INF/service.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE service PUBLIC
-  "-//Penrose/DTD Service ${product.specification}//EN"
+  "-//Penrose/DTD Service 2.0//EN"
   "http://penrose.safehaus.org/dtd/service.dtd">
 
 <service enabled="true">
diff --git a/services/JMX/SERVICE-INF/src/java/org/safehaus/penrose/management/module/ModuleService.java b/services/JMX/SERVICE-INF/src/java/org/safehaus/penrose/management/module/ModuleService.java
index 4e96d0f9..d78277f8 100644
--- a/services/JMX/SERVICE-INF/src/java/org/safehaus/penrose/management/module/ModuleService.java
+++ b/services/JMX/SERVICE-INF/src/java/org/safehaus/penrose/management/module/ModuleService.java
@@ -1,141 +1,141 @@
-package org.safehaus.penrose.management.module;
-
-import org.safehaus.penrose.module.*;
-import org.safehaus.penrose.partition.Partition;
-import org.safehaus.penrose.partition.PartitionConfig;
-import org.safehaus.penrose.partition.PartitionManager;
-import org.safehaus.penrose.management.BaseService;
-import org.safehaus.penrose.management.PenroseJMXService;
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-/**
- * @author Endi Sukma Dewata
- */
-public class ModuleService extends BaseService implements ModuleServiceMBean {
-
-    private PartitionManager partitionManager;
-    private String partitionName;
-    private String moduleName;
-
-    public ModuleService(
-            PenroseJMXService jmxService,
-            PartitionManager partitionManager,
-            String partitionName,
-            String moduleName
-    ) throws Exception {
-
-        this.jmxService = jmxService;
-        this.partitionManager = partitionManager;
-        this.partitionName = partitionName;
-        this.moduleName = moduleName;
-    }
-
-    public String getObjectName() {
-        return ModuleClient.getStringObjectName(partitionName, moduleName);
-    }
-
-    public Object getObject() {
-        return getModule();
-    }
-
-    public ModuleConfig getModuleConfig() throws Exception {
-        return getPartitionConfig().getModuleConfigManager().getModuleConfig(moduleName);
-    }
-
-    public Collection<String> getParameterNames() throws Exception {
-        ModuleConfig moduleConfig = getModuleConfig();
-        Collection<String> list = new ArrayList<String>();
-        list.addAll(moduleConfig.getParameterNames());
-        return list;
-    }
-
-    public String getParameter(String name) throws Exception {
-        ModuleConfig moduleConfig = getModuleConfig();
-        return moduleConfig.getParameter(name);
-    }
-
-    public Module getModule() {
-        Partition partition = getPartition();
-        if (partition == null) return null;
-
-        ModuleManager moduleManager = partition.getModuleManager();
-        return moduleManager.getModule(moduleName);
-    }
-
-    public PartitionConfig getPartitionConfig() {
-        return partitionManager.getPartitionConfig(partitionName);
-    }
-
-    public Partition getPartition() {
-        return partitionManager.getPartition(partitionName);
-    }
-
-    public void addModuleMapping(ModuleMapping moduleMapping) throws Exception {
-        ModuleConfig moduleConfig = getModuleConfig();
-        moduleConfig.addModuleMapping(moduleMapping);
-        //PartitionConfig partitionConfig = getPartitionConfig();
-        //ModuleConfigManager moduleConfigManager = partitionConfig.getModuleConfigManager();
-        //moduleConfigManager.addModuleMapping(moduleMapping);
-    }
-
-    public void removeModuleMapping(ModuleMapping moduleMapping) throws Exception {
-        ModuleConfig moduleConfig = getModuleConfig();
-        moduleConfig.removeModuleMapping(moduleMapping);
-        //PartitionConfig partitionConfig = getPartitionConfig();
-        //ModuleConfigManager moduleConfigManager = partitionConfig.getModuleConfigManager();
-        //moduleConfigManager.removeModuleMapping(moduleMapping);
-    }
-
-    public Collection<ModuleMapping> getModuleMappings() throws Exception {
-        ModuleConfig moduleConfig = getModuleConfig();
-        Collection<ModuleMapping> results = new ArrayList<ModuleMapping>();
-        results.addAll(moduleConfig.getModuleMappings());
-/*
-        PartitionConfig partitionConfig = getPartitionConfig();
-        ModuleConfigManager moduleConfigManager = partitionConfig.getModuleConfigManager();
-
-        Collection<ModuleMapping> results = new ArrayList<ModuleMapping>();
-        Collection<ModuleMapping> list = moduleConfigManager.getModuleMappings(moduleName);
-        if (list != null) results.addAll(list);
-*/
-        return results;
-    }
-
-    public String getStatus() throws Exception {
-        Module module = getModule();
-        return module == null ? ModuleServiceMBean.STOPPED : ModuleServiceMBean.STARTED;
-    }
-
-    public void start() throws Exception {
-
-        log.debug("Starting module "+partitionName+"/"+moduleName+"...");
-
-        Module module = getModule();
-        module.init();
-
-        log.debug("Module started.");
-    }
-
-    public void stop() throws Exception {
-
-        log.debug("Stopping module "+partitionName+"/"+moduleName+"...");
-
-        Module module = getModule();
-        module.destroy();
-
-        log.debug("Module stopped.");
-    }
-
-    public void restart() throws Exception {
-
-        log.debug("Restarting module "+partitionName+"/"+moduleName+"...");
-
-        Module module = getModule();
-        module.destroy();
-        module.init();
-
-        log.debug("Module restarted.");
-    }
-}
+package org.safehaus.penrose.management.module;
+
+import org.safehaus.penrose.module.*;
+import org.safehaus.penrose.partition.Partition;
+import org.safehaus.penrose.partition.PartitionConfig;
+import org.safehaus.penrose.partition.PartitionManager;
+import org.safehaus.penrose.management.BaseService;
+import org.safehaus.penrose.management.PenroseJMXService;
+
+import java.util.Collection;
+import java.util.ArrayList;
+
+/**
+ * @author Endi Sukma Dewata
+ */
+public class ModuleService extends BaseService implements ModuleServiceMBean {
+
+    private PartitionManager partitionManager;
+    private String partitionName;
+    private String moduleName;
+
+    public ModuleService(
+            PenroseJMXService jmxService,
+            PartitionManager partitionManager,
+            String partitionName,
+            String moduleName
+    ) throws Exception {
+
+        this.jmxService = jmxService;
+        this.partitionManager = partitionManager;
+        this.partitionName = partitionName;
+        this.moduleName = moduleName;
+    }
+
+    public String getObjectName() {
+        return ModuleClient.getStringObjectName(partitionName, moduleName);
+    }
+
+    public Object getObject() {
+        return getModule();
+    }
+
+    public ModuleConfig getModuleConfig() throws Exception {
+        return getPartitionConfig().getModuleConfigManager().getModuleConfig(moduleName);
+    }
+
+    public Collection<String> getParameterNames() throws Exception {
+        ModuleConfig moduleConfig = getModuleConfig();
+        Collection<String> list = new ArrayList<String>();
+        list.addAll(moduleConfig.getParameterNames());
+        return list;
+    }
+
+    public String getParameter(String name) throws Exception {
+        ModuleConfig moduleConfig = getModuleConfig();
+        return moduleConfig.getParameter(name);
+    }
+
+    public org.safehaus.penrose.module.Module getModule() {
+        Partition partition = getPartition();
+        if (partition == null) return null;
+
+        ModuleManager moduleManager = partition.getModuleManager();
+        return moduleManager.getModule(moduleName);
+    }
+
+    public PartitionConfig getPartitionConfig() {
+        return partitionManager.getPartitionConfig(partitionName);
+    }
+
+    public Partition getPartition() {
+        return partitionManager.getPartition(partitionName);
+    }
+
+    public void addModuleMapping(ModuleMapping moduleMapping) throws Exception {
+        ModuleConfig moduleConfig = getModuleConfig();
+        moduleConfig.addModuleMapping(moduleMapping);
+        //PartitionConfig partitionConfig = getPartitionConfig();
+        //ModuleConfigManager moduleConfigManager = partitionConfig.getModuleConfigManager();
+        //moduleConfigManager.addModuleMapping(moduleMapping);
+    }
+
+    public void removeModuleMapping(ModuleMapping moduleMapping) throws Exception {
+        ModuleConfig moduleConfig = getModuleConfig();
+        moduleConfig.removeModuleMapping(moduleMapping);
+        //PartitionConfig partitionConfig = getPartitionConfig();
+        //ModuleConfigManager moduleConfigManager = partitionConfig.getModuleConfigManager();
+        //moduleConfigManager.removeModuleMapping(moduleMapping);
+    }
+
+    public Collection<ModuleMapping> getModuleMappings() throws Exception {
+        ModuleConfig moduleConfig = getModuleConfig();
+        Collection<ModuleMapping> results = new ArrayList<ModuleMapping>();
+        results.addAll(moduleConfig.getModuleMappings());
+/*
+        PartitionConfig partitionConfig = getPartitionConfig();
+        ModuleConfigManager moduleConfigManager = partitionConfig.getModuleConfigManager();
+
+        Collection<ModuleMapping> results = new ArrayList<ModuleMapping>();
+        Collection<ModuleMapping> list = moduleConfigManager.getModuleMappings(moduleName);
+        if (list != null) results.addAll(list);
+*/
+        return results;
+    }
+
+    public String getStatus() throws Exception {
+        org.safehaus.penrose.module.Module module = getModule();
+        return module == null ? ModuleServiceMBean.STOPPED : ModuleServiceMBean.STARTED;
+    }
+
+    public void start() throws Exception {
+
+        log.debug("Starting module "+partitionName+"/"+moduleName+"...");
+
+        org.safehaus.penrose.module.Module module = getModule();
+        module.init();
+
+        log.debug("Module started.");
+    }
+
+    public void stop() throws Exception {
+
+        log.debug("Stopping module "+partitionName+"/"+moduleName+"...");
+
+        org.safehaus.penrose.module.Module module = getModule();
+        module.destroy();
+
+        log.debug("Module stopped.");
+    }
+
+    public void restart() throws Exception {
+
+        log.debug("Restarting module "+partitionName+"/"+moduleName+"...");
+
+        org.safehaus.penrose.module.Module module = getModule();
+        module.destroy();
+        module.init();
+
+        log.debug("Module restarted.");
+    }
+}
diff --git a/services/JMX/build.xml b/services/JMX/build.xml
index fd6b5d9f..bb76013a 100644
--- a/services/JMX/build.xml
+++ b/services/JMX/build.xml
@@ -65,7 +65,7 @@
         <jar jarfile="SERVICE-INF/target/${project.name}-${service.name}-service-${product.version}.jar">
             <fileset dir="SERVICE-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} ${service.title} Service"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/services/LDAP/SERVICE-INF/service.xml b/services/LDAP/SERVICE-INF/service.xml
index c9aff22c..f186a17f 100644
--- a/services/LDAP/SERVICE-INF/service.xml
+++ b/services/LDAP/SERVICE-INF/service.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE service PUBLIC
-  "-//Penrose/DTD Service ${product.specification}//EN"
+  "-//Penrose/DTD Service 2.0//EN"
   "http://penrose.safehaus.org/dtd/service.dtd">
 
 <service enabled="false">
diff --git a/services/LDAP/build.xml b/services/LDAP/build.xml
index 65de48a8..d4e2cf05 100644
--- a/services/LDAP/build.xml
+++ b/services/LDAP/build.xml
@@ -66,7 +66,7 @@
         <jar jarfile="SERVICE-INF/target/${project.name}-${service.name}-service-${product.version}.jar">
             <fileset dir="SERVICE-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} ${service.title} Service"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>
diff --git a/services/OpenDS/SERVICE-INF/service.xml b/services/OpenDS/SERVICE-INF/service.xml
index 45799da8..a0d2897c 100644
--- a/services/OpenDS/SERVICE-INF/service.xml
+++ b/services/OpenDS/SERVICE-INF/service.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE service PUBLIC
-  "-//Penrose/DTD Service ${product.specification}//EN"
+  "-//Penrose/DTD Service 2.0//EN"
   "http://penrose.safehaus.org/dtd/service.dtd">
 
 <service enabled="true">
diff --git a/services/OpenDS/build.xml b/services/OpenDS/build.xml
index daa7e781..5740e3d3 100644
--- a/services/OpenDS/build.xml
+++ b/services/OpenDS/build.xml
@@ -66,7 +66,7 @@
         <jar jarfile="SERVICE-INF/target/${project.name}-${service.name}-service-${product.version}.jar">
             <fileset dir="SERVICE-INF/target/classes"/>
             <manifest>
-              <attribute name="Specification-Version"  value="${product.specification}"/>
+              <attribute name="Specification-Version"  value="2.0"/>
               <attribute name="Implementation-Title"   value="${project.title} ${service.title} Service"/>
               <attribute name="Implementation-Version" value="${product.version}"/>
               <attribute name="Implementation-Vendor"  value="${product.vendor}"/>