celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [02/14] celix-site git commit: first version docTable
Date Thu, 07 Dec 2017 20:17:45 GMT
first version docTable


Project: http://git-wip-us.apache.org/repos/asf/celix-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix-site/commit/404ed818
Tree: http://git-wip-us.apache.org/repos/asf/celix-site/tree/404ed818
Diff: http://git-wip-us.apache.org/repos/asf/celix-site/diff/404ed818

Branch: refs/heads/asf-site
Commit: 404ed818ae7b800004ba3d4261e5a6242cd8d100
Parents: 606d663
Author: ESmink <edwin.smink@nl.thalesgroup.com>
Authored: Tue Nov 21 12:43:17 2017 +0100
Committer: ESmink <edwin.smink@nl.thalesgroup.com>
Committed: Tue Nov 21 12:43:17 2017 +0100

----------------------------------------------------------------------
 build.py                         |  29 +-
 celix/documentation/seventwozero |   2 +-
 site/boardreports.html           | 557 ----------------------------------
 site/community.html              | 121 --------
 site/contributing.html           | 113 -------
 site/doc/one/file_one.html       | 116 -------
 site/doc/two/file_three.html     | 120 --------
 site/doc/two/file_two.html       | 115 -------
 site/downloads.html              | 137 ---------
 site/import/style.css            |   8 +
 site/index.html                  | 136 ---------
 site/issuetracking.html          | 124 --------
 site/mailinglist.html            | 132 --------
 site/releasing.html              | 385 -----------------------
 site/support.html                | 116 -------
 src/noprocess/import/style.css   |   8 +
 src/top.html                     |   4 +-
 17 files changed, 45 insertions(+), 2178 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix-site/blob/404ed818/build.py
----------------------------------------------------------------------
diff --git a/build.py b/build.py
index 8edd238..e9bd8f2 100755
--- a/build.py
+++ b/build.py
@@ -55,16 +55,19 @@ if not os.path.exists(out):
 #register site markdown
 for f in os.listdir(markdown):
 	ref[markdown + '/' + f] = f[:-3] + '.html'
+ref[celixIndex + '/index.md'] = 'doc/index.html'
 
 #read index document
 with open(celixIndex + '/index.md') as f:
+	docT = '<div id=docTable><table>'
 	for line in f:
 		if(line[0] is '#' and line[1] is '#'):
 			if(line[2] != '#'):
 				# declares title
 				title = line[3:-1].replace(' ', '_')
+				docT += '\n\t<tr><th>' + title + '</th></tr>'
 			elif(line[3] != '#'):
-				# checks if directory exists
+				# checks if document declaration is valid
 				if 'title' not in globals():
 					sys.tracebacklimit = 0
 					raise NameError("A directory was declared before any title in the index.md file")
@@ -73,8 +76,26 @@ with open(celixIndex + '/index.md') as f:
 				# declares document
 				key = celixIndex + '/' + line[line.find('(') + 1:line.find(')')]
 				value = 'doc/' + title + '/' + line[line.find('[') + 1:line.find(']')]
-				value = value.replace(' ', '_')
-				ref[key] = value + '.html'
+				value = value.replace(' ', '_') + '.html'
+				# crash when declared document exists
+				if key in ref:
+					sys.tracebacklimit = 0
+					raise NameError('document "' + value + '" was defined multiple times')
+				# crash when files cant be reached
+				try:
+					with open(key) as n:
+						try:
+							with open(out + '/' + value, 'w') as n:
+								# add file to registry
+								ref[key] = value
+						except IOError:
+							sys.tracebacklimit = 0
+							raise IOError('coud not read to file "' + out + '/' + ref[key] + '"')
+				except IOError:
+					sys.tracebacklimit = 0
+					raise IOError('could not read file "' + key + '"')
+				docT += '\n\t<tr><td><a href=/' + value + '>' + value[5 + len(title):].replace('_', ' ')[:-5] + '</a></td></tr>'
+	docT += '\n</table></div>\n'
 
 # write documents
 for key in ref:
@@ -104,6 +125,8 @@ for key in ref:
 
 	# convert markdown to html, also add top and bottom html files
 	file = markdown2.markdown(file, extras=["markdown-in-html"])
+	if ref[key].startswith('doc/'):
+			file = docT + '<div id=docContent>\n' + file + '\n</div>'
 	with open(snippets + '/top.html') as top:
 		file = top.read() + file
 	with open(snippets + '/bottom.html') as bottom:

