diff --git a/ccm-core/application.xml b/ccm-core/application.xml
index 51bd63a69..fa35e42f8 100755
--- a/ccm-core/application.xml
+++ b/ccm-core/application.xml
@@ -3,7 +3,7 @@
   name="ccm-core"
   prettyName="Core"
   version="6.6.6"
-  release="1"
+  release="2"
   shared="true"
   webapp="ROOT"
   buildHooks="build-hooks.xml">
@@ -11,10 +11,12 @@
     <ccm:buildRequires name="httpunit" version="1.5.4" relation="ge"/>
     <ccm:buildRequires name="junit" version="3.8.1" relation="ge"/>
     <ccm:buildRequires name="junitperf" version="1.8" relation="ge"/>
-    <ccm:buildRequires name="ccm-servlet" version="2.3" relation="ge"/>
+    <ccm:buildRequires name="servlet-api" version="2.5" relation="ge"/>
+    <ccm:buildRequires name="jsp-api" version="2.1" relation="ge"/>
     <ccm:buildRequires name="ojdbc14"/>
     <ccm:buildRequires name="postgresql-jdbc"/>
-    <ccm:runRequires name="ccm-servlet-2.3"/>
+    <ccm:runRequires name="servlet-api"/>
+    <ccm:runRequires name="jsp-api"/>
   </ccm:dependencies>
 
   <!-- DEPRECATED
diff --git a/tools-ng/common/lib/ccm-servlet23.jar b/tools-ng/common/lib/ccm-servlet23.jar
deleted file mode 120000
index 7908d9960..000000000
--- a/tools-ng/common/lib/ccm-servlet23.jar
+++ /dev/null
@@ -1 +0,0 @@
-servlet-2.3.jar
\ No newline at end of file
diff --git a/tools-ng/common/lib/jsp-api.jar b/tools-ng/common/lib/jsp-api.jar
new file mode 100644
index 000000000..d0286662b
Binary files /dev/null and b/tools-ng/common/lib/jsp-api.jar differ
diff --git a/tools-ng/common/lib/servlet-2.3.jar b/tools-ng/common/lib/servlet-2.3.jar
deleted file mode 100644
index 7d23e0b2e..000000000
Binary files a/tools-ng/common/lib/servlet-2.3.jar and /dev/null differ
diff --git a/tools-ng/common/lib/servlet-api.jar b/tools-ng/common/lib/servlet-api.jar
new file mode 100644
index 000000000..8f0c41ebb
Binary files /dev/null and b/tools-ng/common/lib/servlet-api.jar differ
diff --git a/tools-ng/common/lib/servlet.jar b/tools-ng/common/lib/servlet.jar
deleted file mode 120000
index 7908d9960..000000000
--- a/tools-ng/common/lib/servlet.jar
+++ /dev/null
@@ -1 +0,0 @@
-servlet-2.3.jar
\ No newline at end of file
diff --git a/tools-ng/devel/lib/ccm-servlet-2.3.jar b/tools-ng/devel/lib/ccm-servlet-2.3.jar
deleted file mode 100755
index 7d23e0b2e..000000000
Binary files a/tools-ng/devel/lib/ccm-servlet-2.3.jar and /dev/null differ
diff --git a/tools-ng/devel/lib/jsp-api.jar b/tools-ng/devel/lib/jsp-api.jar
new file mode 100644
index 000000000..d0286662b
Binary files /dev/null and b/tools-ng/devel/lib/jsp-api.jar differ
diff --git a/tools-ng/devel/lib/servlet-api.jar b/tools-ng/devel/lib/servlet-api.jar
new file mode 100644
index 000000000..8f0c41ebb
Binary files /dev/null and b/tools-ng/devel/lib/servlet-api.jar differ
diff --git a/tools-ng/ecdc/bundles/apache-tomcat-5.5.27.zip b/tools-ng/ecdc/bundles/apache-tomcat-5.5.27.zip
deleted file mode 100644
index 63702c59e..000000000
Binary files a/tools-ng/ecdc/bundles/apache-tomcat-5.5.27.zip and /dev/null differ
diff --git a/tools-ng/ecdc/bundles/apache-tomcat-6.0.32.zip b/tools-ng/ecdc/bundles/apache-tomcat-6.0.32.zip
deleted file mode 100644
index e99615b13..000000000
Binary files a/tools-ng/ecdc/bundles/apache-tomcat-6.0.32.zip and /dev/null differ
diff --git a/tools-ng/ecdc/bundles/apache-tomcat-6.0.39.zip b/tools-ng/ecdc/bundles/apache-tomcat-6.0.39.zip
new file mode 100644
index 000000000..c9ab499f1
Binary files /dev/null and b/tools-ng/ecdc/bundles/apache-tomcat-6.0.39.zip differ
diff --git a/tools-ng/ecdc/conf/runtime.properties b/tools-ng/ecdc/conf/runtime.properties
index 15a9baf4d..65c59a5d2 100644
--- a/tools-ng/ecdc/conf/runtime.properties
+++ b/tools-ng/ecdc/conf/runtime.properties
@@ -20,10 +20,7 @@
 
     app.server.vendor=apache
     app.server.type=tomcat
