intermediate version, mot ready yet

git-svn-id: https://svn.libreccm.org/ccm/trunk@104 8810af33-2d31-482b-a856-94f89814c4df

tools-ng/common/README

@@ -0,0 +1,29 @@
+tools-ng/common
+
+Next Generation Tools
+Tools for development, installation and maintenance of
+new CCM / APLAWS, standards compliant deployment and execution context.
+
+Subdir common contains directories and files, used by the development 
+environment(s) as well as user installation and deployment scripts
+
+CURRENTLY EVERYTHING HERE IS WORK IN PROGRESS
+
+classes/
+
+
+lib/
+  Set of jar-files used by several tools (esp. to process xml files)
+  and required files vor compilation (e.g. servlet API, JDBC drivers, etc)
+
+src/
+
+
+xsd/
+
+
+xsl/
+
+
+README
+  This file

tools-ng/dev-lib/README

@@ -0,0 +1,4 @@
+dev-lib/
+  set of files requirred by 
+  either the test runtime environment
+  or the compiler to do its work (e.g. jdbc drivers)

tools-ng/ecdc/build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="CCM Content and Collaboration Management" default="usage">
+<project name="openccm" default="usage">
 
 	<description>Structured and DB backed Content and Collaboration Management System</description>
 
@@ -51,16 +51,16 @@
 	<!-- build-projects
 		 is generated by target configure in build-configure and 
 		 contains all the task to do the real work                                 -->
-	<if>
+    <if>
-	  <bool>
 		<available file="build-projects.xml"/>
-	  </bool>
+        <then>
-			<import file="build-projects.xml" />
+            <import file="build-projects.xml" />
-		<else>
+        </then>
+        <else>
 			<import file="${ccm.ecdc.script.dir}/build-projects-dummy.xml" />
 			<echo>
 			You may not have been executed the preparational steps:
-			--  configure (to create the compile/build/deploy/etc scripts
+			- -  configure (to create the compile/build/deploy/etc scripts
 			</echo>
 		</else>
 	</if>

tools-ng/ecdc/scriptlib/build-ccm.xml

@@ -11,7 +11,7 @@
 <project name="load">
 
 	<target name="load-bundle">
-		<echo>Loading bundle ${bundle.folder} into ${ccm.home}</echo>
+		<echo>Loading bundle ${ccm.bundle.folder} into ${ccm.home}</echo>
 		<copy file="${ccm.bundle.folder}/cfg/applications.cfg"
               tofile=".tmp.applications.cfg" overwrite="yes" />
 		<replaceregexp file=".tmp.applications.cfg" match="#.*" replace="" byline="true" />

tools-ng/ecdc/scriptlib/build-common.xml

@@ -10,9 +10,15 @@
 		<fileset dir="${ccm.tools.lib.dir}" includes="*.jar" />
 	</path>
 
+    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+      <classpath>
+        <pathelement location="${ccm.tools.lib.dir}/ant-contrib.jar"/>
+      </classpath>
+    </taskdef>
+
 
 	<!-- Read configuration files. First from project dir, then add 
-		 requirred defaults from ecdc directory                                  -->
+		 requirred defaults from ecdc directory                              -->
 	<property file="${ccm.project.dir}/local.runtime.properties" />
 	<property file="${ccm.ecdc.conf.dir}/runtime.properties" />
 
@@ -22,7 +28,6 @@
 	<property file="${ccm.project.dir}/local.ccm.properties" />
 	<property file="${ccm.ecdc.conf.dir}/ccm.properties" />
 
-
 	<path id="ccm.classpath">
 		<path refid="ccm.tools.classpath"/>
 		<pathelement path="${webapp.dist.dir}/WEB-INF/classes"/>
@@ -34,6 +39,8 @@
 	</condition>
 	
 	<!-- http://antelope.tigris.org/ -->
+    <!--
 	<taskdef classpathref="ccm.tools.classpath" resource="ise/antelope/tasks/antlib.xml" />
+    -->
 
 </project>

tools-ng/ecdc/scriptlib/build-configure.xml

@@ -23,12 +23,13 @@
 			<arg value="${ccm.project.dir}/project.xml" />
 		</java>
 		<if>
-			<bool>
+		  <equals arg1="${project.validation.errors}" arg2="" />
-				<not>
+          <then>
-					<equals arg1="${project.validation.errors}" arg2="" />
+              <echo>Validating the schema of project.xml successful</echo>
-				</not>
+          </then>
-			</bool>
+		  <else>
 			<fail message="${project.validation.errors}" />
+		  </else>
 		</if>
 						
 		<!--  Building .ccm.classpath for eclipse IDE -->
@@ -60,10 +61,10 @@
              to include into the classpath  for each module included in the
              project (~/build/classes ~/build/sql ~/lib ~/pdl )              -->
 		<!--
-		<xslt style="${tools.xsl.dir}/classpath-template.xsl" in="project.xml"
+		<xslt style="${ccm.tools.xsl.dir}/classpath-template.xsl" in="project.xml"
-              out="ccm.classpath" classpathref="tools.classpath" force="yes">
+              out="ccm.classpath" classpathref="ccm.tools.classpath" force="yes">
-			<param name="base.dir" expression="${project.dir}" />
+			<param name="base.dir" expression="${ccm.project.dir}" />
-			<param name="shared.lib.dist.dir" expression="${tools.lib.dir}" />
+			<param name="shared.lib.dist.dir" expression="${ccm.tools.lib.dir}" />
 		</xslt>
 		-->
 	</target>

tools-ng/ecdc/scriptlib/build-runtime.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--  Already definded:
-		ccm.project.dir:		base dir of the development project
+		ccm.project.dir:		base dir of the development project (environment)
 		app.server.bundles.zip	name of the installation file
 		app.server.parent.dir	name of the dir to install into the server into
-		app.server.deploy.dir	dir the server are installed into (i.e. CATALINA_HOME)
+		app.server.deploy.dir	dir the server is to be installed into (i.e. CATALINA_HOME)
 		app.server.conf.dir		name of the servers configuration dir
-		webapp.dist.dir			distribution dir for web applications      -->
+		webapp.dist.dir			distribution dir for ccm web application      -->
 
 <project name="appserver" default="start">
 
@@ -25,6 +25,10 @@
 		<!-- Copy additional files needed for operation   -->
 		<copy file="ccm-core/lib/xercesImpl.jar"
               todir="${app.server.deploy.dir}/common/endorsed" preservelastmodified="true"/>
+		<copy file="tools-ng/dev-lib/ojdbc14.jar"
+              todir="${app.server.deploy.dir}/lib" preservelastmodified="true"/>
+		<copy file="tools-ng/dev-lib/postgresql-jdbc-8.2.506.jar"
+              todir="${app.server.deploy.dir}/lib" preservelastmodified="true"/>
 	</target>
 
 	<target name="start">