Index: .checkstyle
===================================================================
RCS file: .checkstyle
diff -N .checkstyle
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .checkstyle	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <fileset name="all" enabled="true" check-config-name="OpenCms" local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
Index: .classpath
===================================================================
RCS file: .classpath
diff -N .classpath
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .classpath	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-modules"/>
+	<classpathentry kind="src" path="src-components"/>
+	<classpathentry kind="src" path="src-setup"/>
+	<classpathentry excluding="data/**|org/opencms/util/ant/" kind="src" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="modules/org.opencms.frontend.layoutpage/resources/system/modules/org.opencms.frontend.layoutpage/lib/freemarker-2.3.6.jar"/>
+	<classpathentry kind="lib" path="lib/compile/ant.jar"/>
+	<classpathentry kind="lib" path="lib/compile/ant-contrib-1.0b1.jar"/>
+	<classpathentry kind="lib" path="lib/compile/ant-opencms-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/compile/jsp-api.jar"/>
+	<classpathentry kind="lib" path="lib/compile/junit-3-8-1.jar"/>
+	<classpathentry kind="lib" path="lib/compile/servlet-api.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/alkacon-diff-0.9.2.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-codec-1.3.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-dbcp-1.2.2.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-digester-1.8.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/htmlparser-1.6-20060610.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/jakarta-oro-2.0.8.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/jstl-1.1.2.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/jug-lgpl-2.0.0.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/PDFBox-0.7.2.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/poi-2.5.1-final-20040804.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/quartz-1.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/standard-1.1.2.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/tm-extractors-0.4.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/jtidy-8-svn-2006-05-21b.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/activation-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/alkacon-simapi-0.9.8.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-beanutils-1.8.0.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-collections-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-fileupload-1.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-httpclient-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-io-1.4.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/jaxen-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/mail-1.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/xercesImpl-2.9.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/xml-apis-2.9.1.jar"/>
+	<classpathentry kind="lib" path="lib/compile/dumbster-1.6.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/lucene-analyzers-2.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/lucene-core-2.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/lucene-highlighter-2.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/lucene-queries-2.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/lucene-snowball-2.4.1.jar"/>
+	<classpathentry kind="lib" path="modules/org.opencms.frontend.templateone.form/resources/system/modules/org.opencms.frontend.templateone.form/lib/jcaptcha-1.0-all.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-pool-1.5.4.jar"/>
+	<classpathentry kind="lib" path="webapp/setup/database/as400/jt400.jar"/>
+	<classpathentry kind="lib" path="webapp/setup/database/db2/db2jcc_v9.jar"/>
+	<classpathentry kind="lib" path="webapp/setup/database/hsqldb/hsqldb-1.8.0.8.jar"/>
+	<classpathentry kind="lib" path="webapp/setup/database/mssql/mssql-jtds-1.2.jar"/>
+	<classpathentry kind="lib" path="webapp/setup/database/mysql_41/mysql-connector-java-5.0.7-bin.jar"/>
+	<classpathentry kind="lib" path="webapp/setup/database/oracle/ojdbc14-10.2.0.3.jar"/>
+	<classpathentry kind="lib" path="webapp/setup/database/postgresql/postgresql-8.3-603.jdbc3.jar"/>
+	<classpathentry kind="lib" path="lib/runtime/commons-email-1.2.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: .project
===================================================================
RCS file: .project
diff -N .project
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .project	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>opencms-7.5.3</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+	</natures>
+</projectDescription>
Index: .settings/org.eclipse.jdt.core.prefs
===================================================================
RCS file: .settings/org.eclipse.jdt.core.prefs
diff -N .settings/org.eclipse.jdt.core.prefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .settings/org.eclipse.jdt.core.prefs	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,70 @@
+#Thu Jan 07 19:55:34 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
Index: .settings/org.eclipse.jdt.ui.prefs
===================================================================
RCS file: .settings/org.eclipse.jdt.ui.prefs
diff -N .settings/org.eclipse.jdt.ui.prefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .settings/org.eclipse.jdt.ui.prefs	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,9 @@
+#Thu Jan 07 19:56:06 CET 2010
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_settings_version=11
+internal.default.compliance=default
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=com.alkacon;de.alkacon;org.opencms;com.opencms;java;javax;org.apache;org;com;
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
Index: build.xml
===================================================================
RCS file: /usr/local/cvs/opencms/build.xml,v
retrieving revision 1.228
diff -u -r1.228 build.xml
--- build.xml	18 Aug 2010 11:08:29 -0000	1.228
+++ build.xml	24 Aug 2010 11:26:00 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="OpenCms" default="bindist" basedir=".">
+<project name="OpenCms" default="bindist" basedir="." xmlns:artifact="urn:maven-artifact-ant">
 
     <property name="version.number"             		value="7.5.3" />
     <property name="java.target.version"                value="1.5" />
@@ -54,6 +54,8 @@
 	  </classpath>
 	</taskdef>
 	
+
+	
 	<taskdef resource="org/opencms/util/ant/taskdefs.properties" loaderref="opencms">
 		<classpath>
 			<pathelement location="${opencms.input.libs.compile}/ant-opencms-1.1.jar" />
@@ -67,6 +69,13 @@
 		</classpath>
 	</taskdef>
 
+	<!-- ==================== Maven typedef ================================== -->
+    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
+        <classpath>
+            <pathelement location="${opencms.input.libs.compile}/maven-ant-tasks-2.0.10.jar" />
+        </classpath>
+    </typedef>
+            	
 	<!-- 
 	  -	Checks if all required libraries are available
 	  -->
@@ -215,6 +224,13 @@
             includes="org/opencms/**" >      
             <metainf dir="${opencms.input.warfiles}/WEB-INF" includes="opencms.tld"/>
         </jar>        	     
+
+    	<!-- create Source-Archive to include it into the Eclipse-Configuration. -->
+    	<delete file="${opencms.output.jars}/opencms_${version.number}_sources.jar" failonerror="no"/>
+        <jar destfile="${opencms.output.jars}/opencms_${version.number}_sources.jar">
+        	<zipfileset dir="${opencms.input}/src" excludes="${excludes}" />
+            <zipfileset dir="${opencms.input}" includes="license.txt" prefix="META-INF"/>
+        </jar>
     	
     </target>
 
@@ -345,7 +361,17 @@
   			<zipfileset dir="${opencms.output.classes}" prefix="setup" includes="versions.txt" />
 			<zipfileset dir="${opencms.output.classes}" prefix="setup" includes="license.html" />
 			<zipfileset dir="${opencms.output.classes}" prefix="setup" includes="license.html" />
-        </war>        
+        </war>
+    	
+		<!--
+			copy War-Skeleton without Modules to opencms-webapp-${version.number}.war
+			This War-Skeleton will be deployed to the Maven Repository as groupId=org.opencms and artifactId=opencms-webapp
+		 -->
+    	<delete failonerror="no" file="${opencms.build}/${app.name}-webapp-${version.number}.war" />
+    	<copy
+    		file="${opencms.build}/${app.name}.war"
+    		tofile="${opencms.build}/${app.name}-webapp-${version.number}.war" />
+    	
     </target>
     
 
@@ -439,7 +465,7 @@
             <zipfileset dir="${opencms.input}" includes="install.html,license.txt,history.txt"/>
         </zip>
 
-    </target>    
+    </target>
     
     <target name="srcdist" 
     	description="Creates a source distribution ZIP">
@@ -526,7 +552,6 @@
             <fileset dir="${opencms.input}/test/data" />
         </copy>       	    	       
     </target>
