You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/11/28 00:38:26 UTC
[1/2] git commit: ACCUMULO-1943 Replace module.xsd in the test jar so
randomwalk has access to it.
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 40a007a2d -> 387fcfbe8
ACCUMULO-1943 Replace module.xsd in the test jar so randomwalk has access to it.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d886974
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d886974
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d886974
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7d886974d066a65830e4203cddc91f973da75725
Parents: 4be3d66
Author: Josh Elser <el...@apache.org>
Authored: Wed Nov 27 18:37:12 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 27 18:37:12 2013 -0500
----------------------------------------------------------------------
test/src/main/resources/randomwalk/module.xsd | 69 ++++++++++++++++++++++
test/src/test/resources/randomwalk/module.xsd | 69 ----------------------
2 files changed, 69 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d886974/test/src/main/resources/randomwalk/module.xsd
----------------------------------------------------------------------
diff --git a/test/src/main/resources/randomwalk/module.xsd b/test/src/main/resources/randomwalk/module.xsd
new file mode 100644
index 0000000..bcdaaae0
--- /dev/null
+++ b/test/src/main/resources/randomwalk/module.xsd
@@ -0,0 +1,69 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<!--
+ 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.
+-->
+
+ <xsd:element name="module" type="ModuleType"/>
+
+ <xsd:complexType name="ModuleType">
+ <xsd:sequence>
+ <xsd:element name="package" type="PrefixType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="fixture" type="InitType" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="init" type="InitType"/>
+ <xsd:element name="node" type="NodeType" minOccurs="1" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="PrefixType">
+ <xsd:attribute name="prefix" type="xsd:string"/>
+ <xsd:attribute name="value" type="xsd:string"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="InitType">
+ <xsd:attribute name="id" type="xsd:string"/>
+ <xsd:attribute name="maxHops" type="xsd:nonNegativeInteger"/>
+ <xsd:attribute name="maxSec" type="xsd:nonNegativeInteger"/>
+ <xsd:attribute name="teardown" type="xsd:boolean"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="NodeType">
+ <xsd:sequence>
+ <xsd:element name="alias" type="AliasType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="property" type="PropertyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="edge" type="EdgeType" minOccurs="1" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:string"/>
+ <xsd:attribute name="src" type="xsd:string"/>
+ <xsd:attribute name="maxHops" type="xsd:nonNegativeInteger"/>
+ <xsd:attribute name="maxSec" type="xsd:nonNegativeInteger"/>
+ <xsd:attribute name="teardown" type="xsd:boolean"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="EdgeType">
+ <xsd:attribute name="id" type="xsd:string"/>
+ <xsd:attribute name="weight" type="xsd:positiveInteger"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="AliasType">
+ <xsd:attribute name="name" type="xsd:string"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="PropertyType">
+ <xsd:attribute name="key" type="xsd:string"/>
+ <xsd:attribute name="value" type="xsd:string"/>
+ </xsd:complexType>
+
+</xsd:schema>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d886974/test/src/test/resources/randomwalk/module.xsd
----------------------------------------------------------------------
diff --git a/test/src/test/resources/randomwalk/module.xsd b/test/src/test/resources/randomwalk/module.xsd
deleted file mode 100644
index bcdaaae0..0000000
--- a/test/src/test/resources/randomwalk/module.xsd
+++ /dev/null
@@ -1,69 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--
- 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.
--->
-
- <xsd:element name="module" type="ModuleType"/>
-
- <xsd:complexType name="ModuleType">
- <xsd:sequence>
- <xsd:element name="package" type="PrefixType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="fixture" type="InitType" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="init" type="InitType"/>
- <xsd:element name="node" type="NodeType" minOccurs="1" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="PrefixType">
- <xsd:attribute name="prefix" type="xsd:string"/>
- <xsd:attribute name="value" type="xsd:string"/>
- </xsd:complexType>
-
- <xsd:complexType name="InitType">
- <xsd:attribute name="id" type="xsd:string"/>
- <xsd:attribute name="maxHops" type="xsd:nonNegativeInteger"/>
- <xsd:attribute name="maxSec" type="xsd:nonNegativeInteger"/>
- <xsd:attribute name="teardown" type="xsd:boolean"/>
- </xsd:complexType>
-
- <xsd:complexType name="NodeType">
- <xsd:sequence>
- <xsd:element name="alias" type="AliasType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="property" type="PropertyType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="edge" type="EdgeType" minOccurs="1" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- <xsd:attribute name="src" type="xsd:string"/>
- <xsd:attribute name="maxHops" type="xsd:nonNegativeInteger"/>
- <xsd:attribute name="maxSec" type="xsd:nonNegativeInteger"/>
- <xsd:attribute name="teardown" type="xsd:boolean"/>
- </xsd:complexType>
-
- <xsd:complexType name="EdgeType">
- <xsd:attribute name="id" type="xsd:string"/>
- <xsd:attribute name="weight" type="xsd:positiveInteger"/>
- </xsd:complexType>
-
- <xsd:complexType name="AliasType">
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
-
- <xsd:complexType name="PropertyType">
- <xsd:attribute name="key" type="xsd:string"/>
- <xsd:attribute name="value" type="xsd:string"/>
- </xsd:complexType>
-
-</xsd:schema>
[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/387fcfbe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/387fcfbe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/387fcfbe
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 387fcfbe8766877056fceecc201ad6f3c87653ea
Parents: 40a007a 7d88697
Author: Josh Elser <el...@apache.org>
Authored: Wed Nov 27 18:38:05 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 27 18:38:05 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------