diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java index fde76afa..0739af79 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java @@ -104,8 +104,8 @@ public class TikaMetadataExtractsIT extends AbstractMetadataExtractsIT testFile(MIMETYPE_IMAGE_JPEG, "jpg", "quickIPTC-EXT.jpg"), testFile(MIMETYPE_IMAGE_JPEG, "jpg", "quickIPTC-multi-creator.jpg"), testFile(MIMETYPE_IMAGE_JPEG, "jpg", "testJPEG_IPTC_EXT.jpg"), - testFile(MIMETYPE_IMAGE_GIF, "gif", "quick.gif"), - testFile(MIMETYPE_IMAGE_PNG, "png", "quick.png"), + testFile(MIMETYPE_IMAGE_GIF, "gif", "quickIPTC.gif"), + testFile(MIMETYPE_IMAGE_PNG, "png", "quickIPTC.png"), testFile(MIMETYPE_IMAGE_RAW_RAF, "raf", "quick.raf"), // DWGMetadataExtractor diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.gif b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.gif new file mode 100644 index 00000000..81f307c7 Binary files /dev/null and b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.gif differ diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.gif_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.gif_metadata.json new file mode 100644 index 00000000..e7632162 --- /dev/null +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.gif_metadata.json @@ -0,0 +1,95 @@ +{ + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedSublocation" : "Kidlington", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrCity" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}CopyrightOwnerName" : "Ayman", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}DigitalSourceType" : "GIF", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}IptcLastEdited" : "2021:05:27", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCountryCode" : "+44", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrCtry" : "England", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}ModelAge" : [ "3", "3", "4", "3", "4", "3", "3", "3", "3", "3", "3", "3", "3", "3", "3", "25", "153", "3", "25", "153", "3" ], + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedProvinceState" : "New York", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorStreetAddress" : "63 Windsor Road", + "{http://www.alfresco.org/model/content/1.0}title" : null, + "{http://ns.adobe.com/photoshop/1.0/}TransmissionReference" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownSublocation" : "Kidlington", + "{http://purl.org/dc/elements/1.1/}description" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOSource" : "Fox sources", + "{http://ns.adobe.com/photoshop/1.0/}State" : "New York", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorRegion" : "Maidenhead", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}RegOrgId" : "id48485", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiTelWork" : "01865 513465", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}DigitalSourcefileType" : "GIF", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOCopyrightNotice" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOSourceInvNo" : "4845484", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageCreatorName" : "Ayman", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}CVterm" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCountryName" : "England", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCity" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}CopyrightOwnerID" : "id54154", + "{http://ns.adobe.com/photoshop/1.0/}Category" : "Comedy", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}OrganisationInImageName" : "Alfresco", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierName" : "Alfresco", + "{http://ns.adobe.com/photoshop/1.0/}SupplementalCategories" : "The quick brown fox jumps over the lazy dog", + "{http://www.alfresco.org/model/exif/1.0}pixelXDimension" : "409", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}Scene" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrExtadr" : "Kidlington", + "{http://ns.adobe.com/photoshop/1.0/}Headline" : "The quick brown fox jumps over the lazy dog", + "{http://ns.useplus.org/ldf/xmp/1.0/}MinorModelAgeDisclosure" : "Age 18", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}SubjectCode" : "fodijfsij5454", + "{http://ns.adobe.com/photoshop/1.0/}City" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorEmail" : "DiegoS@alfrescodev.onmicrosoft.com", + "{http://ns.useplus.org/ldf/xmp/1.0/}Version" : "1.1", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AddlModelInfo" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownWorldRegion" : "Soth West", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageCreatorID" : "id548454", + "{http://ns.useplus.org/ldf/xmp/1.0/}ModelReleaseID" : "id4845151", + "{http://purl.org/dc/elements/1.1/}subject" : "-fox -dog -lazy -jumping", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}DigImageGUID" : "49848484", + "{http://ns.adobe.com/photoshop/1.0/}CaptionWriter" : "Ayman", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorExtendedAddress" : "DiegoS@alfrescodev.onmicrosoft.com", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOTitle" : "The quick brown fox jumps over the lazy dog", + "{http://ns.adobe.com/photoshop/1.0/}DateCreated" : "2021-05-27", + "{http://www.alfresco.org/model/exif/1.0}pixelYDimension" : "92", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCity" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierImageID" : "id8454841", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedWorldRegion" : "South West", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorTelephone1" : "01865 465986", + "{http://ns.adobe.com/photoshop/1.0/}Source" : "Fox sources", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierID" : "id659568", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorTelephone2" : "01865 465986", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrRegion" : "Oxon", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrPcode" : "OX132EN", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorPostalCode" : "OX136XN", + "{http://ns.adobe.com/photoshop/1.0/}Urgency " : "5 (normal urgency)", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorID" : "id87515454", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiEmailWork" : "DiegoS@alfrescodev.onmicrosoft.com", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCountryName" : "England", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}OrganisationInImageCode" : "546851381", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AODateCreated" : "2021-05-27", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}PersonInImage" : "Ayman", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorCity" : "Maidenhead", + "{http://purl.org/dc/elements/1.1/}creator" : "Ayman", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownProvinceState" : "New York", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CountryCode" : "+44", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}Event" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}RegItemId" : "id48485", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorCountry" : "England", + "{http://ns.adobe.com/photoshop/1.0/}AuthorsPosition" : "Left Center", + "{http://ns.adobe.com/photoshop/1.0/}Credit" : "Visa", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}IntellectualGenre" : "Comedy", + "{http://purl.org/dc/elements/1.1/}rights" : "Fox rights", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}MaxAvailWidth" : "300", + "{http://purl.org/dc/elements/1.1/}title" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCountryCode" : "+44", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}MaxAvailHeight" : "400", + "{http://www.alfresco.org/model/content/1.0}author" : null, + "{http://ns.adobe.com/xap/1.0/rights/}UsageTerms" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}Location" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}PropertyReleaseID" : "id841584", + "{http://ns.adobe.com/photoshop/1.0/}Country" : "England", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOCreator" : "Ayman", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiUrlWork" : "01865 513465", + "{http://ns.adobe.com/photoshop/1.0/}Instructions" : "The quick brown fox jumps over the lazy dog", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorName" : "Alfresco", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorURL" : "www.alfresco.com" +} \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.png b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.png new file mode 100644 index 00000000..4ec70a99 Binary files /dev/null and b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.png differ diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.png_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.png_metadata.json new file mode 100644 index 00000000..1aa29415 --- /dev/null +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quickIPTC.png_metadata.json @@ -0,0 +1,94 @@ +{ + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedSublocation" : "Kidlington", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrCity" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}CopyrightOwnerName" : "Ayman", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}DigitalSourceType" : "PNG", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}IptcLastEdited" : "2021:05:27", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCountryCode" : "+44", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrCtry" : "England", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}ModelAge" : [ "3", "3", "25", "153", "3", "25", "153", "3" ], + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedProvinceState" : "New York", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorStreetAddress" : "63 Windsor Road", + "{http://www.alfresco.org/model/content/1.0}title" : null, + "{http://ns.adobe.com/photoshop/1.0/}TransmissionReference" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownSublocation" : "Kidlington", + "{http://purl.org/dc/elements/1.1/}description" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOSource" : "Fox sources", + "{http://ns.adobe.com/photoshop/1.0/}State" : "New York", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorRegion" : "Maidenhead", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}RegOrgId" : "id48485", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiTelWork" : "01865 513465", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}DigitalSourcefileType" : "PNG", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOCopyrightNotice" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOSourceInvNo" : "4845484", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageCreatorName" : "Ayman", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}CVterm" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCountryName" : "England", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCity" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}CopyrightOwnerID" : "id54154", + "{http://ns.adobe.com/photoshop/1.0/}Category" : "Comedy", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}OrganisationInImageName" : "Alfresco", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierName" : "Alfresco", + "{http://ns.adobe.com/photoshop/1.0/}SupplementalCategories" : "The quick brown fox jumps over the lazy dog", + "{http://www.alfresco.org/model/exif/1.0}pixelXDimension" : "409", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}Scene" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrExtadr" : "Kidlington", + "{http://ns.adobe.com/photoshop/1.0/}Headline" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}SubjectCode" : "fodijfsij5454", + "{http://ns.adobe.com/photoshop/1.0/}City" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorEmail" : "DiegoS@alfrescodev.onmicrosoft.com", + "{http://ns.useplus.org/ldf/xmp/1.0/}Version" : "1.1", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AddlModelInfo" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownWorldRegion" : "Soth West", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageCreatorID" : "id548454", + "{http://ns.useplus.org/ldf/xmp/1.0/}ModelReleaseID" : "id4845151", + "{http://purl.org/dc/elements/1.1/}subject" : "-fox -dog -lazy -jumping", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}DigImageGUID" : "49848484", + "{http://ns.adobe.com/photoshop/1.0/}CaptionWriter" : "Ayman", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorExtendedAddress" : "DiegoS@alfrescodev.onmicrosoft.com", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOTitle" : "The quick brown fox jumps over the lazy dog", + "{http://ns.adobe.com/photoshop/1.0/}DateCreated" : "2021-05-27", + "{http://www.alfresco.org/model/exif/1.0}pixelYDimension" : "92", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCity" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierImageID" : "id8454841", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedWorldRegion" : "South West", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorTelephone1" : "01865 465986", + "{http://ns.adobe.com/photoshop/1.0/}Source" : "Fox sources", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierID" : "id659568", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorTelephone2" : "01865 465986", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrRegion" : "Oxon", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrPcode" : "OX132EN", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorPostalCode" : "OX136XN", + "{http://ns.adobe.com/photoshop/1.0/}Urgency " : "5 (normal urgency)", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorID" : "id87515454", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiEmailWork" : "DiegoS@alfrescodev.onmicrosoft.com", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCountryName" : "England", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}OrganisationInImageCode" : "546851381", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AODateCreated" : "2021-05-27", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}PersonInImage" : "Ayman", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorCity" : "Maidenhead", + "{http://purl.org/dc/elements/1.1/}creator" : "Ayman", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownProvinceState" : "New York", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CountryCode" : "+44", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}Event" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}RegItemId" : "id48485", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorCountry" : "England", + "{http://ns.adobe.com/photoshop/1.0/}AuthorsPosition" : "Left Center", + "{http://ns.adobe.com/photoshop/1.0/}Credit" : "Visa", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}IntellectualGenre" : "Comedy", + "{http://purl.org/dc/elements/1.1/}rights" : "Fox rights", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}MaxAvailWidth" : "300", + "{http://purl.org/dc/elements/1.1/}title" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCountryCode" : "+44", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}MaxAvailHeight" : "400", + "{http://www.alfresco.org/model/content/1.0}author" : null, + "{http://ns.adobe.com/xap/1.0/rights/}UsageTerms" : "The quick brown fox jumps over the lazy dog", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}Location" : "Oxford", + "{http://ns.useplus.org/ldf/xmp/1.0/}PropertyReleaseID" : "id841584", + "{http://ns.adobe.com/photoshop/1.0/}Country" : "England", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOCreator" : "Ayman", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiUrlWork" : "01865 513465", + "{http://ns.adobe.com/photoshop/1.0/}Instructions" : "The quick brown fox jumps over the lazy dog", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorName" : "Alfresco", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorURL" : "www.alfresco.com" +} \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/testJPEG_IPTC_EXT.jpg_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/testJPEG_IPTC_EXT.jpg_metadata.json index a2adeab1..d4ae6b5b 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/testJPEG_IPTC_EXT.jpg_metadata.json +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/testJPEG_IPTC_EXT.jpg_metadata.json @@ -1,166 +1,101 @@ { - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrCity": "Atlanta", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrExtadr": "1234 Some Road", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrPcode": "30339", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrRegion": "GA", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiEmailWork": "info@alfresco.com.other@example.com", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiTelWork": "555-1234.555-4321", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiUrlWork": "http://alfresco.com.http://example.com", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CountryCode": "US", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}IntellectualGenre": "intellectual genre", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}Location": "Rock Creek Park", - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}Scene": [ - "iptc scene 1", - "iptc scene 2" - ], - "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}SubjectCode": [ - "iptc subject code 1", - "iptc subject code 2" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOCopyrightNotice": "Ray Gauss II", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOCreator": [ - "Mother Nature", - "Man", - "Mother Nature" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AODateCreated": [ - "1890-01-01", - "1901-02-01" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOSource": "National Park Service", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOSourceInvNo": [ - "123456", - "654321" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOTitle": [ - "Rock Creek Stream Bank", - "Pollution", - "Some Tree" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AddlModelInfo": "rocky 1 and rocky 2 are big", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}DigitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/digitalCapture", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}Event": "Photo Bike Tour", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCity": "Washington", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCountryCode": "US", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCountryName": "United States", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedProvinceState": "D.C.", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedSublocation": "Rock Creek Park", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedWorldRegion": "North America", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCity": "Washington", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCountryCode": "US", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCountryName": "United States", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownProvinceState": "D.C.", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownSublocation": [ - "Rock Creek Park Sub", - "Stream Section" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownWorldRegion": "North America", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}MaxAvailHeight": "3456", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}MaxAvailWidth": "5184", - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}ModelAge": [ - "1000", - "1001" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}OrganisationInImageCode": [ - "ASPP", - "OTHER_ORG" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}OrganisationInImageName": [ - "ASPP", - "Other Org" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}PersonInImage": [ - "rocky 1", - "rocky 2" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}RegItemId": [ - "100-ABC-ABC-555", - "11223344", - "55667788" - ], - "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}RegOrgId": [ - "PLUS", - "ORG 2" - ], - "{http://ns.adobe.com/photoshop/1.0/}AuthorsPosition": "DAM Architect", - "{http://ns.adobe.com/photoshop/1.0/}CaptionWriter": "Ray Gauss II", - "{http://ns.adobe.com/photoshop/1.0/}Category": "PrimaryCategory", - "{http://ns.adobe.com/photoshop/1.0/}City": "Washington", - "{http://ns.adobe.com/photoshop/1.0/}Country": "United States", - "{http://ns.adobe.com/photoshop/1.0/}Credit": "provider", - "{http://ns.adobe.com/photoshop/1.0/}DateCreated": "2011-08-31", - "{http://ns.adobe.com/photoshop/1.0/}Headline": "Rock Creek Park", - "{http://ns.adobe.com/photoshop/1.0/}Instructions": "instructions", - "{http://ns.adobe.com/photoshop/1.0/}Source": "source", - "{http://ns.adobe.com/photoshop/1.0/}State": "DC", - "{http://ns.adobe.com/photoshop/1.0/}SupplementalCategories": [ - "category1", - "category2" - ], - "{http://ns.adobe.com/photoshop/1.0/}TransmissionReference": "job identifier", - "{http://ns.adobe.com/xap/1.0/rights/}UsageTerms": "rights usage terms", - "{http://ns.useplus.org/ldf/xmp/1.0/}CopyrightOwnerID": "RGAUSS", - "{http://ns.useplus.org/ldf/xmp/1.0/}CopyrightOwnerName": [ - "Ray Gauss II", - "GG" - ], - "{http://ns.useplus.org/ldf/xmp/1.0/}ImageCreatorID": "RGAUSS", - "{http://ns.useplus.org/ldf/xmp/1.0/}ImageCreatorName": [ - "Ray Gauss II", - "GG" - ], - "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierID": "RGAUSS", - "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierImageID": "supplier image ID", - "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierName": "Ray Gauss II", - "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorEmail": "r@example.com", - "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorID": "RGAUSS", - "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorName": [ - "Ray Gauss II", - "GG" - ], - "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorTelephone1": "555-5555", - "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorTelephone2": "555-4444", - "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorURL": "http://rgauss.com", - "{http://ns.useplus.org/ldf/xmp/1.0/}MinorModelAgeDisclosure": "Age Unknown", - "{http://ns.useplus.org/ldf/xmp/1.0/}ModelReleaseID": [ - "model release id 1", - "model release id 2" - ], - "{http://ns.useplus.org/ldf/xmp/1.0/}ModelReleaseStatus": "Not Applicable", - "{http://ns.useplus.org/ldf/xmp/1.0/}PropertyReleaseID": [ - "prop release id 1", - "prop release id 2" - ], - "{http://ns.useplus.org/ldf/xmp/1.0/}PropertyReleaseStatus": "Not Applicable", - "{http://ns.useplus.org/ldf/xmp/1.0/}Version": "1.2.0", - "{http://purl.org/dc/elements/1.1/}creator": "Ray Gauss II", - "{http://purl.org/dc/elements/1.1/}description": "A stream bank in Rock Creek Park Washington DC during a photo bike tour with ASPP DC/South chapter.", - "{http://purl.org/dc/elements/1.1/}rights": "© Ray Gauss II", - "{http://purl.org/dc/elements/1.1/}subject": [ - "bank", - "park", - "rock creek", - "stream", - "washington" - ], - "{http://purl.org/dc/elements/1.1/}title": "Downstream", - "{http://www.alfresco.org/model/content/1.0}author": "Ray Gauss II", - "{http://www.alfresco.org/model/content/1.0}created": "2011-08-13T14:40:51", - "{http://www.alfresco.org/model/content/1.0}description": "A stream bank in Rock Creek Park Washington DC during a photo bike tour with ASPP DC/South chapter.", - "{http://www.alfresco.org/model/content/1.0}title": "Downstream", - "{http://www.alfresco.org/model/exif/1.0}dateTimeOriginal": "2011-08-13T14:40:51", - "{http://www.alfresco.org/model/exif/1.0}exposureTime": "0.0125", - "{http://www.alfresco.org/model/exif/1.0}fNumber": "10.0", - "{http://www.alfresco.org/model/exif/1.0}flash": "false", - "{http://www.alfresco.org/model/exif/1.0}focalLength": "50.0", - "{http://www.alfresco.org/model/exif/1.0}isoSpeedRatings": "640", - "{http://www.alfresco.org/model/exif/1.0}manufacturer": "Canon", - "{http://www.alfresco.org/model/exif/1.0}model": "Canon EOS 60D", - "{http://www.alfresco.org/model/exif/1.0}orientation": "1", - "{http://www.alfresco.org/model/exif/1.0}pixelXDimension": "103", - "{http://www.alfresco.org/model/exif/1.0}pixelYDimension": "69", - "{http://www.alfresco.org/model/exif/1.0}resolutionUnit": "Inch", - "{http://www.alfresco.org/model/exif/1.0}software": "Adobe Photoshop CS6 (Macintosh)", - "{http://www.alfresco.org/model/exif/1.0}xResolution": "72.0", - "{http://www.alfresco.org/model/exif/1.0}yResolution": "72.0" + "{http://ns.useplus.org/ldf/xmp/1.0/}CopyrightOwnerName" : [ "Ray Gauss II", "GG" ], + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}DigitalSourceType" : "http://cv.iptc.org/newscodes/digitalsourcetype/digitalCapture", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCountryCode" : "US", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}ModelAge" : [ "1000", "1001" ], + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedProvinceState" : "D.C.", + "{http://ns.useplus.org/ldf/xmp/1.0/}ModelReleaseStatus" : "Not Applicable", + "{http://ns.adobe.com/photoshop/1.0/}State" : "DC", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiTelWork" : "555-1234.555-4321", + "{http://www.alfresco.org/model/exif/1.0}xResolution" : "72.0", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierName" : "Ray Gauss II", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}SubjectCode" : [ "iptc subject code 1", "iptc subject code 2" ], + "{http://www.alfresco.org/model/exif/1.0}focalLength" : "50.0", + "{http://ns.adobe.com/photoshop/1.0/}City" : "Washington", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorEmail" : "r@example.com", + "{http://www.alfresco.org/model/exif/1.0}orientation" : "1", + "{http://ns.useplus.org/ldf/xmp/1.0/}ModelReleaseID" : [ "model release id 1", "model release id 2" ], + "{http://www.alfresco.org/model/exif/1.0}yResolution" : "72.0", + "{http://ns.adobe.com/photoshop/1.0/}CaptionWriter" : "Ray Gauss II", + "{http://www.alfresco.org/model/exif/1.0}exposureTime" : "0.0125", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOTitle" : [ "Rock Creek Stream Bank", "Pollution", "Some Tree" ], + "{http://ns.adobe.com/photoshop/1.0/}DateCreated" : "2011-08-31", + "{http://ns.adobe.com/photoshop/1.0/}Source" : "source", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierID" : "RGAUSS", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrRegion" : "GA", + "{http://www.alfresco.org/model/content/1.0}created" : "2011-08-13T14:40:51", + "{http://www.alfresco.org/model/exif/1.0}isoSpeedRatings" : "640", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCountryName" : "United States", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}OrganisationInImageCode" : [ "ASPP", "OTHER_ORG" ], + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AODateCreated" : [ "1890-01-01", "1901-02-01" ], + "{http://purl.org/dc/elements/1.1/}creator" : "Ray Gauss II", + "{http://www.alfresco.org/model/exif/1.0}fNumber" : "10.0", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownProvinceState" : "D.C.", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}Event" : "Photo Bike Tour", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}RegItemId" : [ "100-ABC-ABC-555", "11223344", "55667788" ], + "{http://ns.adobe.com/photoshop/1.0/}AuthorsPosition" : "DAM Architect", + "{http://ns.adobe.com/photoshop/1.0/}Credit" : "provider", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}MaxAvailWidth" : "5184", + "{http://purl.org/dc/elements/1.1/}title" : "Downstream", + "{http://www.alfresco.org/model/exif/1.0}software" : "Adobe Photoshop CS6 (Macintosh)", + "{http://ns.useplus.org/ldf/xmp/1.0/}PropertyReleaseID" : [ "prop release id 1", "prop release id 2" ], + "{http://www.alfresco.org/model/exif/1.0}manufacturer" : "Canon", + "{http://ns.adobe.com/photoshop/1.0/}Country" : "United States", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOCreator" : [ "Mother Nature", "Man", "Mother Nature" ], + "{http://ns.adobe.com/photoshop/1.0/}Instructions" : "instructions", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorName" : [ "Ray Gauss II", "GG" ], + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorURL" : "http://rgauss.com", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedSublocation" : "Rock Creek Park", + "{http://www.alfresco.org/model/exif/1.0}dateTimeOriginal" : "2011-08-13T14:40:51", + "{http://www.alfresco.org/model/content/1.0}description" : "A stream bank in Rock Creek Park Washington DC during a photo bike tour with ASPP DC/South chapter.", + "{http://www.alfresco.org/model/exif/1.0}flash" : "false", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrCity" : "Atlanta", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrCtry" : "US", + "{http://www.alfresco.org/model/content/1.0}title" : "Downstream", + "{http://ns.adobe.com/photoshop/1.0/}TransmissionReference" : "job identifier", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownSublocation" : [ "Rock Creek Park Sub", "Stream Section" ], + "{http://purl.org/dc/elements/1.1/}description" : "A stream bank in Rock Creek Park Washington DC during a photo bike tour with ASPP DC/South chapter.", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOSource" : "National Park Service", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}RegOrgId" : [ "PLUS", "ORG 2" ], + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOCopyrightNotice" : "Ray Gauss II", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AOSourceInvNo" : [ "123456", "654321" ], + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageCreatorName" : [ "Ray Gauss II", "GG" ], + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCountryName" : "United States", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCity" : "Washington", + "{http://ns.useplus.org/ldf/xmp/1.0/}CopyrightOwnerID" : "RGAUSS", + "{http://ns.adobe.com/photoshop/1.0/}Category" : "PrimaryCategory", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}OrganisationInImageName" : [ "ASPP", "Other Org" ], + "{http://www.alfresco.org/model/exif/1.0}model" : "Canon EOS 60D", + "{http://ns.adobe.com/photoshop/1.0/}SupplementalCategories" : [ "category1", "category2" ], + "{http://www.alfresco.org/model/exif/1.0}pixelXDimension" : "103", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}Scene" : [ "iptc scene 1", "iptc scene 2" ], + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrExtadr" : "1234 Some Road", + "{http://ns.adobe.com/photoshop/1.0/}Headline" : "Rock Creek Park", + "{http://ns.useplus.org/ldf/xmp/1.0/}MinorModelAgeDisclosure" : "Age Unknown", + "{http://ns.useplus.org/ldf/xmp/1.0/}Version" : "1.2.0", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}AddlModelInfo" : "rocky 1 and rocky 2 are big", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownWorldRegion" : "North America", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageCreatorID" : "RGAUSS", + "{http://purl.org/dc/elements/1.1/}subject" : [ "bank", "park", "rock creek", "stream", "washington" ], + "{http://www.alfresco.org/model/exif/1.0}pixelYDimension" : "69", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedCity" : "Washington", + "{http://ns.useplus.org/ldf/xmp/1.0/}ImageSupplierImageID" : "supplier image ID", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationCreatedWorldRegion" : "North America", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorTelephone1" : "555-5555", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorTelephone2" : "555-4444", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiAdrPcode" : "30339", + "{http://ns.useplus.org/ldf/xmp/1.0/}PropertyReleaseStatus" : "Not Applicable", + "{http://ns.useplus.org/ldf/xmp/1.0/}LicensorID" : "RGAUSS", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiEmailWork" : "info@alfresco.com.other@example.com", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}PersonInImage" : [ "rocky 1", "rocky 2" ], + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CountryCode" : "US", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}IntellectualGenre" : "intellectual genre", + "{http://purl.org/dc/elements/1.1/}rights" : "© Ray Gauss II", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}LocationShownCountryCode" : "US", + "{http://iptc.org/std/Iptc4xmpExt/2008-02-29/}MaxAvailHeight" : "3456", + "{http://www.alfresco.org/model/content/1.0}author" : "Ray Gauss II", + "{http://ns.adobe.com/xap/1.0/rights/}UsageTerms" : "rights usage terms", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}Location" : "Rock Creek Park", + "{http://www.alfresco.org/model/exif/1.0}resolutionUnit" : "Inch", + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiUrlWork" : "http://alfresco.com.http://example.com" } \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/IPTCMetadataExtractor_metadata_extract.properties b/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/IPTCMetadataExtractor_metadata_extract.properties index 3c47c479..8959ff0c 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/IPTCMetadataExtractor_metadata_extract.properties +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/IPTCMetadataExtractor_metadata_extract.properties @@ -50,7 +50,7 @@ XMP-dc\:Subject=dc:subject XMP-dc\:Creator=dc:creator XMP-dc\:Rights=dc:rights XMP-dc\:Title=dc:title -XMP-iptcCore\:CountryCode=Iptc4xmpCore:CiAdrCtry +XMP-iptcCore\:CreatorCountry=Iptc4xmpCore:CiAdrCtry XMP-iptcCore\:CountryCode=Iptc4xmpCore:CountryCode XMP-iptcCore\:CreatorAddress=Iptc4xmpCore:CiAdrExtadr XMP-iptcCore\:CreatorCity=Iptc4xmpCore:CiAdrCity