-    # Tomcat version 5.5 not yet supported!
-    # app.server.version=5.5.27
-    # app.server.version=6.0.20
-    app.server.version=6.0.32
+    app.server.version=6.0.39
 
 
     app.server.bundles.name=${app.server.vendor}-${app.server.type}-${app.server.version}
diff --git a/tools-ng/ecdc/local.ccm.properties b/tools-ng/ecdc/local.ccm.properties
index c9fd66fd3..1f058ebd4 100644
--- a/tools-ng/ecdc/local.ccm.properties
+++ b/tools-ng/ecdc/local.ccm.properties
@@ -5,153 +5,52 @@
 ## -------------------------------------------------
 ## Usually you will define your own specific bundle!
 ## -------------------------------------------------
+
+#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/base
+#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/standard
+# ==============================================================================
+# Use a project in the local subdir to specify your own local/custom development 
+# project. Don't modify any of the system provided specifications! Instead, copy 
+# one of the systems project, e.g. devel, to local and modify it according to
+#  your needs!
+# ==============================================================================
+#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/my-devel
+
 #ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/custom
 #ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/demo
-ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
 #ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/extended
 #ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/standard
+# ==============================================================================
+# Use a project in the local subdir to specify your own local/custom development 
+# project. Don't modify any of the system provided specifications! Instead, copy 
+# one of the systems project, e.g. devel, to local and modify it according to
+#  your needs!
+# ==============================================================================
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/my-devel
 
 
-#ccm.upgrade.package=ccm-xxx
-#ccm.upgrade.from.version=x.x.x
-#ccm.upgrade.to.version=y.y.y
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/custom
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/demo
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/extended
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/standard
+# ==============================================================================
+# Use a project in the local subdir to specify your own local/custom development 
+# project. Don't modify any of the system provided specifications! Instead, copy 
+# one of the systems project, e.g. devel, to local and modify it according to
+#  your needs!
+# ==============================================================================
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/my-devel
+
 
 ## ====================================================================
 ## Update scripts
 ## ====================================================================
 