http://git-wip-us.apache.org/repos/asf/celix-site/blob/404ed818/celix/documentation/seventwozero
----------------------------------------------------------------------
diff --git a/celix/documentation/seventwozero b/celix/documentation/seventwozero
index 9c5da8d..6b68a81 100644
--- a/celix/documentation/seventwozero
+++ b/celix/documentation/seventwozero
@@ -8,4 +8,4 @@
 8404623018
 8598155875
 5642188315
-())( (../nineeightfive)
+())( to [file two](../nineeightfive)

http://git-wip-us.apache.org/repos/asf/celix-site/blob/404ed818/site/boardreports.html
----------------------------------------------------------------------
diff --git a/site/boardreports.html b/site/boardreports.html
deleted file mode 100644
index 212053a..0000000
--- a/site/boardreports.html
+++ /dev/null
@@ -1,557 +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">
-<h1>Board Reports</h1>
-
-<p>To monitor incubator project, the Apache Software Foundation board holds monthly meetings.
-For these meetings a board report must be delivered to the Incubator PMC.</p>
-
-<p>On this page the reports for Celix are shown.</p>
-
-<h2><a href="http://wiki.apache.org/incubator/October2013">2013-10</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an OSGi like implementation in C with a distinct focus on interoperability between Java and C.</p>
-
-<p>Celix has been incubating since 2010-11-02.</p>
-
-<p>Three most important issues to address in the move towards graduation:</p>
-
-<ol>
-<li>Grow the community</li>
-<li>Find more committers</li>
-<li>Publish a new release</li>
-</ol>
-
-<p>Any issues that the Incubator PMC (IPMC) or ASF Board wish/need to be
-aware of?</p>
-
-<p>None</p>
-
-<p>How has the community developed since the last report?</p>
-
-<p>Several new people are working on additional code for the project. One person is working on a GSoC project, someone else is working on a new remote services protocol and is actively communicating over the list and using jira to post patches. Overall this is an increase in activity. 
-The Native-OSGi project is still progressing, but rather slow. So there isn't anything new on that end. Celix is still the reference implementation, so I still expect this to be a great drive for Celix, for the code as well as the committers.</p>
-
-<p>How has the project developed since the last report?</p>
-
-<p>As mentioned above, a student is working on a GSoC project and has implemented an Event Admin which will be included in Celix. Also a additional Remote Services implementation based on shared memory is being made.
-Work for a new release is still ongoing, the focus is slightly changing, one of the main users has requested a release. Since they don't use Win32, Win32 support can be stripped from the release plan and postponed to a later release.</p>
-
-<p>Date of last release: </p>
-
-<ul>
-<li>16-12-2012</li>
-</ul>
-
-<p>When were the last committers or PMC members elected?</p>
-
-<ul>
-<li>2013-01-07 Roman Shaposhnik joins as a mentor.</li>
-<li>2012-03-20 Pepijn elected as committer.</li>
-</ul>
-
-<h2><a href="http://wiki.apache.org/incubator/July2013">2013-07</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an OSGi like implementation in C with a distinct focus on interoperability between Java and C.</p>
-
-<p>Celix has been incubating since 2010-11-02.</p>
-
-<p>Three most important issues to address in the move towards graduation:</p>
-
-<ol>
-<li>Grow the community</li>
-<li>Find more committers</li>
-<li>...</li>
-</ol>
-
-<p>Any issues that the Incubator PMC (IPMC) or ASF Board wish/need to be aware of?
-None.</p>
-
-<p>How has the community developed since the last report?
-Activity on the mailing list is still a bit slow, but there is still progress. But more importantly, the Native-OSGi effort has taken a few big steps. The most important one is the publication of an RFP at the OSGi Alliance [ 1 ]. The purpose of this RFP is to standardise OSGi for native (C and C++) languages. After the RFP is finalised work will be started on a RFC, this will be done in conjunction with writing a reference implementation. For this purpose Apache Celix will be used. This also means that C++ will be introduced in the Celix project. Most likely large parts of C++ code will be donated by 2 participants of the Native-OSGi project. This gives us a great opportunity to add extra committers and increase the diversity of Celix.</p>
-
-<p>How has the project developed since the last report?
-As mentioned above, to be able to write a reference implementation for Native-OSGi the scope of Celix will be extended to also include C++. Details of this extension still need to be worked out. But for continuity the current (C) code base will (for now) remain the same. So any work related to Native-OSGi will (for now) be done independently from the current implementation.
-Also work is underway to make a second release. Whereas the first release focused primarily on the releasing itself, this second release will focus on the actual implementation. Important points are:</p>
-
-<ul>
-<li>API consistency</li>
-<li>Win32 support</li>
-<li>APR usage</li>
-</ul>
-
-<p>More details can be found in [ 2 ]</p>
-
-<p>A (Mini) Hackathon for Apache Celix was organised at June the 30th. There where 4 people present on the hackathon (2 committers) and focus for the hackathon was the remote services implementation. The hackathon was received well and we like to do this more often to encourage community growth of Apache Celix.</p>
-
-<p>Apache Celix is now also involved the Google Summer of Code for 2013. Erik Jansman is doing a project on the Event Admin for Apache Celix and Pepijn Noltes is mentoring him. The idea is to discuss the result on the mailing list. This is a new experience for Apache Celix and we hope that helps the community and also provide technical progress.</p>
-
-<p>Date of last release: 
-16-12-2012</p>
-
-<p>[ 1 ] https://www.osgi.org/bugzilla/show_bug.cgi?id=165</p>
-
-<p>[ 2 ] http://incubator.markmail.org/thread/fza43iypjutcw2rm</p>
-
-<h2><a href="http://wiki.apache.org/incubator/April2013">2013-04</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an OSGi like implementation in C with a distinct focus on interoperability between Java and C.</p>
-
-<p>Celix has been incubating since 2010-11-02.</p>
-
-<p>Three most important issues to address in the move towards graduation:</p>
-
-<ol>
-<li>Grow a community</li>
-<li>Find more committers</li>
-<li>..</li>
-</ol>
-
-<p>Celix is maintained by 2 committers and a small group of users. Questions to the mailing list are (most of the time) answered quickly. We are also trying to give talks on Celix or related stuff on conferences.
-We see and recognise the problem of the small community, but are also confident that Celix and its community will grow. </p>
-
-<p>Any issues that the Incubator PMC (IPMC) or ASF Board wish/need to be aware of?
-None.</p>
-
-<p>How has the community developed since the last report?
-There is no active growth, but there is currently one students doing his intership with Apache Celix and we are trying hoping to get some projects in the Google Summer of Code 2013. We hope that this will lead in more activity on the mailing-list and hopefully to extra committers.</p>
-
-<p>How has the project developed since the last report?
-Technically progress has been slow the last months. There was a hackaton organized for remote services in Java [ 1 ], which although not directly related to Apache Celix, should eventually work together with the Apache Celix and as result the committers of Apache Celix where present. We also expect an increase in contributions the coming months because of the student intership / GSoC activities.</p>
-
-<p>[ 1 ] http://lists.amdatu.org/pipermail/dev/2013-March/000020.html</p>
-
-<h2><a href="http://wiki.apache.org/incubator/January2013">2013-01</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an OSGi like implementation in C with a distinct focus on interoperability between Java and C.</p>
-
-<p>Celix has been incubating since 2010-11-02.</p>
-
-<p>Three most important issues to address in the move towards graduation:</p>
-
-<ol>
-<li>Grow a community</li>
-<li>Find more committers</li>
-<li>..</li>
-</ol>
-
-<p>Celix is maintained by 2 committers and a small group of users. Questions to the mailing list are (most of the time) answered quickly. We are also trying to give talks on Celix or related stuff on conferences.
-We see and recognise the problem of the small community, but are also confident that Celix and its community will grow. Especially the Native-OSGi work might be important for this (see below).</p>
-
-<p>Any issues that the Incubator PMC (IPMC) or ASF Board wish/need to be aware of?
-None.</p>
-
-<p>How has the community developed since the last report?</p>
-
-<p>There is no active growth, but in the past few months talks have been given on Native-OSGi. Native-OSGi is an effort to standardise C/C++ implementations of OSGi. The goal of this is to be able to reuse bundles from other OSGi like implementations. Also working together might attract more users/committers. The talks are attended by a good group of people, and reactions are positive.</p>
-
-<p>How has the project developed since the last report?</p>
-
-<p>A first release has been made. After struggling with several problems, consensus has been reached to solve these in a next release.
-On a technical note, Celix now also compiles and runs on Win32 platforms.</p>
-
-<h2><a href="http://wiki.apache.org/incubator/October2012">2012-10</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C. </p>
-
-<p>Celix entered incubation on November 2, 2010. </p>
-
-<p>Over the last months we have focused on creating a first release for Celix.
-As is mentioned in the graduation plan [1] we hope that a release will create
-more community.
-We have prepared the code base and website for release and we are very close to making a release.</p>
-
-<p>The previous report [2] mentioned that we are working on a "Native-OSGi", which could attract more community.
-This discussion continued in Juli on the mailling, but got quiet after that. There will be a talk about Native-OSGi for ApacheCon EU and EclipseCon EU and we expect that this will create attention for Celix.</p>
-
-<ul>
-<li><p>Most important issues to address before we can graduate: 
-Make a first release, growing the community and attracting more committers.  </p></li>
-<li><p>Any issues the Incubator PMC or ASF board need to be aware of: 
-None at this time </p></li>
-<li><p>How has the community developed since the last report: 
-There has been a small decrease on activity on the mailing list, hopefully this is a temporary decrease due to the holidays. We did receive patches from a contributor. </p></li>
-<li><p>How has the project developed since the last report: 
-We are still working towards a first release. The code base has been prepared for release and the website got some attention
-based on the shepherd's view from last report. </p></li>
-</ul>
-
-<p>Signed off by mentor: marrs</p>
-
-<h2><a href="http://wiki.apache.org/incubator/July2012">2012-07</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C.</p>
-
-<p>Celix entered incubation on November 2, 2010.</p>
-
-<p>Over the last months we have started working on "Native-OSGi" which is an effort to make a specification for a C and C++ bases OSGi implementation. As detailed in the graduation plan [1] in the previous report we hope to attract more community members with this move.
-Details for Native-OSGi can be found at [2].</p>
-
-<p>Also the donation of the Device Access code has been finished and committed to the SVN repository. This has been a good experience from both a technical and a process point of view.</p>
-
-<p>Furthermore there has been a slight increase on the mailing list, hopefully this is a trend that will continue in the coming months.</p>
-
-<ul>
-<li><p>Most important issues to address before we can graduate</p>
-
-<p>Make a first release and grow a larger community. It is also needed to attract some more committers, there are currently 2. We are in the process of cleaning up the code and project structure so a first release can be made.</p></li>
-<li><p>Any issues the Incubator PMC or ASF board not te be aware of</p>
-
-<p>None at this time</p></li>
-<li><p>How has the community developed since the last report</p>
-
-<p>There has been an increase on the mailing list, furthermore with the start of the Native-OSGi project we hope this will increase in the coming months.</p></li>
-<li><p>How has the project developed since the last report </p>
-
-<p>From a technical point of view, we are working towards a first release. The build files have been updated to support a more modular project structure.
-Since the implementation is moving forward (al be it slowly), the community growth is the biggest concern for Celix.</p></li>
-</ul>
-
-<p>Signed off by mentor:</p>
-
-<p>Shepherd: Matt Franklin</p>
-
-<h2><a href="http://wiki.apache.org/incubator/April2012">2012-04</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C.</p>
-
-<p>Celix entered incubation on November 2, 2010.</p>
-
-<p>The last month we received or first large code donation, the code still has to be added to the project. This code is an implementation of the OSGi Device Access specification for Celix and has been made by Thales Netherlands. Together with this donation a new committer (Pepijn Noltes) is accepted. Pepijn has developed and will maintain the Device Access code.</p>
-
-<p>We have also been working on a graduation plan which is included below.</p>
-
-<p>Most important issues are:</p>
-
-<pre><code>Improve robustness (APR, error handling etc), resulting in a first release
-Update/Implement remote services for interoperability with Java OSGi (Apache Felix)
-Generate awareness and grow a community!
-</code></pre>
-
-<p>Graduation Plan</p>
-
-<p>Celix is in incubation since November 2010. During the first one and a half year talks where given at several conferences (EclipseCon, ApacheCon, OSGi User Group meetings, etc).
-Even though there seems to be an interest in the project, two important questions keep coming up:</p>
-
-<ul>
-<li>What is the state of the project?</li>
-<li>Why no support for C++?</li>
-</ul>
-
-<p>Trying to answer/solve these two questions might make it able to attract more community members. So this plan will focus mostly on these two items.</p>
-
-<p>= State of the project</p>
-
-<p>== Releases</p>
-
-<p>Celix entered incubation in its early stage. There was only a proof of concept, but no complete implementation. 
-This is an important reason for people to hold back and not yet use/improve Celix, on the other hand,  being hesitant also keeps Celix from growing towards a more stable/robust solution.
-To be able to use Celix the implementation has to reach, at least, a more stable state. Over the past year lots of effort has been put into this.
-Within the next half year a release has to be made of the core component of Celix. Hopefully this will attract more users/testers (and potentially committers).
-Since a formal release takes quite some effort, it might also make sense to provide snapshots (with documentation) to be able to reach more people.</p>
-
-<p>== Committers</p>
-
-<p>During the last months there has been an interest from Thales Netherlands to use Celix in its middleware. In a research project they are working on an implementation of the Device Access specification. This implementation is donated to Celix, and the main developer has expressed the intention to maintain the code base. Via this path a new committer has been added to Celix <a href="http://markmail.org/message/q4n7562jvngd33s5">1</a>.
-But to be able to have a diverse community more committers are needed.
-Having a release makes it easier for people to use and improve Celix. This is one step towards more committers.</p>
-
-<p>== Technical state</p>
-
-<p>One of the important aspects of Celix is interoperability with Java OSGi through remote services. Currently Celix has basic support for Celix to Celix remote services, following the Remote Service Admin specification of OSGi. This implementation has to be improved and extended to comply better to the specification. Also a Java OSGi implementation has to be made which can interact with the Celix implementation. Some existing opensource solutions are available, but are either to large for our intended target platforms or rely on to many other libraries (for example XML handling etc). To be able to have an implementation which fits the environment ((de)serialization and protocol) it makes sense to implement a simple solution ourselves.
-Having functional remote services makes it easier to use Celix in a mixed Java/C environment. This solution can also be positioned as an alternative to JNI with the benefit that the Java and C components are separate processes. If either one crashes the other part is kept running, resulting in a more robust solution.</p>
-
-<p>= C++ Support</p>
-
-<p>== Technical Scope</p>
-
-<p>Currently Celix is limited to C only. This was a deliberate choice since Celix tries to target  embedded/constrained platforms. But during talks people also seem to be interested in C++ support. Extending the technical scope of the project might attract more users and committers.
-Over the next half year we will work out a plan how C++ support can be added without impacting the current supported platforms. A start with the discussions has been made on the mailinglist, see [2] for more information.</p>
-
-<p>== Cooperate with existing C++ OSGi like implementations</p>
-
-<p>In [3] a list of similar projects is mentioned. Reaching out to these projects and trying to find a common ground on requirements/API etc could benefit Celix (and those projects as well). 
-To see if there is a common ground we need to contact those projects and plan a meeting.</p>
-
-<p>Signed off by mentor:</p>
-
-<h2><a href="http://wiki.apache.org/incubator/January2012">2012-01</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C.</p>
-
-<p>Celix entered incubation on November 2, 2010.</p>
-
-<p>Over the last few months lots of work has been put into integrating APR and updating the Celix code base to the proposed code style. This code style has partially been documented on [1]. Also some effort has been put into updating the source for Visual Studio, even though not yet finished some interesting and helpful patches where submitted and applied.</p>
-
-<p>In Oktober an event was held to create more awareness for services, OSGi and Celix in the Dutch embedded community. The attendance was great, and a follow-up will be planned. Also, in November a talk was given at the ApacheCon.</p>
-
-<p>As listed below, one of the most important issues is the slow growth of the Celix community. With the current discussion about poddlings and how long a poddling is in the incubator, we are discussing a plan how we can move to a more diverse community and be able to graduate. This plan will be included in the next board report.</p>
-
-<p>Most important issues are:</p>
-
-<pre><code>Improve robustness (APR, error handling etc), resulting in a first release
-Generate awareness and grow a community!
-</code></pre>
-
-<p>Signed off by mentor: marrs</p>
-
-<h2><a href="http://wiki.apache.org/incubator/October2011">2011-10</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C.</p>
-
-<p>Celix entered incubation on November 2, 2010.</p>
-
-<p>In the code not much has changed during the past few months, mostly due to vacations. Some (reported) bugs have been fixed, and some interesting examples have been added. These example where donated by a user, and follow the OSGi in Action book. This makes them a great addition to Celix.
-Furthermore, some work has been done to make testing from CMake easier, and we are also looking into a method for mocking services to be able to test only one service without all its dependencies.</p>
-
-<p>On the community site, Luminis and Thales are organizing an event (in Dutch) to introduce embedded/distributed companies to OSGi. During this event OSGi will be explained, Celix and PojoSR will be introduced. Also a small introduction in Apache and the "Apache Way" will be given, with the goal to invite people to use/join Celix.
-Also, in november a talk and demo will be given at the ApacheCon.</p>
-
-<p>Most important issues are:</p>
-
-<pre><code>Improve robustness (APR, error handling etc)
-Generate awareness and grow a community!
-</code></pre>
-
-<p>Signed off by mentor:</p>
-
-<h2><a href="http://wiki.apache.org/incubator/July2011">2011-07</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C.</p>
-
-<p>Celix entered incubation on November 2, 2010.</p>
-
-<p>Over the past few months work has been done on integration and usage of the Apache Portable Runtim (APR) in Celix.
-The work has mostly focusses on stability and robustness of the codebase, but some new features were added:</p>
-
-<pre><code>Log Service and Writer: for logging and reading the log
-Service Factories: needed for the log service
-</code></pre>
-
-<p>Also, in March, a talk was given to the OSGi User Group France. There is a lot interest in the project, but people seem to be waiting for a more stable version.
-For community building it might be interesting to work towards a release later this year to make it easier to download and use Celix.
-A talk on Celix has also been accepted for the ApacheCon in November, which is a good opportunity to show Celix to the world.
-Also parts of Celix have been ported to Windows. Mostly the utils used by the framework, and not yet the framework itself. This is a lengthy job because Celix is using C99, and Windows (Visual Studio) only support C89/C90.</p>
-
-<p>Most important issues are:</p>
-
-<pre><code>Improve robustness (APR, error handling etc)
-Generate awareness and grow a community!
-</code></pre>
-
-<p>Signed off by mentor:</p>
-
-<h2><a href="http://wiki.apache.org/incubator/April2011">2011-04</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C.</p>
-
-<p>Celix entered incubation on November 2, 2010.</p>
-
-<p>During the EclipseCon a talk was given over Celix, also spoke with several OSGi 
-people who are interested in the progress, especially related to Universal OSGi 
-(which details specification and requirements for OSGi in other languages).
-During the last few weeks work has been done to get rid of memory leaks and null 
-pointers.
-Currently we are looking at the requirements/details for bundle deployment and 
-updating, possibly in combination with Apache Ace.</p>
-
-<p>Most important issues are:</p>
-
-<pre><code>Define a status overview of what is and isn't working.
-Move all "sub" project to the new structure.
-Use APR for all file handling, threading etc.
-Generate awareness and grow a community
-</code></pre>
-
-<p>Signed off by mentor:</p>
-
-<h2><a href="http://wiki.apache.org/incubator/February2011">2011-02</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C.</p>
-
-<p>Celix entered incubation on November 2, 2010.</p>
-
-<p>A new structure for the project has been used for the framework. In this structure public and private files are 
-separated. This structure has not yet been applied to all "sub" project in Celix.
-We are also looking at Apache APR for OS abstraction. Using APR would involve replacing all file handing, threading 
-etc with APR functions.</p>
-
-<p>Finally, work is being done for the talk on the EclipseCon.</p>
-
-<p>Most important issues are:</p>
-
-<p>Add more information to the wiki (ongoing process)
-Move all "sub" project to the new structure.
-Use APR for all file handling, threading etc.</p>
-
-<p>Signed off by mentor:</p>
-
-<h2><a href="http://wiki.apache.org/incubator/January2011">2011-01</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C.</p>
-
-<p>Celix entered incubation on November 2, 2010.</p>
-
-<p>Currently the source tree is being cleaned and correct header information is being added. We are also looking at the 
-project structure and how it can be changed to get a better/simpler overview. Most important aspect is separating the 
-actual framework from the additional bundles.</p>
-
-<p>Additionally, last December a proposal for a Celix talk was sent to, and accepted by the EclipseCon/OSGi DevCon. This 
-provides a great opportunity to increase awareness and build a community.</p>
-
-<p>Most important issues are:</p>
-
-<pre><code>Add more information to the wiki (ongoing process)
-Cleanup project, rearrange structure
-Generate awareness and grow a community!
-</code></pre>
-
-<p>Signed off by mentor: marrs </p>
-
-<h2><a href="http://wiki.apache.org/incubator/December2010">2010-12</a></h2>
-
-<p>= Celix =</p>
-
-<p>Celix is an implementation of the OSGi Specification in C.</p>
-
-<p>Celix entered incubation on November 2, 2010.</p>
-
-<p>As we are just accepted into the Incubator, startup is in progress. The donated code has been committed to 
-SVN, and the project site is being created.</p>
-
-<p>Most important issues are:</p>
-
-<pre><code>Get everything (Jira, SVN, Website etc) up and running
-Cleanup code
-Generate awareness and grow a community.
-</code></pre>
-
-<p>Signed off by mentor: marrs</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/404ed818/site/community.html
----------------------------------------------------------------------
diff --git a/site/community.html b/site/community.html
deleted file mode 100644
index 99c7ebe..0000000
--- a/site/community.html
+++ /dev/null
@@ -1,121 +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">
-<h1>Celix Community</h1>
-
-<p>Celix is a community driven project, where everyone is free to download and use it. Besides using Celix we encourage 
-everyone to participate in the development. This can be as simple as providing feedback and reporting bugs but could as 
-well mean bug fixes and code contributions.</p>
-
-<ul>
-<li><a href="/community/contributing/contributing.html">Contribute</a></li>
-</ul>
-
-<p>While Celix was in incubation at the Apache Incubator, the status had to be reported to the Incubator PMC. These
-reports are also available on this site.</p>
-
-<ul>
-<li><a href="/community/boardreports/boardreports.html">Board Reports</a></li>
-</ul>
-</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/404ed818/site/contributing.html
----------------------------------------------------------------------
diff --git a/site/contributing.html b/site/contributing.html
deleted file mode 100644
index a1c5854..0000000
--- a/site/contributing.html
+++ /dev/null
@@ -1,113 +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">
-<h1>Contributing</h1>
-
-<p>The Celix community is open for everyone to participate in. Discussions are done over the 
-<a href="/support/mailinglist.html">mailing lists</a>, and <a href="/support/issuetracking.html">issues</a> can be created and 
-seen by everyone.</p>
-
-<p>If you would like to join the Celix community, a good start would be to follow the mailing list and participate in the 
-discussions, use Celix and report bugs you find, possibly with patches.</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/404ed818/site/doc/one/file_one.html
----------------------------------------------------------------------
diff --git a/site/doc/one/file_one.html b/site/doc/one/file_one.html
index 132b8ac..e69de29 100644
--- a/site/doc/one/file_one.html
+++ b/site/doc/one/file_one.html
@@ -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/404ed818/site/doc/two/file_three.html
----------------------------------------------------------------------
diff --git a/site/doc/two/file_three.html b/site/doc/two/file_three.html
index 22b6232..e69de29 100644
--- a/site/doc/two/file_three.html
+++ b/site/doc/two/file_three.html
@@ -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.
-&lt;--</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/404ed818/site/doc/two/file_two.html
----------------------------------------------------------------------
diff --git a/site/doc/two/file_two.html b/site/doc/two/file_two.html
index f226ed8..e69de29 100644
--- a/site/doc/two/file_two.html
+++ b/site/doc/two/file_two.html
@@ -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>

http://git-wip-us.apache.org/repos/asf/celix-site/blob/404ed818/site/downloads.html
----------------------------------------------------------------------
diff --git a/site/downloads.html b/site/downloads.html
deleted file mode 100644
index 24873cf..0000000
--- a/site/downloads.html
+++ /dev/null
@@ -1,137 +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">
-<h1>Download Celix</h1>
-
-<p>Celix is an implementation of the OSGi specification adapted to C.</p>
-
-<h2>Releases</h2>
-
-<p>Apache Celix only releases source distributions, information about building and running van be found inside the release tarball.</p>
-
-<h3>Mirrors</h3>
-
-<p>The currently selected mirror is <strong>[preferred]</strong>. If you encounter a problem with this mirror, please select another mirror. If all mirrors are failing, there are <em>backup</em> 
-mirrors (at the end of the mirrors list) that should be available. </p>
-
-<form action="[location]" method="get" id="SelectMirror">Other mirrors:
-    <select name="Preferred">
-        [if-any http] [for http]<option value="[http]">[http]</option>[end] [end] 
-        [if-any ftp] [for ftp]<option value="[ftp]">[ftp]</option>[end] [end] 
-        [if-any backup] [for backup]<option value="[backup]">[backup] (backup)</option>[end] [end]
-    </select>
-    <input type="submit" value="Change"></input>
-</form>
-
-<p>You may also consult the <a href="http://www.apache.org/mirrors/">complete list of mirrors</a>.</p>
-
-<h3>Downloads</h3>
-
-<ul>
-<li>Source: <a href="[preferred]/celix/celix-2.0.0/celix-2.0.0.tar.gz">celix-2.0.0.tar.gz</a>
-<a href="http://www.apache.org/dist/celix/celix-2.0.0/celix-2.0.0.tar.gz.asc">PGP</a>
-<a href="http://www.apache.org/dist/celix/celix-2.0.0/celix-2.0.0.tar.gz.md5">MD5</a>
-<a href="http://www.apache.org/dist/celix/celix-2.0.0/celix-2.0.0.tar.gz.sha">SHA1</a></li>
-</ul>
-</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/404ed818/site/import/style.css
----------------------------------------------------------------------
diff --git a/site/import/style.css b/site/import/style.css
index d88e14d..dbcb978 100755
--- a/site/import/style.css
+++ b/site/import/style.css
@@ -204,6 +204,14 @@ a {
 	overflow: hidden;
 }
 
+#docTable {
+	float: left;
+}
+
+#docContent {
+	display: table-cell;
+}
+
 #foot {
 	text-align: center;
 	display : table-row;