-	
 
     <target name="setup-jar" depends="jar" description="Compile the OpenCms setup/updater classes">
     	
@@ -564,7 +589,14 @@
             jarfile="${opencms.output.jars}/opencms-setup.jar"
             basedir="${opencms.output}/build/setup"
             includes="org/opencms/**" />
-
+        
+    	<!-- create Source-Archive to include it into the Eclipse-Configuration. -->
+    	<delete file="${opencms.output.jars}/opencms-setup_${version.number}_sources.jar" failonerror="no"/>
+        <jar destfile="${opencms.output.jars}/opencms-setup_${version.number}_sources.jar">
+        	<zipfileset dir="${opencms.input}/src-setup" excludes="${excludes}" />
+            <zipfileset dir="${opencms.input}" includes="license.txt" prefix="META-INF"/>
+        </jar>
+    	
     </target>
 	
 
@@ -661,6 +693,184 @@
         <copy 
             todir="${opencms.input}/modules/org.opencms.workplace.explorer/resources/system/workplace/resources/components/upload_applet/"
             file="${opencms.output}/upload/upload.jar" />
-    </target>    
+    </target>
+	
+    <target name="maven-install-core" description="install the ${opencms.output.jars}/opencms.jar into the locale Maven Repository">
+
+    	<artifact:pom id="pom-opencms-core" file="pom-opencms-core.xml" />
+		<artifact:install file="${opencms.output.jars}/opencms.jar">
+			<pom refid="pom-opencms-core"/>
+			<attach file="${opencms.output.jars}/opencms_${version.number}_sources.jar" type="jar" classifier="sources" />
+	    	<attach file="${opencms.output.jars}/opencms_${version.number}_tests.jar" type="test-jar" />
+	    	<attach file="${opencms.output.jars}/opencms_${version.number}_test_sources.jar" type="test-jar" classifier="test-sources" />
+    	</artifact:install>
+    	
+    </target>
+	
+    <target name="maven-install-setup" description="install the OpenCms-Artifacts into the locale Maven Repository">
+    	
+    	<artifact:pom id="pom-opencms-setup" file="pom-opencms-setup.xml" />
+		<artifact:install file="${opencms.output.jars}/opencms-setup.jar">
+			<pom refid="pom-opencms-setup"/>
+			<attach file="${opencms.output.jars}/opencms-setup_${version.number}_sources.jar" type="jar" classifier="sources" />
+		</artifact:install>
+    	
+    </target>
+	
+    <target name="maven-install-webapp" description="install the WebApp-Skeleton (without modules) into the locale Maven Repository">
+
+    	<artifact:pom id="pom-opencms-webapp" file="pom-opencms-webapp.xml" />
+		<artifact:install file="${opencms.build}/${app.name}-webapp-${version.number}.war">
+			<pom refid="pom-opencms-webapp"/>
+		</artifact:install>
+    	
+    </target>
+	
+    <target name="maven-install-new-modules">
+		<!-- read list of all available modules -->
+    	<property file="${opencms.input}/modules/all-modules.properties" />
+
+    	<ant antfile="${opencms.input}/modules/build.xml" target="maven-install" inheritAll="false" >
+	  		<property name="version.number" value="${version.number}" />
+	  		<property name="modules.common.selection" value="${modules.common.all}" />
+	  		<property name="modules.selection.mode" value="selection" />
+	  		<property name="app.name" value="${app.name}" />
+	  	</ant>
+    </target>
+	
+    <target name="maven-install-all-modules">
+		<!-- read list of all available modules -->
+    	<property file="${opencms.input}/modules/all-modules.properties" />
+
+    	<ant antfile="${opencms.input}/modules/build.xml" target="maven-install-all" inheritAll="false" >
+	  		<property name="modules.common.selection" value="${modules.common.all}" />
+	  		<property name="modules.selection.mode" value="selection" />
+	  		<property name="app.name" value="${app.name}" />
+	  	</ant>
+    </target>
+	
+    <target name="maven-deploy-core" description="install the ${opencms.output.jars}/opencms.jar into the locale Maven Repository">
+		<!-- required for Transport-protocol (beta-6 doesn't work...) -->
+		<artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
+
+    	<artifact:pom id="pom-opencms-core" file="pom-opencms-core.xml" />
+		<artifact:deploy file="${opencms.output.jars}/opencms.jar">
+			<pom refid="pom-opencms-core"/>
+			<attach file="${opencms.output.jars}/opencms_${version.number}_sources.jar" type="jar" classifier="sources" />
+	    	<attach file="${opencms.output.jars}/opencms_${version.number}_tests.jar" type="test-jar" />
+	    	<attach file="${opencms.output.jars}/opencms_${version.number}_test_sources.jar" type="test-jar" classifier="test-sources" />
+    	</artifact:deploy>
+    	
+    </target>
+	
+    <target name="maven-deploy-setup" description="install the OpenCms-Artifacts into the locale Maven Repository">
+		<!-- required for Transport-protocol (beta-6 doesn't work...) -->
+		<artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
+    	
+    	<artifact:pom id="pom-opencms-setup" file="pom-opencms-setup.xml" />
+		<artifact:deploy file="${opencms.output.jars}/opencms-setup.jar">
+			<pom refid="pom-opencms-setup"/>
+			<attach file="${opencms.output.jars}/opencms-setup_${version.number}_sources.jar" type="jar" classifier="sources" />
+		</artifact:deploy>
+    	
+    </target>
+	
+    <target name="maven-deploy-webapp" description="install the WebApp-Skeleton (without modules) into the locale Maven Repository">
+		<!-- required for Transport-protocol (beta-6 doesn't work...) -->
+		<artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
+
+    	<artifact:pom id="pom-opencms-webapp" file="pom-opencms-webapp.xml" />
+		<artifact:deploy file="${opencms.build}/${app.name}-webapp-${version.number}.war">
+			<pom refid="pom-opencms-webapp"/>
+		</artifact:deploy>
+    	
+    </target>
+	
+    <target name="maven-deploy-new-modules">
+		<!-- read list of all available modules -->
+    	<property file="${opencms.input}/modules/all-modules.properties" />
+    	
+    	<ant antfile="${opencms.input}/modules/build.xml" target="maven-deploy" inheritAll="false" >
+	  		<property name="version.number" value="${version.number}" />
+	  		<property name="modules.common.selection" value="${modules.common.all}" />
+	  		<property name="modules.selection.mode" value="selection" />
+	  		<property name="app.name" value="${app.name}" />
+	  	</ant>
+    </target>
+	
+    <target name="maven-deploy-all-modules">
+		<!-- read list of all available modules -->
+    	<property file="${opencms.input}/modules/all-modules.properties" />
+    	
+    	<ant antfile="${opencms.input}/modules/build.xml" target="maven-deploy-all" inheritAll="false" >
+	  		<property name="modules.common.selection" value="${modules.common.all}" />
+	  		<property name="modules.selection.mode" value="selection" />
+	  		<property name="app.name" value="${app.name}" />
+	  	</ant>
+    </target>
+	
+    <target name="maven-dependencies-test" description="copy dependencies configured in pom-opencms-core.xml to ${opencms.build}/dependencies">
+
+    	<artifact:pom id="pom-opencms-core" file="pom-opencms-core.xml" />
+    
+    	<artifact:dependencies filesetId="dependency.fileset" useScope="runtime">
+			<pom refid="pom-opencms-core"/>
+    	</artifact:dependencies>
+    	
+    	<copy todir="${opencms.build}/dependencies">
+    	  <fileset refid="dependency.fileset" />
+    	  <!-- This mapper strips off all leading directory information -->
+    	  <mapper type="flatten" />
+    	</copy>
+    	
+    	
+    </target>
+
+    <target name="maven-build-all-artifacts" description="Create all Artifacts (opencms-core and Modules) with /modules/build.xml => target 'war'">
+		<!-- read list of all available modules -->
+    	<property file="${opencms.input}/modules/all-modules.properties" />
+    	<!-- build war with all modules -->
+	  	<ant antfile="${opencms.input}/modules/build.xml" target="war" inheritAll="false" >
+	  		<property name="modules.common.selection" value="${modules.common.all}" />
+	  		<property name="modules.selection.mode" value="selection" />
+	  		<property name="app.name" value="${app.name}" />
+	  	</ant>
+    	
+    </target>
+
+	<target name="maven-build-test-jar" depends="compile-tests"
+		description="Create UnitTest-Jar of the Test-Classes (Helper-Classes to create UnitTests in OpenCms-Modules)">
+		
+        <jar jarfile="${opencms.output.jars}/opencms_${version.number}_tests.jar"
+            basedir="${opencms.output.tests}" excludes="**/data/**" />
+
+    	<!-- create Source-Archive to include it into the Eclipse-Configuration. -->
+    	<delete file="${opencms.output.jars}/opencms_${version.number}_test_sources.jar" failonerror="no"/>
+        <jar destfile="${opencms.output.jars}/opencms_${version.number}_test_sources.jar">
+        	<zipfileset dir="${opencms.input}/test" excludes="**/data/**" />
+            <zipfileset dir="${opencms.input}" includes="license.txt" prefix="META-INF"/>
+        </jar>
+		
+	</target>
+	
+    <target name="maven-install-init-all"
+    	depends="maven-build-all-artifacts, maven-build-test-jar, maven-install-core, maven-install-setup, maven-install-webapp, maven-install-all-modules"
+    	description="initial install of all current OpenCms-Artifacts into the locale Maven Repository">
+    </target>
+	
+    <target name="maven-install-with-new-modules"
+    	depends="maven-build-all-artifacts, maven-build-test-jar, maven-install-core, maven-install-setup, maven-install-webapp, maven-install-new-modules"
+    	description="install only new opencms-modules, who matches the opencms-core version.number">
+    </target>
+	
+    <target name="maven-deploy-init-all"
+    	depends="maven-build-all-artifacts, maven-build-test-jar, maven-deploy-core, maven-deploy-setup, maven-deploy-webapp, maven-deploy-all-modules"
+    	description="initial deploy of all current OpenCms-Artifacts into the global Maven Repository">
+    </target>
+	
+    <target name="maven-deploy-with-new-modules"
+    	depends="maven-build-all-artifacts, maven-build-test-jar, maven-deploy-core, maven-deploy-setup, maven-deploy-webapp, maven-deploy-new-modules"
+    	description="deploy only new opencms-modules, who matches the opencms-core version.number">
+    </target>
 
 </project>
\ No newline at end of file
Index: install-nonpublic-libs.bat
===================================================================
RCS file: install-nonpublic-libs.bat
diff -N install-nonpublic-libs.bat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ install-nonpublic-libs.bat	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,17 @@
+echo off
+echo Installing Non-Puplic Libraries to the local Maven-Repository....
+call mvn install:install-file -DgroupId=com.alkacon -DartifactId=alkacon-diff -Dversion=0.9.2 -Dpackaging=jar -Dfile=lib/runtime/alkacon-diff-0.9.2.jar
+call mvn install:install-file -DgroupId=com.alkacon -DartifactId=alkacon-simapi -Dversion=0.9.8 -Dpackaging=jar -Dfile=lib/runtime/alkacon-simapi-0.9.8.jar
+
+
+echo Installing ibm.as400-Driver to the local Maven-Repository....
+call mvn install:install-file -DgroupId=com.ibm.as400 -DartifactId=jt400 -Dversion=6.0 -Dpackaging=jar -Dfile=webapp/setup/database/as400/jt400.jar
+
+echo Installing ibm.db2-Driver to the local Maven-Repository....
+call mvn install:install-file -DgroupId=com.ibm.db2.jcc -DartifactId=db2jcc -Dversion=V9 -Dpackaging=jar -Dfile=webapp/setup/database/db2/db2jcc_v9.jar
+call mvn install:install-file -DgroupId=com.ibm.db2.jcc -DartifactId=db2jcc_license_cu -Dversion=V9 -Dpackaging=jar -Dfile=webapp/setup/database/db2/db2jcc_license_cu.jar
+
+echo Installing oracle-Driver to the local Maven-Repository....
+call mvn install:install-file -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.3 -Dpackaging=jar -Dfile=webapp/setup/database/oracle/ojdbc14-10.2.0.3.jar
+
+pause
Index: maven-deploy-init-all.bat
===================================================================
RCS file: maven-deploy-init-all.bat
diff -N maven-deploy-init-all.bat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ maven-deploy-init-all.bat	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,7 @@
+echo off
+call set ANT_OPTS=-Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+call echo ANT_OPTS: %ANT_OPTS%
+call set MAVEN_OPTS=-Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+call echo MAVEN_OPTS: %MAVEN_OPTS%
+call ant maven-deploy-init-all
+pause
Index: maven-deploy-with-new-modules.bat
===================================================================
RCS file: maven-deploy-with-new-modules.bat
diff -N maven-deploy-with-new-modules.bat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ maven-deploy-with-new-modules.bat	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,7 @@
+echo off
+call set ANT_OPTS=-Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+call echo ANT_OPTS: %ANT_OPTS%
+call set MAVEN_OPTS=-Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+call echo MAVEN_OPTS: %MAVEN_OPTS%
+call ant clean maven-deploy-with-new-modules
+pause
Index: maven-install-init-all.bat
===================================================================
RCS file: maven-install-init-all.bat
diff -N maven-install-init-all.bat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ maven-install-init-all.bat	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,7 @@
+echo off
+call set ANT_OPTS=-Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+call echo ANT_OPTS: %ANT_OPTS%
+call set MAVEN_OPTS=-Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+call echo MAVEN_OPTS: %MAVEN_OPTS%
+call ant maven-install-init-all
+pause
Index: maven-install-with-new-modules.bat
===================================================================
RCS file: maven-install-with-new-modules.bat
diff -N maven-install-with-new-modules.bat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ maven-install-with-new-modules.bat	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,7 @@
+echo off
+call set ANT_OPTS=-Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+call echo ANT_OPTS: %ANT_OPTS%
+call set MAVEN_OPTS=-Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+call echo MAVEN_OPTS: %MAVEN_OPTS%
+call ant maven-install-with-new-modules
+pause
Index: modules/build-single.xml
===================================================================
RCS file: /usr/local/cvs/opencms/modules/build-single.xml,v
retrieving revision 1.37
diff -u -r1.37 build-single.xml
--- modules/build-single.xml	28 Sep 2009 15:34:29 -0000	1.37
+++ modules/build-single.xml	24 Aug 2010 11:26:01 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="OpenCms Common Module" default="dist" basedir=".">
+<project name="OpenCms Common Module" default="dist" basedir="." xmlns:artifact="urn:maven-artifact-ant">
 
 	<property name="opencms.input" 						location="${basedir}/.." />
 	<property name="opencms.output" 					location="${opencms.input}/../BuildCms" />
@@ -30,6 +30,13 @@
 		</classpath>
 	</taskdef>
 
+	<!-- ==================== Maven typedef ================================== -->
+    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
+        <classpath>
+            <pathelement location="${opencms.input.libs.compile}/maven-ant-tasks-2.0.10.jar" />
+        </classpath>
+    </typedef>
+
 	<property name="module.input" 				location="${basedir}/${module.name}" />
 	<property name="module.input.res" 			location="${module.input}/resources" />
 	<property name="module.input.lib" 			location="${module.input.res}/system/modules/${module.name}/lib" />
@@ -306,14 +313,29 @@
 								<pathelement path="${module.libs.path}" />
 							</classpath>
 						</javac>
+						
 						<copy todir="${module.output.classes}/${module.package}">
 							<fileset dir="${module.input.src}" includes="${jar.includes.shared}" excludes="${jar.excludes}" />
 						</copy>
+
+				    	<!-- create Source-Archive to include it into the Eclipse-Configuration. -->
+				    	<delete file="${module.output.jar}/${module.name}_${module.version}_sources.jar" failonerror="no"/>
+						<mkdir dir="${module.output.jar}" />
+				        <jar destfile="${module.output.jar}/${module.name}_${module.version}_sources.jar">
+				        	<zipfileset dir="${module.input.src.shared}" includes="${module.package}/*.*" />
+				        </jar>
+						
 					</then>
 					<else>
 						<if>
 							<equals arg1="${src.mode}" arg2="multishared" />
 							<then>
+								<!-- create Source-Archive to include it into the Eclipse-Configuration. -->
+								<!-- in multishared mode create an empty Source-Archive and update it for each package. -->
+						    	<delete file="${module.output.jar}/${module.name}_${module.version}_sources.jar" failonerror="no"/>
+								<copy file="${opencms.input.warfiles}/update/empty.jar" tofile="${module.output.jar}/${module.name}_${module.version}_sources.jar" />
+								
+								
 								<for list="${module.packages}" param="mpackage" trim="true">
 									<sequential>
 										<var name="package.dir" value="" />
@@ -350,6 +372,15 @@
 										<copy todir="${module.output.classes}/${package.dir}">
 											<fileset dir="${module.input.src.shared}/${package.dir}" includes="${jar.includes.shared}" excludes="${jar.excludes}" />
 										</copy>
+
+										
+								    	<!-- create Source-Archive to include it into the Eclipse-Configuration. -->
+										<!-- in multishared mode update the Source-Archive with this package. -->
+										<mkdir dir="${module.output.jar}" />
+								        <jar destfile="${module.output.jar}/${module.name}_${module.version}_sources.jar" update="true" >
+								        	<zipfileset dir="${module.input.src.shared}" includes="${package.dir}/*.*" />
+								        </jar>
+										
 									</sequential>
 								</for>
 							</then>
@@ -383,6 +414,13 @@
 										<exclude name="**/test/**" />
 									</fileset>
 								</copy>
+
+						    	<!-- create Source-Archive to include it into the Eclipse-Configuration. -->
+						    	<delete file="${module.output.jar}/${module.name}_${module.version}_sources.jar" failonerror="no"/>
+								<mkdir dir="${module.output.jar}" />
+						        <jar destfile="${module.output.jar}/${module.name}_${module.version}_sources.jar">
+						        	<zipfileset dir="${module.input.src.single}" />
+						        </jar>
 							</else>
 						</if>
 					</else>
@@ -400,7 +438,7 @@
 			<then>
 				<mkdir dir="${module.output.jar}" />
 				<jar jarfile="${module.output.jar}/${module.name}.jar" basedir="${module.output.classes}" />
-
+				
 				<for list="${module.dependencies}" param="dependency" trim="true">
 					<sequential>
 						<if>
@@ -469,4 +507,152 @@
 
 	<target name="jboss.update" depends="jboss.copy" description="Recompile changes and installs them in JBoss deploy directory" />
 
+	<target name="maven-read-manifest" description="read manifest to module.version, module.dependencies, module.description">
+
+		<property name="module.input" 				value="${basedir}/${module.name}" />
+		<property name="module.input.res" 			value="${module.input}/resources" />
+
+		<if>
+			<available file="${module.input.res}/manifest.xml" />
+			<then>
+				<readxmlproperty property="module.version" xmlfile="${module.input.res}/manifest.xml" element="export/module/version" />
+				<readxmlproperty property="module.dependencies" xmlfile="${module.input.res}/manifest.xml" element="export/module/dependencies/dependency" attribute="name" />
+				<readxmlproperty property="module.description" xmlfile="${module.input.res}/manifest.xml" element="export/module/description" />
+			</then>
+			<else>
+	    	  	<echo message="WARNING: Not found: ${module.input.res}/manifest.xml"/>
+			</else>
+		</if>
+		
+	</target>
+	
+	<target name="maven-create-or-replace-module-pom" depends="maven-read-manifest" description="create or replace poms for each module">
+
+		<var name="deps" value="" />
+		
+		<for list="${module.dependencies}" param="dependency" trim="true">
+			<sequential>
+				<property name="@{dependency}.input" value="${basedir}/@{dependency}" />
+				<if>
+	    			<available file="${@{dependency}.input}/resources/manifest.xml" />
+	    			<then>
+	    				<readxmlproperty property="@{dependency}.module.version" xmlfile="${@{dependency}.input}/resources/manifest.xml" element="export/module/version" />
+
+						<var name="deps" value="${deps}${line.separator}  &lt;dependency&gt;" />
+						<var name="deps" value="${deps}${line.separator}    &lt;groupId&gt;org.opencms.modules&lt;/groupId&gt;" />
+						<var name="deps" value="${deps}${line.separator}    &lt;artifactId&gt;@{dependency}&lt;/artifactId&gt;" />
+	    				<var name="deps" value="${deps}${line.separator}    &lt;version&gt;${@{dependency}.module.version}&lt;/version&gt;" />
+	    				<var name="deps" value="${deps}${line.separator}    &lt;scope&gt;provided&lt;/scope&gt;" />
+	    				<var name="deps" value="${deps}${line.separator}  &lt;/dependency&gt;" />
+	    			</then>
+	    		</if>
+				
+			</sequential>
+		</for>
+		
+		<echo message="copy file='${basedir}/pom-template.xml' tofile='${module.input}/pom.xml'"/>
+		<echo message="${module.name} - ${module.version}"/>
+		<copy file="${basedir}/pom-template.xml" tofile="${module.input}/pom.xml" overwrite="true">   
+	    	<filterset>
+	    		<filter token="OPENCMS_MODULE_NAME" value="${module.name}" />
+	    		<filter token="OPENCMS_MODULE_VERSION" value="${module.version}" />
+	    		<filter token="OPENCMS_MODULE_DESCRIPTION" value="${module.description}" />
+	    		<filter token="OPENCMS_MODULE_DEPENDENCIES" value="${deps}" />
+        	</filterset>
+        </copy>
+		
+	</target>
+	
+	<target name="maven-remove-module-pom" description="create or replace poms for each module">
+		
+		<property name="module.input" value="${basedir}/${module.name}" />
+		
+		<delete file="${module.input}/pom.xml" failonerror="false" />
+		
+	</target>
+	
+    <target name="maven-install" depends="maven-read-manifest, maven-create-or-replace-module-pom" description="install the OpenCms-Artifacts into the locale Maven Repository">
+		
+    	<if>
+			<and>
+				<available file="${module.output.jar}/${module.name}.jar" />
+				<available file="${module.output.jar}/${module.name}_${module.version}_sources.jar" />
+			</and>
+			<then>
+				<!-- Jar and Java-Sources are available -->
+				<echo message="install module '${module.name}-${module.version}' (Module-zip, Classes-Jar, Sources-Jar)" />
+				<artifact:pom id="pom-module" file="${module.input}/pom.xml" />
+				<artifact:install file="${module.output.jar}/${module.name}.jar">
+					<pom refid="pom-module"/>
+					<attach file="${module.output.jar}/${module.name}_${module.version}_sources.jar" type="jar" classifier="sources" />
+					<attach file="${module.output.zip}/${module.name}_${module.version}.zip" type="zip" classifier="opencms-module" />
+				</artifact:install>
+			</then>
+			<else>
+				<!-- Install OpenCms-Module ZIP Without JAR and Java-Sources -->
+				<echo message="install module '${module.name}-${module.version}' (Module-zip)" />
+				<artifact:pom id="pom-module" file="${module.input}/pom.xml" />
+				<artifact:install file="${opencms.input.warfiles}/update/empty.jar">
+					<pom refid="pom-module"/>
+					<attach file="${module.output.zip}/${module.name}_${module.version}.zip" type="zip" classifier="opencms-module" />
+				</artifact:install>
+			</else>
+		</if>
+    	
+    	<ant antfile="build-single.xml" target="maven-remove-module-pom" />
+    </target>
+
+    <target name="maven-install-version" depends="maven-read-manifest" description="install only if Parameter 'version.number' is the current module.version">
+		<if>
+			<equals arg1="${module.version}" arg2="${version.number}" />
+			<then>
+				<antcall target="maven-install" />
+			</then>
+		</if>
+    	<ant antfile="build-single.xml" target="maven-remove-module-pom" />
+    </target>
+	
+    <target name="maven-deploy" depends="maven-read-manifest, maven-create-or-replace-module-pom" description="deploy the OpenCms-Artifacts into the global Maven Repository">
+		<!-- required for Transport-protocol (beta-6 doesn't work...) -->
+		<artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
+
+		<if>
+			<and>
+				<available file="${module.output.jar}/${module.name}.jar" />
+				<available file="${module.output.jar}/${module.name}_${module.version}_sources.jar" />
+			</and>
+			<then>
+				<!-- Jar and Java-Sources are available -->
+				<echo message="deploy module '${module.name}-${module.version}' (Module-zip, Classes-Jar, Sources-Jar)" />
+		    	<artifact:pom id="pom-module" file="${module.input}/pom.xml" />
+				<artifact:deploy file="${module.output.jar}/${module.name}.jar">
+					<pom refid="pom-module"/>
+					<attach file="${module.output.jar}/${module.name}_${module.version}_sources.jar" type="jar" classifier="sources" />
+					<attach file="${module.output.zip}/${module.name}_${module.version}.zip" type="zip" classifier="opencms-module" />
+				</artifact:deploy>
+			</then>
+			<else>
+				<!-- Install OpenCms-Module ZIP Without JAR and Java-Sources -->
+				<echo message="deploy module '${module.name}-${module.version}' (Module-zip)" />
+		    	<artifact:pom id="pom-module" file="${module.input}/pom.xml" />
+				<artifact:deploy file="${opencms.input.warfiles}/update/empty.jar">
+					<pom refid="pom-module"/>
+					<attach file="${module.output.zip}/${module.name}_${module.version}.zip" type="zip" classifier="opencms-module" />
+				</artifact:deploy>
+			</else>
+		</if>
+    	
+    	
+    	<ant antfile="build-single.xml" target="maven-remove-module-pom" />
+    </target>
+
+    <target name="maven-deploy-version" depends="maven-read-manifest" description="deploy only if Parameter 'version.number' is the current module.version">
+		<if>
+			<equals arg1="${module.version}" arg2="${version.number}" />
+			<then>
+				<antcall target="maven-deploy" />
+			</then>
+		</if>
+    	<ant antfile="build-single.xml" target="maven-remove-module-pom" />
+    </target>
 </project>
Index: modules/build.xml
===================================================================
RCS file: /usr/local/cvs/opencms/modules/build.xml,v
retrieving revision 1.21
diff -u -r1.21 build.xml
--- modules/build.xml	13 Aug 2010 07:47:30 -0000	1.21
+++ modules/build.xml	24 Aug 2010 11:26:01 -0000
@@ -276,5 +276,93 @@
 		<delete dir="${opencms.output}/build/zips-modules" />		
 		
 	</target>
+	
+	<target name="maven-create-or-replace-module-poms" depends="init" description="create or replace poms for each module">
+		<for list="${modules.var}" param="module" trim="yes">
+    	  <sequential>
+    	  	<ant antfile="${basedir}/build-single.xml" target="maven-create-or-replace-module-pom" inheritAll="false" >
+    	  		<property name="module.name" value="@{module}" />
+    	  	</ant>
+    	  </sequential>
+    	</for>
+	</target>
+	
+	<target name="maven-remove-module-poms" depends="init" description="remove poms for each module">
+		<for list="${modules.var}" param="module" trim="yes">
+    	  <sequential>
+    	  	<ant antfile="${basedir}/build-single.xml" target="maven-remove-module-pom" inheritAll="false" >
+    	  		<property name="module.name" value="@{module}" />
+    	  	</ant>
+    	  </sequential>
+    	</for>
+	</target>
 
+    <target name="maven-install" depends="init" description="install new OpenCms-Module-Artifacts into the locale Maven Repository">
+		<for list="${modules.var}" param="module" trim="yes">
+    	  <sequential>
+    	  	<ant antfile="${basedir}/build-single.xml" target="maven-install-version" inheritAll="false" >
+    	  		<property name="version.number" value="${version.number}" />
+    	  		<property name="module.name" value="@{module}" />
+    	  	</ant>
+    	  </sequential>
+    	</for>
+    </target>
+
+    <target name="maven-install-all" depends="init" description="install the OpenCms-Module-Artifacts into the locale Maven Repository">
+		<for list="${modules.var}" param="module" trim="yes">
+    	  <sequential>
+    	  	<ant antfile="${basedir}/build-single.xml" target="maven-install" inheritAll="false" >
+    	  		<property name="module.name" value="@{module}" />
+    	  	</ant>
+    	  </sequential>
+    	</for>
+    </target>
+
+    <target name="maven-deploy" depends="init" description="deploy new OpenCms-Module-Artifacts into the global Maven Repository">
+		<for list="${modules.var}" param="module" trim="yes">
+    	  <sequential>
+    	  	<ant antfile="${basedir}/build-single.xml" target="maven-deploy-version" inheritAll="false" >
+    	  		<property name="version.number" value="${version.number}" />
+    	  		<property name="module.name" value="@{module}" />
+    	  	</ant>
+    	  </sequential>
+    	</for>
+    </target>
+
+    <target name="maven-deploy-all" depends="init" description="deploy the OpenCms-Module-Artifacts into the global Maven Repository">
+		<for list="${modules.var}" param="module" trim="yes">
+    	  <sequential>
+    	  	<ant antfile="${basedir}/build-single.xml" target="maven-deploy" inheritAll="false" >
+    	  		<property name="module.name" value="@{module}" />
+    	  	</ant>
+    	  </sequential>
+    	</for>
+    </target>
+	
+	<target name="maven-print-selected-dependecies-xml" depends="init"
+		description="print the selected Modules as Maven-dependencies to the console.
+		You can copy and past it to your Customer-Specific pom.xml">
+
+		<var name="deps" value="" />
+		
+		<for list="${modules.var}" param="module" trim="yes">
+    	  <sequential>
+			<property name="@{module}.input" value="${basedir}/@{module}" />
+			<if>
+    			<available file="${@{module}.input}/resources/manifest.xml" />
+    			<then>
+    				<readxmlproperty property="@{module}.module.version" xmlfile="${@{module}.input}/resources/manifest.xml" element="export/module/version" />
+
+					<var name="deps" value="${deps}${line.separator}  &lt;dependency&gt;" />
+					<var name="deps" value="${deps}${line.separator}    &lt;groupId&gt;org.opencms.modules&lt;/groupId&gt;" />
+					<var name="deps" value="${deps}${line.separator}    &lt;artifactId&gt;@{module}&lt;/artifactId&gt;" />
+					<var name="deps" value="${deps}${line.separator}    &lt;version&gt;${@{module}.module.version}&lt;/version&gt;" />
+					<var name="deps" value="${deps}${line.separator}  &lt;/dependency&gt;" />
+    			</then>
+    		</if>
+    	  </sequential>
+    	</for>
+		
+		<echo message="Maven dependencies: ${deps}" />
+	</target>
 </project>
Index: modules/maven-install.bat
===================================================================
RCS file: modules/maven-install.bat
diff -N modules/maven-install.bat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/maven-install.bat	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,5 @@
+echo off
+call set ANT_OPTS=-Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+call echo ANT_OPTS: %ANT_OPTS%
+call ant maven-install
+pause
Index: modules/pom-template.xml
===================================================================
RCS file: modules/pom-template.xml
diff -N modules/pom-template.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/pom-template.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,142 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.opencms.modules</groupId>
+	<artifactId>@OPENCMS_MODULE_NAME@</artifactId>
+	<packaging>jar</packaging>
+	<version>@OPENCMS_MODULE_VERSION@</version>
+	<name>@OPENCMS_MODULE_NAME@</name>
+	<url>http://opencms.org</url>
+
+	<description><![CDATA[
+		OpenCms-Module '@OPENCMS_MODULE_NAME@'.
+		
+		@OPENCMS_MODULE_DESCRIPTION@
+		
+		OpenCms is a Content Management System that is based on Open
+		Source Software. Complex Intranet and Internet websites can be
+		quickly and cost-effectively created, maintained and managed.
+		
+		
+	]]></description>
+	
+	<inceptionYear>2008</inceptionYear>
+
+	<mailingLists>
+		<!-- Example:
+		<mailingList>
+			<name>OpenCms library User Mailing list - How To, FAQ, etc</name>
+			<subscribe>
+				http://lists.sourceforge.net/lists/listinfo/opencms-user
+			</subscribe>
+			<unsubscribe>
+				http://lists.sourceforge.net/lists/listinfo/opencms-user
+			</unsubscribe>
+			<post />
+			<archive>
+				http://sourceforge.net/mailarchive/forum.php?forum=opencms-user
+			</archive>
+		</mailingList>
+		-->
+	</mailingLists>
+
+	<developers>
+		<!-- Example:
+		<developer>
+			<name>Harald Brabenetz</name>
+			<id>brabenetz</id>
+			<email>brabenetz(at)users.sourceforge.net</email>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		 -->
+	</developers>
+	
+	<contributors>
+	</contributors>
+	
+	<licenses>
+		<license>
+			<name>GNU LESSER GENERAL PUBLIC LICENSE 2.1</name>
+			<url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- ########################### -->
+		<!-- Place here the Library-dependencies for OpenCms -->
+		<!-- Possible Scopes: compile, provided, runtime, test -->
+		<!-- see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope -->
+		<!-- ########################### -->
+
+		<!-- ########################### -->
+		<!--      SCOPE Provided          -->
+		<!-- ########################### -->
+		
+		<!-- All Modules depends on opencms-core -->
+		<!-- Already provided in OpenCms-Webapp -->
+		<dependency>
+			<groupId>org.opencms</groupId>
+			<artifactId>opencms-core</artifactId>
+			<version>7.5.3</version>
+			<scope>provided</scope>
+		</dependency>
+		
+		<!-- OpenCms-Module-Dependencies of Module '@OPENCMS_MODULE_NAME@' -->
+		
+		@OPENCMS_MODULE_DEPENDENCIES@
+		
+	</dependencies>
+
+	<properties>
+		<distribution.htdocs>scp://grzmvn01.infonova.at/srv/maven/repos/content/sourceforge</distribution.htdocs>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>infonova-opencms-repo</id>
+			<url>http://bp-cms-commons.sourceforge.net/m2repo</url>
+		</repository>
+	</repositories>
+
+
+	<!-- Example (required for Maven-Release-Plugin)
+	<scm>
+		<connection>scm:svn:http://opencms.svn.sourceforge.net/svnroot/opencms/${project.artifactId}/trunk</connection>
+		<developerConnection>scm:svn:https://opencms.svn.sourceforge.net/svnroot/opencms/${project.artifactId}/trunk</developerConnection>
+		<url>http://opencms.svn.sourceforge.net/viewcvs.cgi/opencms/${project.artifactId}/trunk</url>
+	</scm>
+	 -->
+	<!--
+		Example (required for deploy the artifact to the repository, or the generated Site to the www) -->
+	<distributionManagement>
+		<repository>
+			<id>scp-grzmvn01-content-repository</id>
+			<url>${distribution.htdocs}/m2repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>scp-grzmvn01-content-snapshot-repository</id>
+			<url>${distribution.htdocs}/m2snapshot</url>
+		</snapshotRepository>
+		<site>
+			<id>scp-grzmvn01-content-site</id>
+			<url>${distribution.htdocs}/m2site/opencms/${project.artifactId}/${project.version}/</url>
+		</site>
+	</distributionManagement>
+</project>
Index: pom-opencms-core.xml
===================================================================
RCS file: pom-opencms-core.xml
diff -N pom-opencms-core.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pom-opencms-core.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,393 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.opencms</groupId>
+	<artifactId>opencms-core</artifactId>
+	<packaging>jar</packaging>
+	<version>7.5.3</version>
+	<name>opencms-core</name>
+	<url>http://opencms.org</url>
+
+	<description>
+		Opencms-core is the JAR-Library for OpenCms.
+	
+		OpenCms is a Content Management System that is based on Open
+		Source Software. Complex Intranet and Internet websites can be
+		quickly and cost-effectively created, maintained and managed.
+	</description>
+
+	<inceptionYear>2008</inceptionYear>
+
+	<mailingLists>
+		<!-- Example:-->
+		<!--
+			<mailingList> <name>OpenCms library User Mailing list - How To, FAQ, etc</name>
+			<subscribe>http://lists.sourceforge.net/lists/listinfo/opencms-user</subscribe>
+			<unsubscribe>http://lists.sourceforge.net/lists/listinfo/opencms-user</unsubscribe>
+			<archive>http://sourceforge.net/mailarchive/forum.php?forum=opencms-user</archive> </mailingList>
+		-->
+	</mailingLists>
+
+	<developers>
+		<!-- Example: -->
+		<!--
+			<developer> <name>Harald Brabenetz</name> <id>brabenetz</id> <email>brabenetz(at)users.sourceforge.net</email>
+			<roles> <role>Developer</role> </roles> <timezone>+1</timezone> </developer>
+		-->
+	</developers>
+
+	<contributors>
+	</contributors>
+
+	<licenses>
+		<license>
+			<name>GNU LESSER GENERAL PUBLIC LICENSE 2.1</name>
+			<url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.2</version>
+				<executions>
+					<!-- Build test-jars, so it can be reused in other Projects like OpenCms-Modules -->
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+
+	<dependencies>
+		<!-- ########################### -->
+		<!-- Place here the Library-dependencies for OpenCms -->
+		<!-- Possible Scopes: compile, provided, runtime, test -->
+		<!-- see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope -->
+		<!-- ########################### -->
+
+		<!-- ########################### -->
+		<!--      SCOPE Provided         -->
+		<!-- ########################### -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- ########################### -->
+		<!--      SCOPE Compile          -->
+		<!-- ########################### -->
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alkacon</groupId>
+			<artifactId>alkacon-diff</artifactId>
+			<version>0.9.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alkacon</groupId>
+			<artifactId>alkacon-simapi</artifactId>
+			<version>0.9.8</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.3</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<version>1.2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-digester</groupId>
+			<artifactId>commons-digester</artifactId>
+			<version>1.8</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-email</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-pool</groupId>
+			<artifactId>commons-pool</artifactId>
+			<version>1.5.4</version>
+		</dependency>
+		<dependency>
+			<groupId>dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+			<version>1.6.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>xml-apis</groupId>
+					<artifactId>xml-apis</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.htmlparser</groupId>
+			<artifactId>htmlparser</artifactId>
+			<version>1.6</version>
+		</dependency>
+		<dependency>
+			<groupId>oro</groupId>
+			<artifactId>oro</artifactId>
+			<version>2.0.8</version>
+		</dependency>
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+			<version>1.1.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>xom</groupId>
+					<artifactId>xom</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>jdom</groupId>
+					<artifactId>jdom</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>xml-apis</groupId>
+					<artifactId>xml-apis</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.1.2</version>
+		</dependency>
+		<dependency>
+			<!-- This is not 100% the same as the OpenCms Library "jtidy-8-svn-2006-05-21b.jar" -->
+			<!-- But the OpenCms jtidy-Library contains java-sources and svn-folders => it seems not a correct release... -->
+			<groupId>org.hibernate</groupId>
+			<artifactId>jtidy</artifactId>
+			<version>r8-20060801</version>
+		</dependency>
+		<dependency>
+			<groupId>org.safehaus.jug</groupId>
+			<artifactId>jug</artifactId>
+			<version>2.0.0</version>
+			<classifier>lgpl</classifier>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.15</version>
+			<exclusions>
+				<!-- Exclude optional libs. see http://maven.apache.org/guides/introduction/introduction-to-optional-and-excludes-dependencies.html -->
+				<exclusion>
+					<groupId>javax.mail</groupId>
+					<artifactId>mail</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.jms</groupId>
+					<artifactId>jms</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jdmk</groupId>
+					<artifactId>jmxtools</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jmx</groupId>
+					<artifactId>jmxri</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-analyzers</artifactId>
+			<version>2.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-core</artifactId>
+			<version>2.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-highlighter</artifactId>
+			<version>2.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-queries</artifactId>
+			<version>2.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-snowball</artifactId>
+			<version>2.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4.1</version>
+		</dependency>
+		<dependency>
+			<!-- This is not 100% the same Version as the OpenCms Library "PDFBox-0.7.2.jar" -->
+			<!-- But Version 0.7.2 is not in the public repository: http://repo2.maven.org/maven2/pdfbox/pdfbox/ -->
+			<groupId>pdfbox</groupId>
+			<artifactId>pdfbox</artifactId>
+			<version>0.7.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>bouncycastle</groupId>
+					<artifactId>bcmail-jdk14</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>bouncycastle</groupId>
+					<artifactId>bcprov-jdk14</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>2.5.1-final-20040804</version>
+		</dependency>
+		<dependency>
+			<groupId>quartz</groupId>
+			<artifactId>quartz</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+		<dependency>
+			<groupId>taglibs</groupId>
+			<artifactId>standard</artifactId>
+			<version>1.1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.textmining</groupId>
+			<artifactId>tm-extractors</artifactId>
+			<version>0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>xml-apis</groupId>
+			<artifactId>xml-apis</artifactId>
+			<version>1.3.04</version>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.9.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>xml-apis</groupId>
+					<artifactId>xml-apis</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- ########################### -->
+		<!--      SCOPE Test             -->
+		<!-- ########################### -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+
+
+
+
+
+	</dependencies>
+
+	<properties>
+		<distribution.htdocs>scp://grzmvn01.infonova.at/srv/maven/repos/content/sourceforge</distribution.htdocs>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>infonova-opencms-repo</id>
+			<url>http://bp-cms-commons.sourceforge.net/m2repo</url>
+		</repository>
+	</repositories>
+
+
+	<!--
+		Example (required for Maven-Release-Plugin) <scm>
+		<connection>scm:svn:http://opencms.svn.sourceforge.net/svnroot/opencms/${project.artifactId}/trunk</connection>
+		<developerConnection>scm:svn:https://opencms.svn.sourceforge.net/svnroot/opencms/${project.artifactId}/trunk</developerConnection>
+		<url>http://opencms.svn.sourceforge.net/viewcvs.cgi/opencms/${project.artifactId}/trunk</url> </scm>
+	-->
+	<!--
+		Example (required for deploy the artifact to the repository, or the generated Site to the www) -->
+	<distributionManagement>
+		<repository>
+			<id>scp-grzmvn01-content-repository</id>
+			<url>${distribution.htdocs}/m2repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>scp-grzmvn01-content-snapshot-repository</id>
+			<url>${distribution.htdocs}/m2snapshot</url>
+		</snapshotRepository>
+		<site>
+			<id>scp-grzmvn01-content-site</id>
+			<url>${distribution.htdocs}/m2site/opencms/${project.artifactId}/${project.version}/</url>
+		</site>
+	</distributionManagement>
+	
+</project>
Index: pom-opencms-setup.xml
===================================================================
RCS file: pom-opencms-setup.xml
diff -N pom-opencms-setup.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pom-opencms-setup.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,122 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.opencms</groupId>
+	<artifactId>opencms-setup</artifactId>
+	<packaging>jar</packaging>
+	<version>7.5.3</version>
+	<name>opencms-setup</name>
+	<url>http://opencms.org</url>
+
+	<description>
+		opencms-setup is the JAR-Library for OpenCms to make a initial setup or an update.
+	
+		OpenCms is a Content Management System that is based on Open
+		Source Software. Complex Intranet and Internet websites can be
+		quickly and cost-effectively created, maintained and managed.
+	</description>
+	
+	<inceptionYear>2008</inceptionYear>
+
+	<mailingLists>
+		<!-- Example:
+		<mailingList>
+			<name>OpenCms library User Mailing list - How To, FAQ, etc</name>
+			<subscribe>
+				http://lists.sourceforge.net/lists/listinfo/opencms-user
+			</subscribe>
+			<unsubscribe>
+				http://lists.sourceforge.net/lists/listinfo/opencms-user
+			</unsubscribe>
+			<post />
+			<archive>
+				http://sourceforge.net/mailarchive/forum.php?forum=opencms-user
+			</archive>
+		</mailingList>
+		-->
+	</mailingLists>
+
+	<developers>
+		<!-- Example:
+		<developer>
+			<name>Harald Brabenetz</name>
+			<id>brabenetz</id>
+			<email>brabenetz(at)users.sourceforge.net</email>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		 -->
+	</developers>
+	
+	<contributors>
+	</contributors>
+	
+	<licenses>
+		<license>
+			<name>GNU LESSER GENERAL PUBLIC LICENSE 2.1</name>
+			<url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!--###########################
+			#
+			#   Place here the Library-dependencies for OpenCms
+			#	Possible Scopes: compile, provided, runtime, test
+			#   see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope
+			#
+			########################### -->
+	</dependencies>
+
+	<properties>
+		<distribution.htdocs>scp://grzmvn01.infonova.at/srv/maven/repos/content/sourceforge</distribution.htdocs>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>infonova-opencms-repo</id>
+			<url>http://bp-cms-commons.sourceforge.net/m2repo</url>
+		</repository>
+	</repositories>
+
+
+	<!-- Example (required for Maven-Release-Plugin)
+	<scm>
+		<connection>scm:svn:http://opencms.svn.sourceforge.net/svnroot/opencms/${project.artifactId}/trunk</connection>
+		<developerConnection>scm:svn:https://opencms.svn.sourceforge.net/svnroot/opencms/${project.artifactId}/trunk</developerConnection>
+		<url>http://opencms.svn.sourceforge.net/viewcvs.cgi/opencms/${project.artifactId}/trunk</url>
+	</scm>
+	 -->
+	<!--
+		Example (required for deploy the artifact to the repository, or the generated Site to the www) -->
+	<distributionManagement>
+		<repository>
+			<id>scp-grzmvn01-content-repository</id>
+			<url>${distribution.htdocs}/m2repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>scp-grzmvn01-content-snapshot-repository</id>
+			<url>${distribution.htdocs}/m2snapshot</url>
+		</snapshotRepository>
+		<site>
+			<id>scp-grzmvn01-content-site</id>
+			<url>${distribution.htdocs}/m2site/opencms/${project.artifactId}/${project.version}/</url>
+		</site>
+	</distributionManagement>
+</project>
Index: pom-opencms-webapp.xml
===================================================================
RCS file: pom-opencms-webapp.xml
diff -N pom-opencms-webapp.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pom-opencms-webapp.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,158 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.opencms</groupId>
+	<artifactId>opencms-webapp</artifactId>
+	<packaging>war</packaging>
+	<version>7.5.3</version>
+	<name>opencms-webapp</name>
+	<url>http://opencms.org</url>
+
+	<description>
+		Opencms-webapp is the Skeleton WAR-File for OpenCms without Modules.
+		It only contains the JSPs, Configs, opencms-core and so on.
+	
+		OpenCms is a Content Management System that is based on Open
+		Source Software. Complex Intranet and Internet websites can be
+		quickly and cost-effectively created, maintained and managed.
+	</description>
+	
+	<inceptionYear>2008</inceptionYear>
+
+	<mailingLists>
+		<!-- Example:
+		<mailingList>
+			<name>OpenCms library User Mailing list - How To, FAQ, etc</name>
+			<subscribe>
+				http://lists.sourceforge.net/lists/listinfo/opencms-user
+			</subscribe>
+			<unsubscribe>
+				http://lists.sourceforge.net/lists/listinfo/opencms-user
+			</unsubscribe>
+			<post />
+			<archive>
+				http://sourceforge.net/mailarchive/forum.php?forum=opencms-user
+			</archive>
+		</mailingList>
+		-->
+	</mailingLists>
+
+	<developers>
+		<!-- Example:
+		<developer>
+			<name>Harald Brabenetz</name>
+			<id>brabenetz</id>
+			<email>brabenetz(at)users.sourceforge.net</email>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		 -->
+	</developers>
+	
+	<contributors>
+	</contributors>
+	
+	<licenses>
+		<license>
+			<name>GNU LESSER GENERAL PUBLIC LICENSE 2.1</name>
+			<url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.0.2</version>
+			</plugin>
+		
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		
+		<!-- ########################### -->
+		<!-- Place here the Library-dependencies for OpenCms -->
+		<!-- Possible Scopes: compile, provided, runtime, test -->
+		<!-- see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope -->
+		<!-- ########################### -->
+
+		<!-- ########################### -->
+		<!--      SCOPE Provided         -->
+		<!-- ########################### -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- ########################### -->
+		<!--      SCOPE Compile          -->
+		<!-- ########################### -->
+		<dependency>
+			<groupId>org.opencms</groupId>
+			<artifactId>opencms-core</artifactId>
+			<version>7.5.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencms</groupId>
+			<artifactId>opencms-setup</artifactId>
+			<version>7.5.3</version>
+		</dependency>
+	</dependencies>
+
+	<properties>
+		<distribution.htdocs>scp://grzmvn01.infonova.at/srv/maven/repos/content/sourceforge</distribution.htdocs>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>infonova-opencms-repo</id>
+			<url>http://bp-cms-commons.sourceforge.net/m2repo</url>
+		</repository>
+	</repositories>
+
+
+	<!-- Example (required for Maven-Release-Plugin)
+	<scm>
+		<connection>scm:svn:http://opencms.svn.sourceforge.net/svnroot/opencms/${project.artifactId}/trunk</connection>
+		<developerConnection>scm:svn:https://opencms.svn.sourceforge.net/svnroot/opencms/${project.artifactId}/trunk</developerConnection>
+		<url>http://opencms.svn.sourceforge.net/viewcvs.cgi/opencms/${project.artifactId}/trunk</url>
+	</scm>
+	 -->
+	<!--
+		Example (required for deploy the artifact to the repository, or the generated Site to the www) -->
+	<distributionManagement>
+		<repository>
+			<id>scp-grzmvn01-content-repository</id>
+			<url>${distribution.htdocs}/m2repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>scp-grzmvn01-content-snapshot-repository</id>
+			<url>${distribution.htdocs}/m2snapshot</url>
+		</snapshotRepository>
+		<site>
+			<id>scp-grzmvn01-content-site</id>
+			<url>${distribution.htdocs}/m2site/opencms/${project.artifactId}/${project.version}/</url>
+		</site>
+	</distributionManagement>
+</project>
Index: src-setup/org/opencms/setup/CmsSetupBean.java
===================================================================
RCS file: /usr/local/cvs/opencms/src-setup/org/opencms/setup/CmsSetupBean.java,v
retrieving revision 1.13
diff -u -r1.13 CmsSetupBean.java
--- src-setup/org/opencms/setup/CmsSetupBean.java	18 Jan 2010 10:02:59 -0000	1.13
+++ src-setup/org/opencms/setup/CmsSetupBean.java	24 Aug 2010 11:26:01 -0000
@@ -1909,6 +1909,11 @@
                 // initialize the database name with the app name
                 if (CmsStringUtil.isNotEmptyOrWhitespaceOnly(request.getContextPath())) {
                     dbName = request.getContextPath().substring(1);
+                    // transform Maven default finalName "${artifactId}-${version}.war"
+                    // e.g.: "opencms-demo-7.5.2" -> "opencms_demo_7_5_2"
+                    // reason: e.g.: MySql cannot have '-', '.' in Database-Name.
+                    dbName = dbName.replace('-', '_');
+                    dbName = dbName.replace('.', '_');
                 }
                 if (provider.equals(ORACLE_PROVIDER)
                     || provider.equals(POSTGRESQL_PROVIDER)
Index: test/test.properties
===================================================================
RCS file: /usr/local/cvs/opencms/test/test.properties,v
retrieving revision 1.35
diff -u -r1.35 test.properties
--- test/test.properties	26 Feb 2009 11:59:18 -0000	1.35
+++ test/test.properties	24 Aug 2010 11:26:01 -0000
@@ -27,5 +27,5 @@
 db.product=hsqldb
 
 # Set the path to the test resources files
-test.data.path=C:\dev\workspace\OpenCmsHead\test\data
-test.webapp.path=C:\dev\workspace\OpenCmsHead\webapp
+test.data.path=test\data
+test.webapp.path=webapp