-
-# ---------------------------------------------------------------------
-# Update post rel. 1.1.2 (trunk - temporal)
-# Execute after Update 1.1.1 -> 1.1.2 !
-# ---------------------------------------------------------------------
-# (hb r903: Navigation legacy free)
-#ccm.upgrade.package=ccm-ldn-navigation
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# (hb r908 cms new style legacy compatible instead of old style / kernel.package)
-#ccm.upgrade.package=ccm-cms
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# ---------------------------------------------------------------------
-# Update from (internal) rel. 1.1.1 to 1.1.2 
-# Execute after Update 1.1.0 -> 1.1.1 ! 
-# ---------------------------------------------------------------------
-# (hb r894/r914: core portal legacy free)
-#ccm.upgrade.package=ccm-core
-#ccm.upgrade.from.version=6.6.2
-#ccm.upgrade.to.version=6.6.3
-
-# (hb 799: former type address renamed to simpleaddress)
-#ccm.upgrade.package=ccm-cms-types-simpleaddress
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# (hb r800: rename ccm-ldn-theme to ccm-themedirector) 
-#ccm.upgrade.package=ccm-themedirector
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# (hb r818: rename ccm-ldn-portal to ccm-portalworkspace)
-#ccm.upgrade.package=ccm-portalworkspace
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# (hb r829: portalworkspace [and themedirector] legacy free)
-#ccm.upgrade.package=ccm-portalworkspace
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# (hb r829: themedirector [and portalworkspace] legacy free)
-#ccm.upgrade.package=ccm-themedirector
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# (hb r803/806: persistent property private mode added) 
-#ccm.upgrade.package=ccm-forum
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# (hb r833: named related links)
-#ccm.upgrade.package=ccm-cms-assets-relatedlink
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# (hb r836: unused table web_apps removed) 
-#ccm.upgrade.package=ccm-core
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# -----------------------------------------------------
-# Update from (internal) rel. 1.1.0 to 1.1.1 
-# -----------------------------------------------------
-#ccm.upgrade.package=ccm-cms-assets-imagestep
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-#ccm.upgrade.package=ccm-cms-assets-notes
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-#ccm.upgrade.package=ccm-ldn-navigation
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-#ccm.upgrade.package=ccm-ldn-terms
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-#ccm.upgrade.package=ccm-cms
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-#ccm.upgrade.package=ccm-cms-types-article
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-#ccm.upgrade.package=ccm-cms-types-newsitem
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-#ccm.upgrade.package=ccm-cms-types-event
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-#ccm.upgrade.package=ccm-core
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-
-# -----------------------------------------------------
-# Update from rel. 1.0.5 to (internal) 1.1.0 
-# ----------------------------------------------------
-# ccm.upgrade.package=ccm-core
-# ccm.upgrade.from.version=6.5.2
-# ccm.upgrade.to.version=6.5.3
-
-# ccm.upgrade.package=ccm-core
-# ccm.upgrade.from.version=6.5.5
-# ccm.upgrade.to.version=6.5.6
-
-# ccm.upgrade.package=ccm-cms
-# ccm.upgrade.from.version=6.5.3
-# ccm.upgrade.to.version=6.5.4
-
-# ccm.upgrade.package=ccm-ldn-portal
-# ccm.upgrade.from.version=6.5.1
-# ccm.upgrade.to.version=6.5.2
-
-# ccm.upgrade.package=ccm-ldn-portal
-# ccm.upgrade.from.version=6.5.2
-# ccm.upgrade.to.version=6.5.3
-
-# ccm.upgrade.package=ccm-ldn-terms
-# ccm.upgrade.from.version=6.5.0
-# ccm.upgrade.to.version=6.5.1
-
-# ccm.upgrade.package=ccm-ldn-terms
-# ccm.upgrade.from.version=6.5.1
-# ccm.upgrade.to.version=6.5.2
+# TEMPLATE:
+#ccm.upgrade.package=ccm-xxx
+#ccm.upgrade.from.version=x.x.x
+#ccm.upgrade.to.version=y.y.y
 
diff --git a/tools-ng/ecdc/local.runtime.properties b/tools-ng/ecdc/local.runtime.properties
index 6e8c8ca0c..b9c7fe14f 100644
--- a/tools-ng/ecdc/local.runtime.properties
+++ b/tools-ng/ecdc/local.runtime.properties
@@ -10,9 +10,7 @@
 
     #app.server.vendor=apache
     #app.server.type=tomcat
-    ##  Tomcat 5.5 currently not supported!
-    ##app.server.version=5.5.27
-    #app.server.version=6.0.32
+    #app.server.version=6.0.39
  
 ##
 ## Debugger Usage
diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml
index 356639a15..b69bece86 100644
--- a/tools-ng/netbeans/project.xml
+++ b/tools-ng/netbeans/project.xml
@@ -2,21 +2,14 @@
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.ant.freeform</type>
     <configuration>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+            <name>CCM (trunk)</name>
+        </general-data>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
             <!-- Wenn Sie diese Datei manuell editieren, vermeiden Sie die Einstellung der Eigenschaften mittels Werkzeug. -->
             <name>CCM (trunk)</name>
             <properties/>
             <folders>
