portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/src/schema phase1-schema.xml
Date Sat, 09 Apr 2005 18:47:46 GMT
taylor      2005/04/09 11:47:46

  Modified:    src/sql  populate-db-default.sql
               src/schema phase1-schema.xml
  Log:
  http://issues.apache.org/jira/browse/JS2-230
  
  support ordering of capabilitiy search
  added EVAL_ORDER column
  
  Revision  Changes    Path
  1.11      +91 -28    jakarta-jetspeed-2/src/sql/populate-db-default.sql
  
  Index: populate-db-default.sql
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/src/sql/populate-db-default.sql,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- populate-db-default.sql	11 Jan 2005 09:33:06 -0000	1.10
  +++ populate-db-default.sql	9 Apr 2005 18:47:46 -0000	1.11
  @@ -93,47 +93,58 @@
   ----------------------------------------------------------------------------
   -- Supported clients
   ----------------------------------------------------------------------------
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(1,'ie5','.*MSIE 5.*','Microsoft','None','5.5',1);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(1, 4,'ie5','.*MSIE 5.*','Microsoft','None','5.5',1);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(2,'ns4','.*Mozilla/4.*','Netscape','None','4.75',1);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(2, 5, 'ns4','.*Mozilla/4.*','Netscape','None','4.75',1);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(3,'mozilla','.*Mozilla/5.*','Mozilla','Mozilla','1.x',1);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(3, 6, 'mozilla','.*Mozilla/5.*','Mozilla','Mozilla','1.x',1);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(4,'lynx','Lynx.*','GNU','None','',1);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(4, 7, 'lynx','Lynx.*','GNU','None','',1);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(5,'nokia_generic','Nokia.*','Nokia','Generic','',2);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(5, 8, 'nokia_generic','Nokia.*','Nokia','Generic','',2);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(6,'up','UP.*|.*UP\.Browser.*','United Planet','Generic','',2);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(6, 9, 'up','UP.*|.*UP\.Browser.*','United Planet','Generic','',2);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(7,'sonyericsson','Ercis.*|SonyE.*','SonyEricsson','Generic','',2);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(7, 10, 'sonyericsson','Ercis.*|SonyE.*','SonyEricsson','Generic','',2);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(8,'wapalizer','Wapalizer.*','Wapalizer','Generic','',2);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(8, 11, 'wapalizer','Wapalizer.*','Wapalizer','Generic','',2);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(9,'klondike','Klondike.*','Klondike','Generic','',2);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(9, 12, 'klondike','Klondike.*','Klondike','Generic','',2);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(10,'wml_generic','.*WML.*|.*WAP.*|.*Wap.*|.*wml.*','Generic','Generic','',2);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(10, 13, 'wml_generic','.*WML.*|.*WAP.*|.*Wap.*|.*wml.*','Generic','Generic','',2);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(11,'vxml_generic','.*VoiceXML.*','Generic','Generic','',3);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(11, 14, 'vxml_generic','.*VoiceXML.*','Generic','Generic','',3);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(12,'nuance','Nuance.*','Nuance','Generic','',3);
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(12, 15, 'nuance','Nuance.*','Nuance','Generic','',3);
  +
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(13, 16, 'agentxml','agentxml/1.0.*','Unknown','Generic','',4);
  +
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(14, 17, 'opera7','.*Opera/7.*','Opera','Opera7','7.x',1);
  +
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(15, 1, 'ie5mac','.*MSIE 5.*Mac.*','Microsoft','None','5.*',1);
  +
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(16, 2, 'safari','.*Mac.*Safari.*','Apple','None','5.*',1);
  +
  +INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION,
PREFERRED_MIMETYPE_ID)
  +VALUES(17, 3,'ie6','.*MSIE 6.*','Microsoft','None','6.0',1);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(13,'agentxml','agentxml/1.0.*','Unknown','Generic','',4);
   
  -INSERT INTO CLIENT (CLIENT_ID,NAME,	USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
  -VALUES(14,'opera7','.*Opera/7.*','Opera','Opera7','7.x',1);
   
   ----------------------------------------------------------------------------------------
   -- Supported Media types
  @@ -227,6 +238,50 @@
   INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,40);
   INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,23);
   
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,1);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,8);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,17);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,3);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,6);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,7);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,5);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,21);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,24);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,30);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(15,40);
  +
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,1);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,8);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,17);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,3);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,4);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,6);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,7);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,5);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,22);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,24);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,25);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,26);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,27);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,29);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(16,40);
  +
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,1);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,8);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,17);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,3);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,4);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,6);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,7);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,5);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,22);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,24);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,25);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,26);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,27);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,29);
  +INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(17,40);
  +
   -- Client To Mimetype
   
   INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(1,1);
  @@ -262,6 +317,14 @@
   INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(14,4);
   INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(14,5);
   
  +INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(15,1);
  +INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(16,1);
  +INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(16,4);
  +INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(16,5);
  +INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(17,1);
  +INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(17,4);
  +INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(17,5);
  +
   ----------------------------------------------------
   -- Media Type association
   ----------------------------------------------------
  
  
  
  1.3       +1 -0      jakarta-jetspeed-2/src/schema/phase1-schema.xml
  
  Index: phase1-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/src/schema/phase1-schema.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- phase1-schema.xml	18 Mar 2004 19:39:02 -0000	1.2
  +++ phase1-schema.xml	9 Apr 2005 18:47:46 -0000	1.3
  @@ -39,6 +39,7 @@
   
       <table name="CLIENT">
           <column name="CLIENT_ID" primaryKey="true" required="true" type="INTEGER"/>
  +        <column name="EVAL_ORDER" required="true" type='INTEGER'/>
           <column name="NAME" required="true" size="80" type="VARCHAR"/>
           <column name="USER_AGENT_PATTERN" size="128" type="VARCHAR"/>
           <column name="MANUFACTURER" size="80" type="VARCHAR"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message