merged

SE/schema/WPS_Functions/default_db/recurse_ant/build_recurse_ant.xml

@@ -47,7 +47,8 @@
     <property name="simpleSchema_dir" location="${basedir}/../../../default_db.instance.xml/simpleSchema" />
     <property name="detect_resource_type_dir" location="${basedir}/../../../default_db.instance.xml/detect_resource_type" />
     <property name="build_complexType_dir" location="${basedir}/../../../default_db.instance.xml/build_complexType" />
-    
+    <property name="default_db.instance.xml" location="${basedir}/../../../default_db.instance.xml" />
+
     <property name="uuid" value="${uuid}"/> <!--TODO-->
     <property name="passwordBase64Basic" value="${passwordBase64Basic}"/>
     <property name="php_session_id" value="${php_session_id}"/> <!-- optional cookie if sent work with it if not - get it -->
@@ -418,6 +419,7 @@
    
    
     
+<!-- @2017-12-14 copied to build_get_wfs.xml TO BE REMOVED FROM THERE!!! after basepath modify! -->
         <target name="php_session_id_cond">
             <condition property="php_session_id_fail" taskname="php_session_id_check">
                 <or>
@@ -498,6 +500,7 @@
             <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
             <param name="typeName" expression="${typeName_tested}"/> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
             <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
+            <param name="default_db.instance.xml" expression="${default_db.instance.xml}"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
@@ -604,6 +607,7 @@
             <param name="typeName" expression="${typeName}"/>
             <param name="namespace_prefix_p5_tr_map" expression="${namespace_prefix_p5_tr_map}"/>
             <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
+        <param name="default_db.instance.xml" expression="${default_db.instance.xml}"/>
         </xslt>
     </target>
     
@@ -681,6 +685,7 @@
             <param name="typeNameRoot" expression="${typeName_tested}"/> <!-- to cache purpose - to allow child elements cache created to be named from this typeNameRoot -->
             <param name="input_obj_fid_forced" expression="${input_obj_fid_forced}"/>
             <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
+            <param name="default_db.instance.xml" expression="${default_db.instance.xml}"/>
         </xslt>
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <!--<record action="stop" name="ant.log"/>-->

SE/schema/WPS_Functions/get_wfs/build_get_wfs.xml

@@ -69,7 +69,8 @@
         <delete dir="${get_wfs_basedir.temp}" failonerror="false"/>
     </target>
 
-<target name="create_tempdir">            <mkdir dir="${get_wfs_basedir.temp}"/>
+    <target name="create_tempdir">
+            <mkdir dir="${get_wfs_basedir.temp}"/>
     </target>