Changeset 2159

Timestamp:

08/28/12 14:20:38 (12 years ago)

Author:

mwindhouwer

Message:

D mod-ISOcat-access-system/info/revision.xml

• generated by the ant build file

M mod-ISOcat-utils/build.xml

• copy the correct JAR

M mod-ISOcat-site/module.xml

• don't process the doc requests

M mod-ISOcat-access-data/dbms/ISOcat-schema-init.sql

• fixed the owner references

M mod-ISOcat-access-data/dbms/ISOcat-schema-constraints.sql

• commented out some grants

M mod-ISOcat-access-data/dbms/ISOcat-schema-empty.sql

• pgsql is already loaded im/explicit

Location:

cats/ISOcat/trunk

Files:

• mod-ISOcat-access-data/dbms/ISOcat-schema-constraints.sql (modified) (1 diff)
• mod-ISOcat-access-data/dbms/ISOcat-schema-empty.sql (modified) (1 diff)
• mod-ISOcat-access-data/dbms/ISOcat-schema-init.sql (modified) (4 diffs)
• mod-ISOcat-access-system/info/revision.xml (deleted)
• mod-ISOcat-site/module.xml (modified) (2 diffs)
• mod-ISOcat-utils/build.xml (modified) (1 diff)

cats/ISOcat/trunk/mod-ISOcat-access-data/dbms/ISOcat-schema-constraints.sql

@@ -2948 +2948 @@
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM postgres;
-GRANT ALL ON SCHEMA public TO postgres;
-GRANT ALL ON SCHEMA public TO PUBLIC;
+--REVOKE ALL ON SCHEMA public FROM PUBLIC;
+--REVOKE ALL ON SCHEMA public FROM postgres;
+--GRANT ALL ON SCHEMA public TO postgres;
+--GRANT ALL ON SCHEMA public TO PUBLIC;
 
 

cats/ISOcat/trunk/mod-ISOcat-access-data/dbms/ISOcat-schema-empty.sql

@@ -17 +17 @@
 --
 
-CREATE PROCEDURAL LANGUAGE plpgsql;
+--CREATE PROCEDURAL LANGUAGE plpgsql;
 
 

cats/ISOcat/trunk/mod-ISOcat-access-data/dbms/ISOcat-schema-init.sql

@@ -185 +185 @@
 ALTER SEQUENCE core_data_type_id_seq RESTART WITH 1;
 
-ALTER SEQUENCE core_decision_group_id_seq RESTART WITH 1;
-
 ALTER SEQUENCE core_language_id_seq RESTART WITH 1;
 
@@ -199 +197 @@
 ALTER SEQUENCE core_registration_authority_id_seq RESTART WITH 1;
 
-ALTER SEQUENCE core_registration_group_id_seq RESTART WITH 1;
-
 ALTER SEQUENCE core_rule_id_seq RESTART WITH 1;
 
@@ -208 +204 @@
 
 ALTER SEQUENCE core_session_id_seq RESTART WITH 1;
-
-ALTER SEQUENCE core_submission_group_id_seq RESTART WITH 1;
 
 ALTER SEQUENCE generic_lock_id_seq RESTART WITH 1;
@@ -356 +350 @@
 -- an example TDG
 INSERT INTO core_account(id) VALUES (5);
+INSERT INTO core_owner(id) VALUES (5);
 INSERT INTO core_group (id) VALUES (5);
 INSERT INTO core_thematic_domain_group (id,"name",description,"order",status,activity) VALUES (5,'Example','This is an example TDG and profile. To rename them the PostgreSQL database needs to be updated.',1,'example','example');

cats/ISOcat/trunk/mod-ISOcat-site/module.xml

@@ -262 +262 @@
         <!-- index.html and friends -->
         <rule>
-            <match>ffcpl:/(.*?)/index.html((\+.*)?)</match>
+            <match>ffcpl:/(?!doc)(.*?)/index.html((\+.*)?)</match>
             <to>ffcpl:/$1/index.html</to>
         </rule>
         <rule>
-            <match>ffcpl:/(.*?)/index.htm((\+.*)?)</match>
+            <match>ffcpl:/(?!doc)(.*?)/index.htm((\+.*)?)</match>
             <to>ffcpl:/$1/index.html</to>
         </rule>
         <rule>
-            <match>ffcpl:/(.*?)/((\+.*)?)</match>
+            <match>ffcpl:/(?!doc)(.*?)/((\+.*)?)</match>
             <to>ffcpl:/$1/index.html</to>
         </rule>
         <rule>
-            <match>ffcpl:/(.*?)/index.html</match>
+            <match>ffcpl:/(?!doc)(.*?)/index.html</match>
             <to>active:sloot.accessor+operand@ffcpl:/site/$1/index.acc</to>
         </rule>
@@ -280 +280 @@
         <!-- all other static files -->
         <rule>
-            <match>ffcpl:/(?!site)(.*?)/([^+]+)((\+.*)?)</match>
+            <match>ffcpl:/(?!site|doc)(.*?)/([^+]+)((\+.*)?)</match>
             <to>ffcpl:/site/$1/$2</to>
         </rule>

cats/ISOcat/trunk/mod-ISOcat-utils/build.xml

@@ -12 +12 @@
         <target name="lib" depends="init" description="collect external libraries" >
                 <!-- Copy the Ostermiller libraries to the lib directory -->
-                <copy file="${ostermiller}/ostermillerutils.jar" todir="${libs}"/>
+                <copy todir="${libs}">
+                        <fileset dir="${ostermiller}" includes="ostermillerutils-*.jar" excludes="*-*-*.jar"/>
+                </copy>
         </target>