Project

General

Profile

« Previous | Next » 

Revision 49049

integrated changes from trunk

View differences:

OafParent.proto
7 7
import "Type.proto";
8 8
import "Datasource.proto";
9 9
import "Organization.proto";
10
import "Person.proto";
11 10
import "Project.proto";
12 11
import "Result.proto";
13 12

  
14 13
// for OafRel
15 14
import "RelType.proto";
16 15
import "Datasource_Organization.proto";
17
import "Person_Result.proto";
18 16
import "Project_Organization.proto";
19
import "Project_Person.proto";
20 17
import "Result_Organization.proto";
21 18
import "Result_Project.proto";
22
import "Person_Person.proto";
23 19
import "Result_Result.proto";
24 20
import "Organization_Organization.proto";
25 21

  
......
54 50
   and never persisted values stored in  HBase. */
55 51
  repeated OafRel cachedRel = 2;
56 52
  repeated Oaf cachedOafRel = 18;
57
  
53

  
58 54
  optional Datasource datasource = 3;
59 55
  optional Organization organization = 4;
60
  optional Person person = 5;
61 56
  optional Project project = 6;
62 57
  optional Result result = 7;
63 58
  
......
84 79

  
85 80
  // needed to have more information that is not included in cachedTarget.
86 81
  optional Oaf cachedOafTarget = 8;
87
  
82

  
88 83
  // Datamodel rels
89 84
  optional DatasourceOrganization datasourceOrganization = 6;
90
  optional PersonResult personResult = 7;
91 85
  optional ProjectOrganization projectOrganization = 9;
92
  optional ProjectPerson projectPerson = 18;
93 86
  optional ResultOrganization resultOrganization = 10;
94 87
  optional ResultProject resultProject = 11;
95
  optional PersonPerson personPerson = 15;
96 88
  optional ResultResult resultResult = 16;
97 89
  optional OrganizationOrganization organizationOrganization = 17;
98 90

  

Also available in: Unified diff