-                <source-folder>
-                    <label>webapps</label>
-                    <type>doc_root</type>
-                    <location>~/ccm-devel/runtime/apache-tomcat-6.0.32/webapps</location>
-                </source-folder>
-                <source-folder>
-                    <label>WEB-INF</label>
-                    <type>web_inf</type>
-                    <location>~/ccm-devel/runtime/apache-tomcat-6.0.32/webapps/ROOT/WEB-INF</location>
-                </source-folder>
                 <source-folder>
                     <label>CCM (trunk)</label>
                     <location>.</location>
@@ -28,12 +21,6 @@
                     <location>ccm-core/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
-                <source-folder>
-                    <label>ccm-core (Web)</label>
-                    <type>java</type>
-                    <location>ccm-core/web</location>
-                    <encoding>UTF-8</encoding>
-                </source-folder>
                 <source-folder>
                     <label>ccm-cms (Source)</label>
                     <type>java</type>
@@ -41,9 +28,9 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>ccm-cms (Web)</label>
+                    <label>ccm-cms-assets-dublincore (Source)</label>
                     <type>java</type>
-                    <location>ccm-cms/web</location>
+                    <location>ccm-cms-assets-dublincore/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
@@ -106,6 +93,12 @@
                     <location>ccm-cms-types-contact/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-cms-types-decisiontree (Source)</label>
+                    <type>java</type>
+                    <location>ccm-cms-types-decisiontree/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-event (Source)</label>
                     <type>java</type>
@@ -502,7 +495,6 @@
                     <location>ccm-ldn-util/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
-
                 <source-folder>
                     <label>ccm-lbc-aplaws (Source)</label>
                     <type>java</type>
@@ -521,12 +513,6 @@
                     <location>ccm-lbc-contentcheck/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
-                <source-folder>
-                    <label>ccm-lbc-decisiontree (Source)</label>
-                    <type>java</type>
-                    <location>ccm-lbc-decisiontree/src</location>
-                    <encoding>UTF-8</encoding>
-                </source-folder>
                 <source-folder>
                     <label>ccm-lbc-eforms (Source)</label>
                     <type>java</type>
@@ -551,7 +537,6 @@
                     <location>ccm-lbc-wordxml/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
-
                 <source-folder>
                     <label>ccm-sci-bundle (Source)</label>
                     <type>java</type>
@@ -600,6 +585,16 @@
                     <location>ccm-sci-types-project/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>webapps</label>
+                    <type>doc_root</type>
+                    <location>runtime/webapps</location>
+                </source-folder>
+                <source-folder>
+                    <label>WEB-INF</label>
+                    <type>web_inf</type>
+                    <location>runtime/webapps/WEB-INF</location>
+                </source-folder>
             </folders>
             <ide-actions>
                 <action name="build">
@@ -647,17 +642,13 @@
                         <label>ccm-core (Source)</label>
                         <location>ccm-core/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-core (Web)</label>
-                        <location>ccm-core/web</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms (Source)</label>
                         <location>ccm-cms/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>ccm-cms (Web)</label>
-                        <location>ccm-cms/web</location>
+                        <label>ccm-cms-assets-dublincore (Source)</label>
+                        <location>ccm-cms-assets-dublincore/src</location>
                     </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-assets-fileattachment (Source)</label>
@@ -699,6 +690,10 @@
                         <label>ccm-cms-types-contact (Source)</label>
                         <location>ccm-cms-types-contact/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-cms-types-decisiontree (Source)</label>
+                        <location>ccm-cms-types-decisiontree/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-types-event (Source)</label>
                         <location>ccm-cms-types-event/src</location>
@@ -895,11 +890,11 @@
                         <label>ccm-simplesurvey (Source)</label>
                         <location>ccm-simplesurvey/src</location>
                     </source-folder>
-                     <source-folder style="packages">
+                    <source-folder style="packages">
                         <label>ccm-subsite (Source)</label>
                         <location>ccm-subsite/src</location>
                     </source-folder>
-                   <source-folder style="packages">
+                    <source-folder style="packages">
                         <label>ccm-themedirector (Source)</label>
                         <location>ccm-themedirector/src</location>
                     </source-folder>
@@ -919,6 +914,10 @@
                         <label>ccm-ldn-atoz (Source)</label>
                         <location>ccm-ldn-atoz/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-ldn-atoz-siteproxy (Source)</label>