http://git-wip-us.apache.org/repos/asf/celix-site/blob/404ed818/site/index.html
----------------------------------------------------------------------
diff --git a/site/index.html b/site/index.html
deleted file mode 100644
index 7bb05e8..0000000
--- a/site/index.html
+++ /dev/null
@@ -1,136 +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">
-<div id="banner">
-
-<p><img class="bannerImage shadowed" src="media/celix_notext.png">
-<div class="bannertext"></p>
-
-<h1>Apache Celix</h1>
-
-<p>Apache Celix is an implementation of the OSGi specification adapted to C and C++. It is a provides a framework to develop (dynamic) modular software applications using component and/or service-oriented programming.</p>
-
-<p>Apache Celix is primarily developed in C and adds an additional abstraction, in the form of a library, to support for C++.
-</div></div><div class="container"><div class="item"></p>
-
-<h3>How to install</h3>
-
-<p></div><div class="item"></p>
-
-<h3>Documentation</h3>
-
-<p></div><div class="item"></p>
-
-<h3>Tips</h3>
-
-<p></div><div class="item"></p>
-
-<h3>Contributing</h3>
-
-<p></div><div class="item"></p>
-
-<h3>Example projects</h3>
-
-</div></div>
-</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/404ed818/site/issuetracking.html
----------------------------------------------------------------------
diff --git a/site/issuetracking.html b/site/issuetracking.html
deleted file mode 100644
index d7820eb..0000000
--- a/site/issuetracking.html
+++ /dev/null
@@ -1,124 +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">
-<h1>Issue Tracking</h1>
-
-<p>Celix uses Jira for bug reports, feature requests, enhancements and tasks of all kind.</p>
-
-<p>Anyone can use Jira to report bugs. But before doing so, please make sure that:</p>
-
-<ul>
-<li>the bug isn't already reported,</li>
-<li>the problem is actually a bug (the <a href="/support/mailinglist.html">mailing list</a> can be used for support),</li>
-<li>you attach enough information to replicate the bug (preferably a unit test)</li>
-</ul>
-
-<p>If you have fixed a bug, the patch can be attached to a bug report.</p>
-
-<p>The Celix Jira Issue Tracker can be found at:</p>
-
-<ul>
-<li><a href="https://issues.apache.org/jira/browse/celix">https://issues.apache.org/jira/browse/celix</a></li>
-</ul>
-</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/404ed818/site/mailinglist.html
----------------------------------------------------------------------
diff --git a/site/mailinglist.html b/site/mailinglist.html
deleted file mode 100644
index ff955fb..0000000
--- a/site/mailinglist.html
+++ /dev/null
@@ -1,132 +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">
-<h1>Mailing List</h1>
-
-<p>Celix users and developers can be reached using mailing lists. Currently there is only one list for development and 
-support questions.</p>
-
-<ul>
-<li><a href="mailto:dev@celix.apache.org">Celix Developers Mailing List</a>
-<ul>
-<li><a href="mailto:dev-subscribe@celix.apache.org">Subscribe</a></li>
-<li><a href="mailto:dev-unsubscribe@celix.apache.org">Unsubscribe</a></li>
-<li><a href="http://mail-archives.apache.org/mod_mbox/celix-dev/">Archives</a></li>
-</ul></li>
-</ul>
-
-<p>If the Celix community grows, and there is a need for a dedicated users mailing list, it will be created.</p>
-
-<p>There is a second mailing list which is used to publish changes from the 
-<a href="/support/issuetracking.html">Issue Tracker</a>.</p>
-
-<ul>
-<li><a href="mailto:commits@celix.apache.org">Celix Commits Mailing List</a>
-<ul>
-<li><a href="mailto:commits-subscribe@celix.apache.org">Subscribe</a></li>
-<li><a href="mailto:commits-unsubscribe@celix.apache.org">Unsubscribe</a></li>
-<li><a href="http://mail-archives.apache.org/mod_mbox/celix-commits/">Archives</a></li>
-</ul></li>
-</ul>
-</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>


Mime
View raw message