You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2017/11/21 09:57:30 UTC
[1/2] celix-site git commit: Removes dummy celix site
Repository: celix-site
Updated Branches:
refs/heads/asf-site 606d66330 -> 017c8d6e5
Removes dummy celix site
Project: http://git-wip-us.apache.org/repos/asf/celix-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix-site/commit/f7ad2250
Tree: http://git-wip-us.apache.org/repos/asf/celix-site/tree/f7ad2250
Diff: http://git-wip-us.apache.org/repos/asf/celix-site/diff/f7ad2250
Branch: refs/heads/asf-site
Commit: f7ad2250ec088b2f2b680ff1f0284ff4cc5d996a
Parents: 606d663
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Tue Nov 21 10:53:50 2017 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Tue Nov 21 10:53:50 2017 +0100
----------------------------------------------------------------------
celix/documentation/fivetwoone | 12 ------------
celix/documentation/index.md | 14 --------------
celix/documentation/seventwozero | 11 -----------
celix/importFile | 3 ---
celix/nineeightfive | 10 ----------
site/contributing.html | 5 +++++
src/markdown/contributing.md | 5 +++++
7 files changed, 10 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix-site/blob/f7ad2250/celix/documentation/fivetwoone
----------------------------------------------------------------------
diff --git a/celix/documentation/fivetwoone b/celix/documentation/fivetwoone
deleted file mode 100644
index eaa2368..0000000
--- a/celix/documentation/fivetwoone
+++ /dev/null
@@ -1,12 +0,0 @@
-5219301821
-6303006203
-1263430953
-4935883803
-0102637600
-7505194602
-2796339423
-4947761104
-9227463176
-6586277484
-
-import goes here -->{{../importFile}}<--
http://git-wip-us.apache.org/repos/asf/celix-site/blob/f7ad2250/celix/documentation/index.md
----------------------------------------------------------------------
diff --git a/celix/documentation/index.md b/celix/documentation/index.md
deleted file mode 100644
index 450aa55..0000000
--- a/celix/documentation/index.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# tutorials!
-
-## zero
- ## indicate a new subject for the tutorials
-## one
- ### assume a link that goes to a tutorial file
-### [file one](seventwozero)
-
-## two
-### [file two](../nineeightfive)
-anything not a two or three # at the start will be ignored and is safe for decorating the file with for humans
-### [file three](fivetwoone)
-
-### [file error](nowhere/null)
http://git-wip-us.apache.org/repos/asf/celix-site/blob/f7ad2250/celix/documentation/seventwozero
----------------------------------------------------------------------
diff --git a/celix/documentation/seventwozero b/celix/documentation/seventwozero
deleted file mode 100644
index 9c5da8d..0000000
--- a/celix/documentation/seventwozero
+++ /dev/null
@@ -1,11 +0,0 @@
-7201137810
-0695196903
-4089252324
-2615683913
-2876375644
-8833326889
-8461877408
-8404623018
-8598155875
-5642188315
-())( (../nineeightfive)
http://git-wip-us.apache.org/repos/asf/celix-site/blob/f7ad2250/celix/importFile
----------------------------------------------------------------------
diff --git a/celix/importFile b/celix/importFile
deleted file mode 100644
index 7e51018..0000000
--- a/celix/importFile
+++ /dev/null
@@ -1,3 +0,0 @@
-This file is an
-import that should
-be added to fivetwoone.
http://git-wip-us.apache.org/repos/asf/celix-site/blob/f7ad2250/celix/nineeightfive
----------------------------------------------------------------------
diff --git a/celix/nineeightfive b/celix/nineeightfive
deleted file mode 100644
index 73c6a37..0000000
--- a/celix/nineeightfive
+++ /dev/null
@@ -1,10 +0,0 @@
-9850725190
-1310091520
-0352099381
-0290604767
-2571780305
-1226475242
-6721917498
-3531134108
-9900495239
-8726050685
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/celix-site/blob/f7ad2250/site/contributing.html
----------------------------------------------------------------------
diff --git a/site/contributing.html b/site/contributing.html
index a1c5854..684dc18 100644
--- a/site/contributing.html
+++ b/site/contributing.html
@@ -97,6 +97,11 @@
<img id="APsmall" class="logoAP shadowed" src="/media/Apache_Feather.svg">
</a>
<div class="spacer">
+<p><!--
+Meta-Name: Name
+-->
+<? instruction ?></p>
+
<h1>Contributing</h1>
<p>The Celix community is open for everyone to participate in. Discussions are done over the
http://git-wip-us.apache.org/repos/asf/celix-site/blob/f7ad2250/src/markdown/contributing.md
----------------------------------------------------------------------
diff --git a/src/markdown/contributing.md b/src/markdown/contributing.md
index 980897f..a911993 100644
--- a/src/markdown/contributing.md
+++ b/src/markdown/contributing.md
@@ -1,3 +1,8 @@
+<!--
+Meta-Name: Name
+-->
+<? instruction ?>
+
# Contributing
The Celix community is open for everyone to participate in. Discussions are done over the
[2/2] celix-site git commit: Adds celix src as submodule and updates
build.py to use a other 'index' page
Posted by pn...@apache.org.
Adds celix src as submodule and updates build.py to use a other 'index' page
Project: http://git-wip-us.apache.org/repos/asf/celix-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix-site/commit/017c8d6e
Tree: http://git-wip-us.apache.org/repos/asf/celix-site/tree/017c8d6e
Diff: http://git-wip-us.apache.org/repos/asf/celix-site/diff/017c8d6e
Branch: refs/heads/asf-site
Commit: 017c8d6e5897ada0cc5a46a8acadd8418c6e4260
Parents: f7ad225
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Tue Nov 21 10:57:19 2017 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Tue Nov 21 10:57:19 2017 +0100
----------------------------------------------------------------------
.gitmodules | 3 +
build.py | 4 +-
celix | 1 +
site/doc/one/file_one.html | 116 ------------------------------------
site/doc/two/file_three.html | 120 --------------------------------------
site/doc/two/file_two.html | 115 ------------------------------------
6 files changed, 6 insertions(+), 353 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix-site/blob/017c8d6e/.gitmodules
----------------------------------------------------------------------
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0e2e52d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "celix"]
+ path = celix
+ url = git://git.apache.org/celix.git
http://git-wip-us.apache.org/repos/asf/celix-site/blob/017c8d6e/build.py
----------------------------------------------------------------------
diff --git a/build.py b/build.py
index 8edd238..5bb0238 100755
--- a/build.py
+++ b/build.py
@@ -27,7 +27,7 @@ markdown = 'src/markdown'
copy = 'src/noprocess'
snippets = 'src'
out = 'site'
-celixIndex = 'celix/documentation'
+celixIndex = 'celix/documents/intro/readme.md'
ref = {}
#combines two paths to files from a common root directory
@@ -57,7 +57,7 @@ for f in os.listdir(markdown):
ref[markdown + '/' + f] = f[:-3] + '.html'
#read index document
-with open(celixIndex + '/index.md') as f:
+with open(celixIndex) as f:
for line in f:
if(line[0] is '#' and line[1] is '#'):
if(line[2] != '#'):
http://git-wip-us.apache.org/repos/asf/celix-site/blob/017c8d6e/celix
----------------------------------------------------------------------
diff --git a/celix b/celix
new file mode 160000
index 0000000..95c06ab
--- /dev/null
+++ b/celix
@@ -0,0 +1 @@
+Subproject commit 95c06ab789fa82e8dbeccbad0324ec5d44437960
http://git-wip-us.apache.org/repos/asf/celix-site/blob/017c8d6e/site/doc/one/file_one.html
----------------------------------------------------------------------
diff --git a/site/doc/one/file_one.html b/site/doc/one/file_one.html
deleted file mode 100644
index 132b8ac..0000000
--- a/site/doc/one/file_one.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<!--
- 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.
--->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link href="/import/style.css" rel="stylesheet">
-<!--page info-->
-<title>Welcome to Apache Celix</title>
-<meta name="description" content="">
-<meta name="author" content="me">
-</head>
-<body>
-<div id="imgbackground"></div>
-<nav class = "shadowed">
- <a href="/"><img class="shadowed" src="/media/celix.png"></a>
- <div id="mobmenu">
- <select class="mobbutton" onchange="if (this.value) window.location.href=this.value">
- <option value="">navigate</option>
- <option value="/">Home</option>
- <option value="">Documentation</option>
- <option value="/downloads.html">Downloads</option>
- <optgroup label="Community">
- <option value="/contributing.html">Contributing</option>
- <option value="/boardreports.html">Board Reports</option>
- <option value="/releasing.html">Releasing</option>
- </optgroup>
- <optgroup label="Support">
- <option value="/mailinglist.html">Mailing List</option>
- <option value="/issuetracking.html">Issue Tracking</option>
- </optgroup>
- <optgroup label="ASF">
- <option value="http://www.apache.org/">ASF Home</option>
- <option value="http://www.apache.org/foundation/how-it-works.html">How it works</option>
- <option value="http://www.apache.org/licenses/">License</option>
- <option value="http://www.apache.org/foundation/sponsorship.html">Sponsorship</option>
- <option value="http://www.apache.org/foundation/thanks.html">Thanks</option>
- <option value="http://www.apache.org/security">Security</option>
- </optgroup>
- </select>
- <div id="dropmenu" class="shadowed">
- <a href="/"><div class="dropbutton">
- Home
- </div></a><a href=""><div class="dropbutton">
- Documentation
- </div></a><a href="/downloads.html"><div class="dropbutton">
- Download
- </div></a><div class="dropdown">
- <div class="dropbutton">Community<div class="triangle"></div></div>
- <div class="dropdown-content">
- <a href="/contributing.html">Contributing</a>
- <a href="/boardreports.html">Board Reports</a>
- <a href="/releasing.html">Releasing</a>
- </div>
- </div><div class="dropdown">
- <div class="dropbutton">Support<div class="triangle"></div></div>
- <div class="dropdown-content">
- <a href="/mailinglist.html">Mailing List</a>
- <a href="/issuetracking.html">Issue Tracking</a>
- </div>
- </div><div class="dropdown">
- <div class="dropbutton">ASF<div class="triangle"></div></div>
- <div class="dropdown-content">
- <a href="http://www.apache.org/">ASF Home</a>
- <a href="http://www.apache.org/foundation/how-it-works.html">How it works</a>
- <a href="http://www.apache.org/licenses/">License</a>
- <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
- <a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
- <a href="http://www.apache.org/security">Security</a>
- </div>
- </div>
- </div>
- </div>
-</nav>
-<a href="https://github.com/apache/celix">
- <img class="GHImg shadowed" src="/media/forkmeongithub.png" alt="Fork me on GitHub"
- data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_left_orange_ff7600.png">
- <img class="GHImgSmall shadowed" src="/media/forkmesmall.png" alt="Fork me on GitHub">
-</a>
-<a href="http://apache.org/">
- <img id="APbig" class="logoAP shadowed" src="/media/Apache_full.svg">
- <img id="APsmall" class="logoAP shadowed" src="/media/Apache_Feather.svg">
-</a>
-<div class="spacer">
-<p>7201137810
-0695196903
-4089252324
-2615683913
-2876375644
-8833326889
-8461877408
-8404623018
-8598155875
-5642188315
-())( (../two/file_two.html)</p>
-</div><div id="foot">
-<div id="footText">
-Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
-Apache Celix, Celix, Apache, the Apache feather logo and the Apache Celix logo are trademarks of The Apache Software Foundation.
-</div></div>
-<script src='import/javascript.js'></script>
http://git-wip-us.apache.org/repos/asf/celix-site/blob/017c8d6e/site/doc/two/file_three.html
----------------------------------------------------------------------
diff --git a/site/doc/two/file_three.html b/site/doc/two/file_three.html
deleted file mode 100644
index 22b6232..0000000
--- a/site/doc/two/file_three.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<!--
- 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.
--->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link href="/import/style.css" rel="stylesheet">
-<!--page info-->
-<title>Welcome to Apache Celix</title>
-<meta name="description" content="">
-<meta name="author" content="me">
-</head>
-<body>
-<div id="imgbackground"></div>
-<nav class = "shadowed">
- <a href="/"><img class="shadowed" src="/media/celix.png"></a>
- <div id="mobmenu">
- <select class="mobbutton" onchange="if (this.value) window.location.href=this.value">
- <option value="">navigate</option>
- <option value="/">Home</option>
- <option value="">Documentation</option>
- <option value="/downloads.html">Downloads</option>
- <optgroup label="Community">
- <option value="/contributing.html">Contributing</option>
- <option value="/boardreports.html">Board Reports</option>
- <option value="/releasing.html">Releasing</option>
- </optgroup>
- <optgroup label="Support">
- <option value="/mailinglist.html">Mailing List</option>
- <option value="/issuetracking.html">Issue Tracking</option>
- </optgroup>
- <optgroup label="ASF">
- <option value="http://www.apache.org/">ASF Home</option>
- <option value="http://www.apache.org/foundation/how-it-works.html">How it works</option>
- <option value="http://www.apache.org/licenses/">License</option>
- <option value="http://www.apache.org/foundation/sponsorship.html">Sponsorship</option>
- <option value="http://www.apache.org/foundation/thanks.html">Thanks</option>
- <option value="http://www.apache.org/security">Security</option>
- </optgroup>
- </select>
- <div id="dropmenu" class="shadowed">
- <a href="/"><div class="dropbutton">
- Home
- </div></a><a href=""><div class="dropbutton">
- Documentation
- </div></a><a href="/downloads.html"><div class="dropbutton">
- Download
- </div></a><div class="dropdown">
- <div class="dropbutton">Community<div class="triangle"></div></div>
- <div class="dropdown-content">
- <a href="/contributing.html">Contributing</a>
- <a href="/boardreports.html">Board Reports</a>
- <a href="/releasing.html">Releasing</a>
- </div>
- </div><div class="dropdown">
- <div class="dropbutton">Support<div class="triangle"></div></div>
- <div class="dropdown-content">
- <a href="/mailinglist.html">Mailing List</a>
- <a href="/issuetracking.html">Issue Tracking</a>
- </div>
- </div><div class="dropdown">
- <div class="dropbutton">ASF<div class="triangle"></div></div>
- <div class="dropdown-content">
- <a href="http://www.apache.org/">ASF Home</a>
- <a href="http://www.apache.org/foundation/how-it-works.html">How it works</a>
- <a href="http://www.apache.org/licenses/">License</a>
- <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
- <a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
- <a href="http://www.apache.org/security">Security</a>
- </div>
- </div>
- </div>
- </div>
-</nav>
-<a href="https://github.com/apache/celix">
- <img class="GHImg shadowed" src="/media/forkmeongithub.png" alt="Fork me on GitHub"
- data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_left_orange_ff7600.png">
- <img class="GHImgSmall shadowed" src="/media/forkmesmall.png" alt="Fork me on GitHub">
-</a>
-<a href="http://apache.org/">
- <img id="APbig" class="logoAP shadowed" src="/media/Apache_full.svg">
- <img id="APsmall" class="logoAP shadowed" src="/media/Apache_Feather.svg">
-</a>
-<div class="spacer">
-<p>5219301821
-6303006203
-1263430953
-4935883803
-0102637600
-7505194602
-2796339423
-4947761104
-9227463176
-6586277484</p>
-
-<p>import goes here -->This file is an
-import that should
-be added to fivetwoone.
-<--</p>
-</div><div id="foot">
-<div id="footText">
-Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
-Apache Celix, Celix, Apache, the Apache feather logo and the Apache Celix logo are trademarks of The Apache Software Foundation.
-</div></div>
-<script src='import/javascript.js'></script>
http://git-wip-us.apache.org/repos/asf/celix-site/blob/017c8d6e/site/doc/two/file_two.html
----------------------------------------------------------------------
diff --git a/site/doc/two/file_two.html b/site/doc/two/file_two.html
deleted file mode 100644
index f226ed8..0000000
--- a/site/doc/two/file_two.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<!--
- 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.
--->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link href="/import/style.css" rel="stylesheet">
-<!--page info-->
-<title>Welcome to Apache Celix</title>
-<meta name="description" content="">
-<meta name="author" content="me">
-</head>
-<body>
-<div id="imgbackground"></div>
-<nav class = "shadowed">
- <a href="/"><img class="shadowed" src="/media/celix.png"></a>
- <div id="mobmenu">
- <select class="mobbutton" onchange="if (this.value) window.location.href=this.value">
- <option value="">navigate</option>
- <option value="/">Home</option>
- <option value="">Documentation</option>
- <option value="/downloads.html">Downloads</option>
- <optgroup label="Community">
- <option value="/contributing.html">Contributing</option>
- <option value="/boardreports.html">Board Reports</option>
- <option value="/releasing.html">Releasing</option>
- </optgroup>
- <optgroup label="Support">
- <option value="/mailinglist.html">Mailing List</option>
- <option value="/issuetracking.html">Issue Tracking</option>
- </optgroup>
- <optgroup label="ASF">
- <option value="http://www.apache.org/">ASF Home</option>
- <option value="http://www.apache.org/foundation/how-it-works.html">How it works</option>
- <option value="http://www.apache.org/licenses/">License</option>
- <option value="http://www.apache.org/foundation/sponsorship.html">Sponsorship</option>
- <option value="http://www.apache.org/foundation/thanks.html">Thanks</option>
- <option value="http://www.apache.org/security">Security</option>
- </optgroup>
- </select>
- <div id="dropmenu" class="shadowed">
- <a href="/"><div class="dropbutton">
- Home
- </div></a><a href=""><div class="dropbutton">
- Documentation
- </div></a><a href="/downloads.html"><div class="dropbutton">
- Download
- </div></a><div class="dropdown">
- <div class="dropbutton">Community<div class="triangle"></div></div>
- <div class="dropdown-content">
- <a href="/contributing.html">Contributing</a>
- <a href="/boardreports.html">Board Reports</a>
- <a href="/releasing.html">Releasing</a>
- </div>
- </div><div class="dropdown">
- <div class="dropbutton">Support<div class="triangle"></div></div>
- <div class="dropdown-content">
- <a href="/mailinglist.html">Mailing List</a>
- <a href="/issuetracking.html">Issue Tracking</a>
- </div>
- </div><div class="dropdown">
- <div class="dropbutton">ASF<div class="triangle"></div></div>
- <div class="dropdown-content">
- <a href="http://www.apache.org/">ASF Home</a>
- <a href="http://www.apache.org/foundation/how-it-works.html">How it works</a>
- <a href="http://www.apache.org/licenses/">License</a>
- <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
- <a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
- <a href="http://www.apache.org/security">Security</a>
- </div>
- </div>
- </div>
- </div>
-</nav>
-<a href="https://github.com/apache/celix">
- <img class="GHImg shadowed" src="/media/forkmeongithub.png" alt="Fork me on GitHub"
- data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_left_orange_ff7600.png">
- <img class="GHImgSmall shadowed" src="/media/forkmesmall.png" alt="Fork me on GitHub">
-</a>
-<a href="http://apache.org/">
- <img id="APbig" class="logoAP shadowed" src="/media/Apache_full.svg">
- <img id="APsmall" class="logoAP shadowed" src="/media/Apache_Feather.svg">
-</a>
-<div class="spacer">
-<p>9850725190
-1310091520
-0352099381
-0290604767
-2571780305
-1226475242
-6721917498
-3531134108
-9900495239
-8726050685</p>
-</div><div id="foot">
-<div id="footText">
-Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
-Apache Celix, Celix, Apache, the Apache feather logo and the Apache Celix logo are trademarks of The Apache Software Foundation.
-</div></div>
-<script src='import/javascript.js'></script>