You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2017/05/30 22:06:17 UTC
[1/3] geode-site git commit: GEODE-2975: Change the location of the
lucene xsd
Repository: geode-site
Updated Branches:
refs/heads/master 916e8e9d0 -> 96cfb0b83
GEODE-2975: Change the location of the lucene xsd
The lucene xsd was not in the correct location on the website.
Also, fixing the website generation so that it copies the xsds to the
output directory.
Project: http://git-wip-us.apache.org/repos/asf/geode-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-site/commit/0f96bc1b
Tree: http://git-wip-us.apache.org/repos/asf/geode-site/tree/0f96bc1b
Diff: http://git-wip-us.apache.org/repos/asf/geode-site/diff/0f96bc1b
Branch: refs/heads/master
Commit: 0f96bc1b520f7442f513e2849be418b62a0b9d47
Parents: 916e8e9
Author: Dan Smith <up...@apache.org>
Authored: Tue May 30 10:24:35 2017 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue May 30 10:24:35 2017 -0700
----------------------------------------------------------------------
website/Rules | 2 +-
website/content/schema/cache/lucene-1.0.xsd | 58 -----------------------
website/content/schema/lucene/lucene-1.0.xsd | 58 +++++++++++++++++++++++
website/nanoc.yaml | 2 +-
4 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-site/blob/0f96bc1b/website/Rules
----------------------------------------------------------------------
diff --git a/website/Rules b/website/Rules
index a7f4de1..57abf41 100644
--- a/website/Rules
+++ b/website/Rules
@@ -30,7 +30,7 @@
# item, use the pattern “/about/*/”; “/about/*” will also select the parent,
# because “*” matches zero or more characters.
-passthrough /\/(bootstrap|css|font|img|js|static|guide|fonts|images|javascripts|stylesheets|subnavs)\/.*/
+passthrough /\/(bootstrap|css|font|img|js|static|guide|fonts|images|javascripts|stylesheets|subnavs|schema)\/.*/
passthrough '/**/.htaccess'
compile '/docs/**/*' do
http://git-wip-us.apache.org/repos/asf/geode-site/blob/0f96bc1b/website/content/schema/cache/lucene-1.0.xsd
----------------------------------------------------------------------
diff --git a/website/content/schema/cache/lucene-1.0.xsd b/website/content/schema/cache/lucene-1.0.xsd
deleted file mode 100644
index ec82c2f..0000000
--- a/website/content/schema/cache/lucene-1.0.xsd
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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.
--->
-<xsd:schema
- targetNamespace="http://geode.apache.org/schema/lucene"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
-
- <xsd:import
- namespace="http://geode.apache.org/schema/cache"
- schemaLocation="http://geode.apache.org/schema/cache/cache-1.0.xsd"/>
-
- <xsd:annotation>
- <xsd:documentation><![CDATA[
-XML schema for Lucene indexes in Geode.
-
- <cache
- xmlns="http://geode.apache.org/schema/cache"
- xmlns:lucene="http://geode.apache.org/schema/lucene"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://geode.apache.org/schema/cache
- http://geode.apache.org/schema/cache/cache-1.0.xsd
- http://geode.apache.org/schema/lucene
- http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
- version="1.0">
-
- ]]></xsd:documentation>
- </xsd:annotation>
- <xsd:element name="index">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="field" maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="analyzer" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
http://git-wip-us.apache.org/repos/asf/geode-site/blob/0f96bc1b/website/content/schema/lucene/lucene-1.0.xsd
----------------------------------------------------------------------
diff --git a/website/content/schema/lucene/lucene-1.0.xsd b/website/content/schema/lucene/lucene-1.0.xsd
new file mode 100644
index 0000000..ec82c2f
--- /dev/null
+++ b/website/content/schema/lucene/lucene-1.0.xsd
@@ -0,0 +1,58 @@
+<?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.
+-->
+<xsd:schema
+ targetNamespace="http://geode.apache.org/schema/lucene"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <xsd:import
+ namespace="http://geode.apache.org/schema/cache"
+ schemaLocation="http://geode.apache.org/schema/cache/cache-1.0.xsd"/>
+
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+XML schema for Lucene indexes in Geode.
+
+ <cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ ]]></xsd:documentation>
+ </xsd:annotation>
+ <xsd:element name="index">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="field" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="analyzer" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
http://git-wip-us.apache.org/repos/asf/geode-site/blob/0f96bc1b/website/nanoc.yaml
----------------------------------------------------------------------
diff --git a/website/nanoc.yaml b/website/nanoc.yaml
index 42840be..a7e54c6 100644
--- a/website/nanoc.yaml
+++ b/website/nanoc.yaml
@@ -18,7 +18,7 @@
# A list of file extensions that nanoc will consider to be textual rather than
# binary. If an item with an extension not in this list is found, the file
# will be considered as binary.
-text_extensions: [ 'coffee', 'css', 'erb', 'haml', 'handlebars', 'hb', 'htm', 'html', 'js', 'less', 'markdown', 'md', 'ms', 'mustache', 'php', 'rb', 'sass', 'scss', 'txt', 'xhtml', 'xml' ]
+text_extensions: [ 'coffee', 'css', 'erb', 'haml', 'handlebars', 'hb', 'htm', 'html', 'js', 'less', 'markdown', 'md', 'ms', 'mustache', 'php', 'rb', 'sass', 'scss', 'txt', 'xhtml', 'xml', 'xsd' ]
# The path to the directory where all generated files will be written to. This
# can be an absolute path starting with a slash, but it can also be path
[2/3] geode-site git commit: Adding an assemble task for travis to
invoke
Posted by up...@apache.org.
Adding an assemble task for travis to invoke
Travis always invokes assemble for a gradle project, apparently.
Project: http://git-wip-us.apache.org/repos/asf/geode-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-site/commit/cd837fab
Tree: http://git-wip-us.apache.org/repos/asf/geode-site/tree/cd837fab
Diff: http://git-wip-us.apache.org/repos/asf/geode-site/diff/cd837fab
Branch: refs/heads/master
Commit: cd837fabec838f5cdd794bc02696288069a0969f
Parents: 916e8e9
Author: Dan Smith <up...@apache.org>
Authored: Tue May 30 11:22:59 2017 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue May 30 11:22:59 2017 -0700
----------------------------------------------------------------------
build.gradle | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-site/blob/cd837fab/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index a38a6b5..239bd4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -102,3 +102,7 @@ rat {
'website/layouts/**',
]
}
+
+task assemble {
+ description "Empty task for travis to call. Travis always invokes assemble"
+}
[3/3] geode-site git commit: Merge branch 'pr/6'
Posted by up...@apache.org.
Merge branch 'pr/6'
Project: http://git-wip-us.apache.org/repos/asf/geode-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-site/commit/96cfb0b8
Tree: http://git-wip-us.apache.org/repos/asf/geode-site/tree/96cfb0b8
Diff: http://git-wip-us.apache.org/repos/asf/geode-site/diff/96cfb0b8
Branch: refs/heads/master
Commit: 96cfb0b838e88b972e5fa4f8c13e56894c90e18c
Parents: 0f96bc1 cd837fa
Author: Dan Smith <up...@apache.org>
Authored: Tue May 30 14:27:52 2017 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue May 30 14:27:52 2017 -0700
----------------------------------------------------------------------
build.gradle | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------