+                        <location>ccm-ldn-atoz-siteproxy/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-ldn-dublin (Source)</label>
                         <location>ccm-ldn-dublin/src</location>
@@ -959,7 +958,6 @@
                         <label>ccm-ldn-util (Source)</label>
                         <location>ccm-ldn-util/src</location>
                     </source-folder>
-
                     <source-folder style="packages">
                         <label>ccm-lbc-aplaws (Source)</label>
                         <location>ccm-lbc-aplaws/src</location>
@@ -972,10 +970,6 @@
                         <label>ccm-lbc-contentcheck (Source)</label>
                         <location>ccm-lbc-contentcheck/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-lbc-decisiontree (Source)</label>
-                        <location>ccm-lbc-decisiontree/src</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-lbc-eforms (Source)</label>
                         <location>ccm-lbc-eforms/src</location>
@@ -992,7 +986,6 @@
                         <label>ccm-lbc-wordxml (Source)</label>
                         <location>ccm-lbc-wordxml/src</location>
                     </source-folder>
-
                     <source-folder style="packages">
                         <label>ccm-sci-bundle (Source)</label>
                         <location>ccm-sci-bundle/src</location>
@@ -1042,10 +1035,11 @@
             </view>
             <subprojects/>
         </general-data>
-        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
             <compilation-unit>
                 <package-root>ccm-core/src</package-root>
                 <package-root>ccm-cms/src</package-root>
+                <package-root>ccm-cms-assets-dublincore/src</package-root>
                 <package-root>ccm-cms-assets-fileattachment/src</package-root>
                 <package-root>ccm-cms-assets-imagestep/src</package-root>
                 <package-root>ccm-cms-assets-notes/src</package-root>
@@ -1056,6 +1050,7 @@
                 <package-root>ccm-cms-types-article/src</package-root>
                 <package-root>ccm-cms-types-bookmark/src</package-root>
                 <package-root>ccm-cms-types-contact/src</package-root>
+                <package-root>ccm-cms-types-decisiontree/src</package-root>
                 <package-root>ccm-cms-types-esdservice/src</package-root>
                 <package-root>ccm-cms-types-event/src</package-root>
                 <package-root>ccm-cms-types-faqitem/src</package-root>
@@ -1125,7 +1120,6 @@
                 <package-root>ccm-lbc-aplaws/src</package-root>
                 <package-root>ccm-lbc-consultation/src</package-root>
                 <package-root>ccm-lbc-contentcheck/src</package-root>
-                <package-root>ccm-lbc-decisiontree/src</package-root>
                 <package-root>ccm-lbc-eforms/src</package-root>
                 <package-root>ccm-lbc-foi/src</package-root>
                 <package-root>ccm-lbc-retention/src</package-root>
@@ -1138,9 +1132,8 @@
                 <package-root>ccm-sci-types-institute/src</package-root>
                 <package-root>ccm-sci-types-member/src</package-root>
                 <package-root>ccm-sci-types-project/src</package-root>
-
-                <classpath mode="compile">ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.2.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:tools-ng/devel/lib/ccm-servlet-2.3.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/postgresql-jdbc.jar</classpath>
-                <source-level>1.5</source-level>
+                <classpath mode="compile">ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.3-SNAPSHOT.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:ccm-sci-publications/lib/jbibtex-1.0.2.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/postgresql-jdbc.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api.jar</classpath>
+                <source-level>1.6</source-level>
             </compilation-unit>
         </java-data>
         <preferences xmlns="http://www.netbeans.org/ns/auxiliary-configuration-preferences/1">
@@ -1164,8 +1157,9 @@
         <web-data xmlns="http://www.netbeans.org/ns/freeform-project-web/1">
             <web-module>
                 <doc-root>runtime/webapps</doc-root>
-                <classpath>ccm-core/lib/log4j.jar:/usr/share/java/ccm-servlet.jar</classpath>
-                <j2ee-spec-level>1.3</j2ee-spec-level>
+                <classpath>ccm-core/lib/log4j.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api</classpath>
+                <context-path/>
+                <j2ee-spec-level>1.5</j2ee-spec-level>
             </web-module>
         </web-data>
     </configuration>