You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/07/15 04:02:10 UTC
[1/2] oodt git commit: fix for OODT-775 contributed by Lewis John
McGibbney.
Repository: oodt
Updated Branches:
refs/heads/master 1b42cacac -> 9b7a5e438
fix for OODT-775 contributed by Lewis John McGibbney.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/2445f703
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/2445f703
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/2445f703
Branch: refs/heads/master
Commit: 2445f7036b64f08451a3423dd9481f5265bdb9f8
Parents: 1b42cac
Author: Chris Mattmann <ma...@apache.org>
Authored: Fri Jul 14 21:01:36 2017 -0700
Committer: Chris Mattmann <ma...@apache.org>
Committed: Fri Jul 14 21:01:36 2017 -0700
----------------------------------------------------------------------
.../src/main/resources/policy/mimetypes.xsd | 71 ++++++++++++++++++++
1 file changed, 71 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/2445f703/pushpull/src/main/resources/policy/mimetypes.xsd
----------------------------------------------------------------------
diff --git a/pushpull/src/main/resources/policy/mimetypes.xsd b/pushpull/src/main/resources/policy/mimetypes.xsd
new file mode 100644
index 0000000..4b795e2
--- /dev/null
+++ b/pushpull/src/main/resources/policy/mimetypes.xsd
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://oodt.apache.org/schema/pushpull/mimetypes.xsd"
+ targetNamespace="http://oodt.apache.org/schema/pushpull/mimetypes.xsd"
+ elementFormDefault="qualified" vc:minVersion="1.1"
+ xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning">
+ <xs:annotation>
+ <xs:documentation>
+ This schema defines how mimetypes.xml file entries should be
+ structured within the context of the OODT pushpull component.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:element name="mime-info">
+ <xs:annotation>
+ <xs:documentation>
+ mime-info is the root element containing one or more 'mime-type'.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="mime-type">
+ <xs:annotation>
+ <xs:documentation>
+ There can be an unbounded number of 'mime-type' elements each containing
+ zero or more 'sub-class-of' and 'glob' children but only one 'comment'
+ child.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:all>
+ <xs:element maxOccurs="unbounded" name="sub-class-of">
+ <xs:complexType>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="_comment"/>
+ <xs:element maxOccurs="unbounded" name="glob">
+ <xs:annotation>
+ <xs:documentation>
+
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="pattern" type="xs:string"/>
+ <xs:attribute name="isRegex" type="xs:boolean"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:all>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
[2/2] oodt git commit: fix for OODT-775 contributed by Lewis John
McGibbney.
Posted by ma...@apache.org.
fix for OODT-775 contributed by Lewis John McGibbney.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/9b7a5e43
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/9b7a5e43
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/9b7a5e43
Branch: refs/heads/master
Commit: 9b7a5e43888fa2b7e1d084ccb69ccf82fc3f7832
Parents: 2445f70
Author: Chris Mattmann <ma...@apache.org>
Authored: Fri Jul 14 21:02:04 2017 -0700
Committer: Chris Mattmann <ma...@apache.org>
Committed: Fri Jul 14 21:02:04 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/9b7a5e43/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 42de68c..74e2e82 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@ Apache OODT Change Log
Release 1.1 - Current Development
+* OODT-775 XSD's for pushpull's mimetypes.xml (Lewis John McGibbney via mattmann)
+
* OODT-847 New FilemgrMetExtractor to extract File System Attributes (Aditya Dhulipala, rverma via mattmann)
* OODT-948 Fix dockerfile (magicaltrout/R B Krishna)