You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by je...@apache.org on 2012/09/14 06:37:27 UTC
svn commit: r1384643 [1/2] - in
/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources:
PropertyDefinitions.txt TypeDefinitions.txt TypesXmlGenerator.groovy
types.xml
Author: jens
Date: Fri Sep 14 04:37:26 2012
New Revision: 1384643
URL: http://svn.apache.org/viewvc?rev=1384643&view=rev
Log:
small changes for default type system of InMemory
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/PropertyDefinitions.txt
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypeDefinitions.txt
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypesXmlGenerator.groovy
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/types.xml
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/PropertyDefinitions.txt
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/PropertyDefinitions.txt?rev=1384643&r1=1384642&r2=1384643&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/PropertyDefinitions.txt (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/PropertyDefinitions.txt Fri Sep 14 04:37:26 2012
@@ -1,163 +1,163 @@
#property definitions
string
Artist
-artist;sap
+artist;artist;apache
Artist
single, readwrite, optional, true, true
string
Album
-album;sap
+album;album;apache
title
single, readwrite, optional, true, true
string
Title
-title;sap
+title;title;apache
Title
single, readwrite, optional, true, true
string
Comment
-comment;sap
+comment;comment;apache
Comment
single, readwrite, optional, false, false
string
Genre
-genre;sap
+genre;genre;apache
Genre
single, readwrite, optional, true, true
integer
Length
-length;sap
+length;length;apache
Length in seconds
single, readwrite, optional, false, false
integer
Track
-track;sap
+track;track;apache
Track in album
single, readwrite, optional, true, true
string
Year
-year;sap
+year;year;apache
release date of albun
single, readwrite, optional, true, true
string
Composer
-composer;sap
+composer;composer;apache
Composer
single, readwrite, optional, true, true
string
Disc Number
-discNo;sap
+discNo;discNo;apache
number of disc / total discs
single, readwrite, optional, false, false
string
Audio Format
-audioFormat;sap
+audioFormat;audioFormat;apache
Audio Format / compression scheme
single, readwrite, optional, false, false
integer
Sample Rate
-sampleRate;sap
+sampleRate;sampleRate;apache
Sample Rate
single, readwrite, optional, false, false
string enum: Mono=Mono;Stereo=Stereo;5.1=5.1;7.1=7.1
Audio Channel Type
-audioChannelType;sap
+audioChannelType;audioChannelType;apache
audio channel type
single, readwrite, optional, false, false
integer
Number Channels
-noChannels;sap
+noChannels;noChannels;apache
number of audio channels
single, readwrite, optional, false, false
string
Compressor Version
-compressorVersion;sap
+compressorVersion;compressorVersion;apache
version description of compressor
single, readwrite, optional, false, false
string
Message Recipient Address
-messageRecipientAddress;sap
+messageRecipientAddress;messageRecipientAddress;apache
Message Recipient Address
single, readwrite, optional, true, true
string
From
-from;sap
+from;from;apache
sender of message
single, readwrite, optional, true, true
string
To
-to;sap
+to;to;apache
recipients of message
multi, readwrite, optional, true, true
string
Cc
-cc;sap
+cc;cc;apache
carbon copy recipients of message
multi, readwrite, optional, true, true
string
Bcc
-bcc;sap
+bcc;bcc;apache
blind carbon copy recipients of message
multi, readwrite, optional, false, false
string
Subject
-subject;sap
+subject;subject;apache
subjet of message
single, readwrite, optional, true, true
datetime
Creation Date
-creationDate;sap
+creationDate;creationDate;apache
Creation Date
single, readwrite, optional, false, false
datetime
Last Save Date
-lastSaveDate;sap
+lastSaveDate;lastSaveDate;apache
Last Save Date
single, readwrite, optional, false, false
integer
Image Width
-imageWidth;sap;0x0100
+imageWidth;0x0100;apache;
Image Width
single, oncreate, optional, false, false
integer
Image Height
-imageHeight;sap;0x0101
+imageHeight;0x0101;apache
Image Height
single, oncreate, optional, false, false
integer
Bits Per Sample
-bitsPerSample;0x0102
+bitsPerSample;0x0102;apache
Bits Per Sample
single, oncreate, optional, false, false
integer enum: 1=Uncompressed;2=CCITT 1D;3=T4/Group 3 Fax;4=T6/Group 4 Fax;5=LZW;6=JPEG (old-style);7=JPEG;8=Adobe Deflate;9=JBIG BW;10=JBIG Color;99=JPEG;262=Kodak 262;32766=Next;32767=Sony ARW Compressed;32769=Packed RAW;32770=Samsung SRW Compressed;32771=CCIRLEW;32773=PackBits;32809=Thunderscan;32867=Kodak KDC Compressed;32895=IT8CTPAD;32896=IT8LW;32897=IT8MP;32898=IT8BL;32908=PixarFilm;32909=PixarLog;32946=Deflate;32947=DCS;34661=JBIG;34676=SGILog;34677=SGILog24;34712=JPEG 2000;34713=Nikon NEF Compressed;34715=JBIG2 TIFF FX;34718=Microsoft Document Imaging (MDI) Binary Level Codec;34719=Microsoft Document Imaging (MDI) Progressive Transform Codec;34720=Microsoft Document Imaging (MDI) Vector;65000=Kodak DCR Compressed;65535=Pentax PEF Compressed
Compression
-compression;sap;0x0103
+compression;0x0103;apache
Compression Format
single, oncreate, optional, false, false
@@ -169,492 +169,462 @@ single, oncreate, optional, false, false
string
Image Description
-imageDescription;sap;0x010e
+imageDescription;0x010e;apache
Description
single, readwrite, optional, true, true
string
Make
-make;sap;0x010f
+make;0x010f;apache
Camera Make
single, readwrite, optional, true, true
string
Model
-model;sap;0x0110
+model;0x0110;apache
Camera Model
single, readwrite, optional, true, true
integer enum: 1=Horizontal (normal);2=Mirror horizontal;3=Rotate 180;4=Mirror vertical;5=Mirror horizontal and rotate 270 CW;6=Rotate 90 CW;7=Mirror horizontal and rotate 90 CW;8=Rotate 270 CW
Orientation
-orientation;sap;0x0112
+orientation;0x0112;apache
Orientation
single, readwrite, optional, false, false
decimal
X Resolution
-xResolution;sap;0x011a
+xResolution;0x011a;apache
xresolution
single, readwrite, optional, false, false
decimal
Y Resolution
-yResolution;0x011b
+yResolution;0x011b;apache
yresolution
single, readwrite, optional, false, false
integer enum: 1=None;2=inches;3=cm
Resolution Unit
-resolutionUnit;sap;0x0128
+resolutionUnit;0x0128;apache
Resolution Unit
single, readwrite, optional, false, false
string
Software
-software;sap;0x0131
+software;0x0131;apache
Software
single, readwrite, optional, false, false
datetime
Modify Date
-dateTime;sap;0x0132
+modifyDate;0x0132;apache
Modify Date
single, readwrite, optional, false, false
string
Artist
-artist;sap;0x013b
+artist;0x013b;apache
Artist
single, readwrite, optional, true, true
integer enum: 1=Centered;2=Co-sited
YCbCrPositioning
-yCbCrPositioning;sap;0x0213
+yCbCrPositioning;0x0213;apache
YCbCr Positioning
single, readwrite, optional, false, false
string
Copyright
-copyright;sap;0x8298
+copyright;0x8298;apache
Copyright Notice
single, readwrite, optional, false, false
decimal
Exposure Time
-exposureTime;sap;0x829a
+exposureTime;0x829a;apache
Exposure Time
single, oncreate, optional, false, false
decimal
F Number
-fNumber;sap;0x829d
+fNumber;0x829d;apache
F-Stop Number
single, oncreate, optional, false, false
integer enum: 0=Not Defined;1=Manual;2=Program AE;3=Aperture-priority AE;4=Shutter speed priority AE;5=Creative (Slow speed);6=Action (High speed);7=Portrait;8=Landscape;9=Bulb
Exposure Program
-exposureProgram;sap;0x8822
+exposureProgram;0x8822;apache
Exposure Program
single, oncreate, optional, false, false
integer
ISO Speed
-isoSpeed;sap;0x8827
+isoSpeed;0x8827;apache
ISO Speed Setting
single, oncreate, optional, true, true
decimal
GPS Latitude
-gpsLatitude;sap;0x8825-0x0002
+gpsLatitude;0x8825-0x0002;apache
GPS Latitude
single, readwrite, optional, true, true
string enum: N=North;S=South
GPS Latitude Ref
-gpsLatitudeRef;sap;0x8825-0x0001
+gpsLatitudeRef;0x8825-0x0001;apache
GPS Latitude Reference (N/S)
single, readwrite, optional, true, true
decimal
GPS Longitude
-gpsLongitude;sap;0x8825-0x0004
+gpsLongitude;0x8825-0x0004;apache
GPS Longitude
single, readwrite, optional, true, true
string enum: E=East;W=West
GPS Longitude Ref
-gpsLongitudeRef;sap;0x8825-0x0003
+gpsLongitudeRef;0x8825-0x0003;apache
GPS Longitude Reference (W/E)
single, readwrite, optional, true, true
decimal
GPS Altitude
-gpsAltitude;sap;0x8825-0x0006
+gpsAltitude;0x8825-0x0006;apache
GPS Altitude
single, readwrite, optional, true, true
string enum: 0=Above Sea Level;1=Below Sea Level
GPS Altitude Ref
-gpsAltitudeRef;sap;0x8825-0x0005
+gpsAltitudeRef;0x8825-0x0005;apache
GPS Altitude Reference
single, readwrite, optional, true, true
integer
Self Timer Mode
-selfTimerMode;sap;0x882b
+selfTimerMode;0x882b;apache
Self Timer Mode
single, readwrite, optional, false, false
integer
Time Zone Offset
-timeZoneOffset;sap;0x882a
+timeZoneOffset;0x882a;apache
Time Zone Offset (GMT offset in hours)
multi, readwrite, optional, false, false
datetime
Date Time Original
-dateTimeOriginal;sap;0x9003
+dateTimeOriginal;0x9003;apache
date/time when original image was taken
single, readwrite, optional, false, false
datetime
Create Date
-createDate;0x9004
+createDate;0x9004;apache
date/time digitized
single, readwrite, optional, true, true
decimal
Shutter Speed Value
-shutterSpeedValue;sap;0x9201
+shutterSpeedValue;0x9201;apache
shutter speed value
single, readwrite, optional, false, false
decimal
Aperture Value
-apertureValue;sap;0x9202
+apertureValue;0x9202;apache
Aperture Value
single, readwrite, optional, false, false
decimal
Brightness Value
-brightnessValue;sap;0x9203
+brightnessValue;0x9203;apache
Brightness Value
single, readwrite, optional, false, false
decimal
Exposure Compensation
-exposureCompensation;sap;0x9204
+exposureCompensation;0x9204;apache
Exposure Compensation
single, readwrite, optional, false, false
decimal
Max Aperture Value
-maxApertureValue;sap;0x9205
+maxApertureValue;0x9205;apache
Max Aperture Value
single, readwrite, optional, false, false
integer enum:0=Unknown;1=Average;2=Center-weighted average;3=Spot;4=Multi-spot;5=Multi-segment;6=Partial;255=Other
Metering Mode
-meteringMode;sap;0x9207
+meteringMode;0x9207;apache
metering mode
single, readwrite, optional, false, false
decimal
Subject Distance
-subjectDistance;sap;0x9206
+subjectDistance;0x9206;apache
subject distance
single, readwrite, optional, false, false
integer
Light Source
-lightSource;sap;0x9208
+lightSource;0x9208;apache
light source value
single, readwrite, optional, false, false
integer
Flash
-flash;sap;0x9209
+flash;0x9209;apache
Flash Setting
single, readwrite, optional, false, false
decimal
Focal Length
-focalLength;sap;0x920a
+focalLength;0x920a;apache
focal length
single, readwrite, optional, true, true
string
User Comment
-userComment;sap;0x9286
+userComment;0x9286;apache
user comment
single, readwrite, optional, true, true
integer enum: 1=sRGB;2=Adobe RGB;65533=Wide Gamut RGB;65534=ICC Profile;65535=Uncalibrated
Color Space
-colorSpace;sap;0xa001
+colorSpace;0xa001;apache
color space
single, readwrite, optional, false, false
integer
PixelXDimension
-pixelXDimension;sap;0xa002
+pixelXDimension;0xa002;apache
dimension in pixel x
single, readwrite, optional, false, false
integer
PixelYDimension
-pixelYDimension;sap;0xa003
+pixelYDimension;0xa003;apache
dimension in pixel y
single, readwrite, optional, false, false
integer enum: 0=Auto;1=Manual;2=Auto bracket
Exposure Mode
-exposureMode;sap;0xa402
+exposureMode;0xa402;apache
Exposure Mode
single, readwrite, optional, false, false
integer enum: 0=Auto;1=Manual
White Balance
-whiteBalance;sap;0xa403
+whiteBalance;0xa403;apache
white balance
single, readwrite, optional, false, false
integer enum: 0=Standard;1=Landscape;2=Portrait;3=Night
Scene Capture Type
-sceneCaptureType;sap;0xa406
+sceneCaptureType;0xa406;apache
Scene Capture Type
single, readwrite, optional, false, false
id
Image Unique Id
-imageUniqueId;sap;0xa420
+imageUniqueId;0xa420;apache
Image Unique Id
single, readwrite, optional, false, false
string
Owner Name
-ownerName;sap;0xa430
+ownerName;0xa430;apache
Owner Name
single, readwrite, optional, true, true
string
Serial Number
-serialNumber;sap;0xa431
+serialNumber;0xa431;apache
serial number
single, readwrite, optional, true, true
integer
Rating
-rating;sap;0x4746
+rating;0x4746;apache
rating value
single, readwrite, optional, false, false
integer
Rating Percent
-ratingPercent;sap;0x4749
+ratingPercent;0x4749;apache
rating percent
single, readwrite, optional, false, false
integer
Data Precision
-dataPrecision;sap;0x0000
+dataPrecision;0x0000;apache
JPEG Data Precision
single, readwrite, optional, false, false
string
Application Name
-applicationName;sap
+applicationName;applicationName;apache
Application Name
single, readwrite, optional, true, true
string
Application Version
-applicationVersion;sap
+applicationVersion;applicationVersion;apache
Application Version
single, readwrite, optional, false, false
string
Author
-author;sap
+author;author;apache
Author
single, readwrite, optional, true, true
string
Category
-category;sap
+category;category;apache
Category
single, readwrite, optional, true, true
string
Content Status
-contentStatus;sap
+contentStatus;contentStatus;apache
Content Status
single, readwrite, optional, false, false
string
Comments
-comments;sap
+comments;comments;apache
Comments
single, readwrite, optional, true, true
string
Company
-company;sap
+company;company;apache
Company
single, readwrite, optional, true, true
string
Keywords
-keywords;sap
+keywords;keywords;apache
Keywords
multiple, readwrite, optional, true, true
string
Last Author
-lastAuthor;sap
+lastAuthor;lastAuthor;apache
Last Author
single, readwrite, optional, false, false
string
Manager
-manager;sap
+manager;manager;apache
Manager
single, readwrite, optional, false, false
string
Notes
-notes;sap
+notes;notes;apache
Notes
single, readwrite, optional, false, false
string
Presentation Format
-presentationFormat;sap
+presentationFormat;presentationFormat;apache
Presentation Format
single, readwrite, optional, false, false
string
Revision Number
-revisionNumber;sap
+revisionNumber;revisionNumber;apache
Revision Number
single, readwrite, optional, false, false
string
Template
-template;sap
+template;template;apache
Template
single, readwrite, optional, false, false
string
Version
-version;sap
+version;version;apache
Version
single, readwrite, optional, false, false
integer
Character Count
-characterCount;sap
+characterCount;characterCount;apache
Character Count
single, readwrite, optional, false, false
integer
Character Count With Spaces
-characterCountWithSpaces;sap
+characterCountWithSpaces;characterCountWithSpaces;apache
Character Count With Spaces
single, readwrite, optional, false, false
integer
Word Count
-wordCount;sap
+wordCount;wordCount;apache
Word Count
single, readwrite, optional, false, false
integer
Line Count
-lineCount;sap
+lineCount;lineCount;apache
Line Count
single, readwrite, optional, false, false
integer
Page Count
-pageCount;sap
+pageCount;pageCount;apache
Page Count
single, readwrite, optional, true, true
integer
Slide Count
-slideCount;sap
+slideCount;slideCount;apache
Slide Count
single, readwrite, optional, true, true
integer
Paragraph Count
-paragraphCount;sap
+paragraphCount;paragraphCount;apache
Paragraph Count
single, readwrite, optional, false, false
string
Total Time
-totalTime;sap
+totalTime;totalTime;apache
Total Time
single, readwrite, optional, false, false
string
Edit Time
-editTime;sap
+editTime;editTime;apache
Edit Time
single, readwrite, optional, false, false
datetime
Last Save Date
-lastSaveDate;sap
+lastSaveDate;lastSaveDate;apache
Last Save Date
single, readwrite, optional, false, false
string
Last Printed
-lastPrinted;sap
+lastPrinted;lastPrinted;apache
Last Printed
single, readwrite, optional, false, false
-integer
-No Pages
-noPages;sap
-number of pages in document
-single, readwrite, optional, false, false
-
string
Creator
-creator;sap
+creator;creator;apache
creator of document
single, readwrite, optional, true, true
string
-Keywords
-keywords;sap
-keywords of document
-multi, readwrite, optional, true, true
-
-string
-Producer
-producer;sap
-producer of document
-single, readwrite, optional, false, false
-
-datetime
-Created Date
-createdDate;sap
-creation date of document
-single, readwrite, optional, false, false
-
-datetime
-Modified Date
-modifiedDate;sap
-date of last modification
-single, readwrite, optional, false, false
-
-string
Trapped
-trapped;sap
+trapped;trapped;apache
trapped
single, readwrite, optional, false, false
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypeDefinitions.txt
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypeDefinitions.txt?rev=1384643&r1=1384642&r2=1384643&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypeDefinitions.txt (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypeDefinitions.txt Fri Sep 14 04:37:26 2012
@@ -1,6 +1,6 @@
#EXIF type definition http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/EXIF.html
document
-audioFile;apache
+audioFile;audioFile;apache
Audio File
Audio Content (compressed or uncompressed)
Artist
@@ -20,7 +20,7 @@ Audio Content (compressed or uncompresse
Compressor Version
document
-emailDocument;apache
+emailDocument;emailDocument;apache
Email Document
Document of type Email
From
@@ -33,7 +33,7 @@ Document of type Email
Last Save Date
document
-exifImage;apache
+exifImage;exifImage;apache
EXIF Image
Image with EXIF tags
Image Width
@@ -92,7 +92,7 @@ Image with EXIF tags
Data Precision
document
-officeDocument;apache
+officeDocument;officeDocument;apache
Office Document
Document of type Office
Application Name
@@ -124,22 +124,16 @@ Document of type Office
Last Printed
document
-pdfDocument;apache
+pdfDocument;pdfDocument;apache:officeDocument
PDF Document
Document of type PDF
- No Pages
- Title
- Author
Creator
- Keywords
- Producer
+ Title
Subject
- Created Date
- Modified Date
Trapped
document
-videoFile;apache
+videoFile;videoFile;apache
Video File
Video Movies
Artist
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypesXmlGenerator.groovy
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypesXmlGenerator.groovy?rev=1384643&r1=1384642&r2=1384643&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypesXmlGenerator.groovy (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/TypesXmlGenerator.groovy Fri Sep 14 04:37:26 2012
@@ -212,7 +212,7 @@ def genTypeDef (name, id, descr, typeKin
outFile.println("<cmisra:type xsi:type=\"" + xsiType + "\">")
outFile.println(" <id>" + id1 + "</id>")
outFile.println(" <localName>" + localName + "</localName>")
- outFile.println(" <localNamespace>ns</localNamespace>")
+ outFile.println(" <localNamespace>" + ns + "</localNamespace>")
outFile.println(" <parentId>" + parentType + "</parentId>")
outFile.println(" <displayName>" + name + "</displayName>")
outFile.println(" <queryName>" + name.replaceAll(" ", "_").toUpperCase() + "</queryName>")
@@ -281,9 +281,8 @@ def readPropertiesFile(inputFile) {
while (inFile.readLine() != null) {
def typeLine = inFile.readLine()
def name = inFile.readLine().trim()
- println("Processing property: " + name + " type: " + typeLine)
+ println(" processing property: " + name + " type: " + typeLine)
def id = inFile.readLine().trim()
- println(" id: " + id)
def descr = inFile.readLine().trim()
def attrs = inFile.readLine().trim()
def choices = null;
@@ -368,11 +367,16 @@ def writePropDefs(propDefsMap) {
// Main program
println("Starting...")
-
-outFile = new File("types.xml").newPrintWriter()
-typeDefsMap = readTypeDefinitions("TypeDefinitions.txt")
-propDefsMap = readPropertiesFile("PropertyDefinitions.txt")
-
+def propsFile = "PropertyDefinitions.txt";
+def typesFile = "TypeDefinitions.txt";
+def outFileName = "types.xml";
+outFile = new File(outFileName).newPrintWriter()
+
+println("Reading type definitions from file " + typesFile);
+typeDefsMap = readTypeDefinitions(typesFile)
+println("Reading property definitions from file " + propsFile);
+propDefsMap = readPropertiesFile(propsFile)
+println("Writing out to " + outFileName);
outFile.println("<!-- Generated Output file with type definitions. Do not edit! -->")
writeTypes(typeDefsMap)
outFile.close()