incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r1040087 [5/5] - in /incubator/aries/branches/site: branches/ images/ resources/ trunk/ trunk/cgi-bin/ trunk/content/ trunk/content/images/ trunk/content/resources/ trunk/lib/ trunk/templates/
Date Mon, 29 Nov 2010 12:32:25 GMT
Added: incubator/aries/branches/site/trunk/content/releasingaries.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/releasingaries.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/releasingaries.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/releasingaries.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,397 @@
+Title: ReleasingAries
+<a name="ReleasingAries-HowtodoanAriesRelease"></a>
+# How to do an Aries Release
+
+
+To create a release you will need to create the release artifacts and move
+then to various places (ultimately the Maven central repository). The Maven
+commands and general outline of the process looks like this:
+
+!AriesRelease.png!
+
+The picture assumes that you are releasing from a branch rather than from
+trunk. The full maven commands are not shown - the intention is just to
+give an indication of which maven commands you will need to use to create
+assets in different places.
+
+Performing a release is described in detail [here ](-http://apache.org/dev/publishing-maven-artifacts.html.html)
+. This document It covers all the steps listed above so on these pages we
+will only add things which are specific to the Apache Aries release. Note:
+the document has not been release and this link will need to be updated
+when it has.
+
+There are a few steps to the process:
+1. Discussion of the release and its content on the aries-dev mailing list.
+1. Creating and storing GPG keys
+1. Setting up your environment
+1. Creating a branch to release from
+1. Checking release artifacts on your local system
+1. Creating a snapshot release (optional - not really part of the release
+process, uses mvn deploy)
+1. Releasing to a staging repository (uses mvn release:prepare and mvn
+release:perform)
+1. Running a vote
+1. Promoting the release artifacts to the Apache release repository
+1. Making the release artifacts available from the Aries web pages
+1. What to do when people find problems with the release artifacts
+
+The best current documentation for releases is [here ](-http://apache.org/dev/publishing-maven-artifacts.html.html)
+ - but this isn't released yet. It covers all the steps listed above so on
+these pages we will only add things which are specific to the Apache Aries
+release.
+
+
+<a name="ReleasingAries-Discussionofthereleaseandit'scontentontheAriesmailinglist"></a>
+### Discussion of the release and it's content on the Aries mailing list
+Before starting off the release process it is essential to gain concensus
+on the aries-dev list that this is the right time for a release and to
+agree its content. Allow at least a week for this discussion. 
+
+
+<a name="ReleasingAries-CreatingandstoringGPGkeys"></a>
+### Creating and storing GPG keys
+For Aries your GPG key will need to be in this file:
+https://svn.apache.org/repos/asf/incubator/aries/KEYS (follow the
+instructions in the file) and checkin
+
+<a name="ReleasingAries-Settingupyourenvironment"></a>
+### Setting up your environment
+
+Follow the general instructions linked to above. 
+
+<a name="ReleasingAries-Creatingabranchtoreleasefrom"></a>
+### Creating a branch to release from
+Although this isn't strictly speaking a necessary step it's pretty useful
+to do it. Running the commands to create the release can take some time,
+especially if you have to revert anything. This is much easier if you are
+working in your own branch and not in trunk where other people may be
+committing code.
+
+{code}
+svn copy https://svn.apache.org/repos/asf/incubator/aries/trunk \
+	  
+https://svn.apache.org/repos/asf/incubator/aries/branches/0.X-incubating-RCx
+\
+      -m "Creating a release branch of /aries/trunk."
+{code}
+
+Where '0.X' is the number of the release.
+
+Checkout the new branch, for example, for the 0.2-incubating  release:
+
+{code}
+svn co
+https://svn.apache.org/repos/asf/incubator/aries/branches/0.2-incubating-RCx
+aries-rc2-candidate
+{code}
+
+*IMPORTANT* If you are using a branch to release you *must* edit the top
+level pom.xml for each module to change the SCM references to point to the
+branch and to to trunk. For example:
+
+{code}
+<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/branches/0.2-incubating-RCx/parent</connection>
+       
+<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/branches/0.2-incubating-RCx/parent</developerConnection>
+       
+<url>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/branches/0.2-incubating-RCx/parent</url>
+{code}
+
+The consequence of forgetting this is that the commands that create the
+release (mvn release:prepare, mvn release:perform) will declare SUCCESS but
+will not create a staging repository and will add stuff to the snapshot
+repository :-/.
+
+After taking the branch, change the pom versions in trunk to, say,
+0.3-incubating or whatever you want to call the next development version.
+
+<a name="ReleasingAries-Checkingreleaseartifacts"></a>
+### Checking release artifacts
+I recommend deleting everything under ...org/apache/aries in your local
+Maven repo. For linux/Mac users you will find this under ~/.m2/repository/.
+
+Check that the code builds using the usual [sequence ](-buildingaries.html)
+ of commands, but add the following arguments to the 'mvn install' command:
+
+{code}
+mvn install -Papache-release -DcreateChecksum=true
+{code}
+
+This should build and install release artifacts in your local repo. 
+
+Check the [0.1 release](https://repository.apache.org/content/repositories/releases/org/apache/aries/parent/0.1-incubating/)
+ to understand what files should be created.
+
+To perform legal checks, in each subproject, run:
+{code}
+mvn rat:check -fn
+{code}
+
+This will run through the project and its sub projects generating a file
+called rat.txt in each target directory.
+The 'fn' means it will carry on even if it find a failure. To inspect the
+failures, the easiest way I've found so far is:
+{code}
+find . -name rat.txt | xargs grep \!\?\?
+{code}
+
+This will pick out the failing file names. Some of the files that rat fails
+do not require an Apache license, eg MANIFEST.MF, but any *.java or *.js
+file does need one.
+
+<a name="ReleasingAries-Creatingasnapshotrelease"></a>
+### Creating a snapshot release
+TBD. This isn't a necessary step in the release process but should still be
+documented here.
+
+<a name="ReleasingAries-Creatingtherelease"></a>
+### Creating the release
+
+<a name="ReleasingAries-Creatingthereleaseartifactsinastagingrepository"></a>
+##### Creating the release artifacts in a staging repository
+
+Aries is released as a set of modules, not all the modules in Aries are
+part of the release. Some modules depend on other modules. The release is
+created by releasing each module separately and in a specific order. It is
+also desirable to maintain the same IP address for the entire process (the
+staging repository is associated with your IP address, changing it results
+in the creation of a second staging repository).
+
+Short summary: Use a wired ether net connection and allow about 4 hours for
+the next few steps.
+
+From the top level directory in your branch run:
+{code}
+mvn clean
+{code}
+
+Then, change directory to 'parent'. It is necessary to release parent first
+because everything else depends on it. Run the following commands:
+
+{code}
+mvn install -Papache-release
+mvn release:prepare -Papache-release
+mvn release:perform -Papache-release
+{code}
+
+*Note* The prepare step will make some assumptions about the version of the
+development steam that is left after the release has been made. When
+releasing from a branch it may not be a good idea to accept the default for
+this, it will very likely conflict with the development version in use in
+trunk.
+
+The install command is required to make sure that you have a copy of the
+parent in your local repository - it's required for releasing the
+eba-maven-plugin.
+
+This _should _ start to put release artifacts into an Apache [staging repository ](-https://repository.apache.org/index.html#view-repositories;staging.html)
+. You will need to log in to see it.
+If nothing appears in a staging repo you should stop here and work out why
+:-). If you have made a mistake it's quite easy to revert. The release
+commands make and commit changes to the project's pom.xml files and they
+create a tag in SVN. To revert the changes you will need to revert the
+pom.xml files and delete the tag from svn.
+
+If you are in Europe the mvn release:prepare command almost always fails at
+the last step, with a message like:
+
+{code}
+[ERROR](error.html)
+ BUILD FAILURE
+[INFO](info.html)
+ ------------------------------------------------------------------------
+[INFO](info.html)
+ Unable to tag SCM
+Provider message:
+The svn tag command failed.
+Command output:
+svn: No such revision 936951
+{code}
+This is due to the SVN mirroring in place between Europe and the master in
+the US. When you make a commit, it isn't immediately available in Europe to
+svn up to. Just wait 10 secs and repeat the mvn release:prepare command for
+it to restart where it left off.
+
+
+The next step is to release the eba-maven-plugin.
+{code}
+cd ../eba/maven-plugin
+mvn versions:update-parent
+mvn versions:use-releases
+svn commit -m "updated to latest releases"
+mvn release:prepare -Papache-release
+mvn release:perform -Papache-release
+{code}
+
+Then for each project, in the order given below:
+
+testsupport
+util
+blueprint 
+jndi
+transaction
+web
+application
+jmx
+quiesce
+jpa
+samples *See Note 1 below*
+
+Run the following commands:
+{code}
+mvn versions:update-parent
+mvn versions:use-releases
+svn commit -m "updated to latest releases"
+mvn release:prepare -Papache-release -DpreparationGoals="clean install"
+*See Note 2 below*
+mvn release:perform -Papache-release
+{code}
+
+  * Note 1: when doing mvn versions:* actions in samples, you must also
+manually change the version properties that are hard coded in the top level
+pom.xml. The only '-SNAPSHOT' you should have left in samples/pom.xml is
+the version element for the module itself.
+  * Note 2: -DpreparationGoals="clean install"	is needed for all modules
+that have sub modules with dependencies between them, in practice this is
+most modules.
+
+<a name="ReleasingAries-Closingthestagingrepository"></a>
+##### Closing the staging repository
+After checking that the staging repository contains the artifacts that you
+expect you should close the staging repository. This will make it available
+so that people can check the release.
+
+<a name="ReleasingAries-Runningthevote(s)"></a>
+### Running the vote(s)
+
+Two votes are required for an incubator release. The first from the
+aries-dev@incubator.apache.org list, the second from
+general@incubator.apache.org. These run consecutively, 72 hours is required
+for each vote.
+
+After all the modules are present in the staging repository you will need
+to close the repository so that reviewers can access the modules. At this
+point you should write two notes to the aries-dev mailing list.
+
+ * Subject \[VOTE\](vote\.html)
+ Apache Aries (Incubating) version 0.X-incubating release candidate 02
+
+The the source archive files should be explicitly called out by release
+manager in any release vote. From an Apache legal standpoint, this is what
+the project is "releasing" and what the community should be voting on. In
+this [sample note](-http://people.apache.org/~zoe/devlistvote.txt.html)
+, there is a link to each modules' source*.zip file.
+
+
+ * Subject \[DISCUSS\](discuss\.html)
+ Apache Aries (Incubating) version 0.X-incubating release candidate 0X
+
+The content should just indicate that the note starts a thread to discuss
+the Aries 0.X-incubating release.
+
+
+After 72 hours, if no problems have been found in the release artifacts,
+the aries-dev vote can be summarised and closed. Note that at least three
++1 votes from Aries IPMC members are required. 
+
+After closing the vote on the aries-dev list, the second vote (on the
+general@) can be started. Here is a [sample note](http://people.apache.org/~zoe/generallistvote.txt)
+, the subject of the note is \[VOTE\]Approval to release Apache Aries
+(Incubating) version 0.X-incubating
+
+
+After another 72 hours, assuming there are no objections, this vote can
+also be summarised and closed.
+
+<a name="ReleasingAries-Promotingthereleaseartifacts"></a>
+### Promoting the release artifacts
+From the [Nexus pages](https://repository.apache.org/index.html#stagingRepositories)
+, select the staging repository and select 'release' from the top menu.
+This moves the release artifacts into an Apache releases repository, from
+there they will be automatically moved to the Maven repository.
+
+<a name="ReleasingAries-MakingthereleaseartifactsavailablefromtheArieswebpages."></a>
+### Making the release artifacts available from the Aries web pages. 
+Anything that is to be downloaded must be put in
+/www/www.apache.org/dist/incubator/aries on minotaur. The distributions are
+archived here /www/archive.apache.org/dist/incubator/aries.
+
+First, delete the previous distribution from the distribution directory.
+Download the release artifacts using a script like [this](-http://people.apache.org/~zoe/release-0.2-.html)
+. Next, update the Aries Downloads pages to refer to the new artifacts.
+
+
+
+<a name="ReleasingAries-Whattodowhenpeoplefindproblemswiththerelease"></a>
+### What to do when people find problems with the release
+ * Cancel the vote \[CANCELLED\](cancelled\.html)
+\[VOTE\]
+ * Clean up, fix and re-release.
+The good news here is that it isn't necessarily essential to re-release
+every module. 
+
+
+<a name="ReleasingAries-Cleaningup,fixingandre-releasing"></a>
+### Cleaning up, fixing and re-releasing
+
+
+The release process makes changes to project poms and adds a tag in svn.
+The first step is to revert the changes to the poms in the problem modules.
+The following steps work on a *ix like platform:
+
+Determine which revision you want to go back to (eg XXXXX)
+{code}
+svn up -r XXXXXX
+find . -name pom.xml | xargs -I {} mv {} {}_old
+svn up
+find . -name pom.xml | xargs -I {} mv {}_old {}
+svn status #Check what you have changed!
+svn commit -m "reverting release changes"
+{code}
+
+Next - delete the tag relating to the module from SVN
+
+Finally - delete the folder from the staging repository (this seems to take
+several attempts and a very long time to achieve)
+
+Make the fixes that you need to in the project, commit them and work
+through the release process again. 
+
+In some cases you may also want to merge from trunk into the release
+branch. The syntax to do this is:
+{code}
+svn merge -c ZZZZZZ https://svn.apache.org/repos/asf/incubator/aries/trunk
+{code}
+Where ZZZZZZ is the revision associated with the fix.
+Note that you will be creating a new staging repository. The commands are
+repeated here for convenience:
+
+{code}
+mvn versions:update-parent
+mvn versions:use-releases
+svn commit -m "<version> RC<#>: updated to latest releases"
+mvn release:prepare -Papache-release -DpreparationGoals="clean install"
+mvn release:perform -Papache-release
+{code}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Added: incubator/aries/branches/site/trunk/content/samples.cwiki
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/samples.cwiki?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/samples.cwiki (added)
+++ incubator/aries/branches/site/trunk/content/samples.cwiki Mon Nov 29 12:32:22 2010
@@ -0,0 +1,25 @@
+h1. Samples
+
+h3. [Blog Sample|Blog Sample]
+Includes Blueprint, WAB and JPA concepts delivered in a EBA.
+
+h3. [AriesTrader Sample|AriesTrader]
+Includes Blueprint, WAB and JPA concepts delivered in a EBA.
+You may also know this as the [Apache Geronimo Daytrader|https://cwiki.apache.org/GMOxDOC22/daytrader-a-more-complex-application.html] application, which has been migrated from a pure Java EE environment to a OSGi Blueprint model.
+
+h3. [GOAT Sample|GOATSample]
+A graphical tool for displaying the status of, and relationships between, OSGi bundles running in an OSGi framework.
+
+
+\\
+\\
+\\
+\\
+\\
+\\
+\\
+\\
+\\
+
+h4. [Archived Sample Instructions|ArchiveInstructions]
+Archived versions of Sample instructions from earlier Apache Aries releases.

Added: incubator/aries/branches/site/trunk/content/samples.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/samples.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/samples.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/samples.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,44 @@
+Title: Samples
+<a name="Samples-Samples"></a>
+# Samples
+
+<a name="Samples-[BlogSample](blogsample.html)"></a>
+### [Blog Sample|Blog Sample]
+Includes Blueprint, WAB and JPA concepts delivered in a EBA.
+
+<a name="Samples-[AriesTraderSample](ariestrader.html)"></a>
+### [AriesTrader Sample|AriesTrader]
+Includes Blueprint, WAB and JPA concepts delivered in a EBA.
+You may also know this as the [Apache Geronimo Daytrader](https://cwiki.apache.org/GMOxDOC22/daytrader-a-more-complex-application.html)
+ application, which has been migrated from a pure Java EE environment to a
+OSGi Blueprint model.
+
+<a name="Samples-[GOATSample](goatsample.html)"></a>
+### [GOAT Sample|GOATSample]
+A graphical tool for displaying the status of, and relationships between,
+OSGi bundles running in an OSGi framework.
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+<a name="Samples-[ArchivedSampleInstructions](archiveinstructions.html)"></a>
+#### [Archived Sample Instructions|ArchiveInstructions]
+Archived versions of Sample instructions from earlier Apache Aries
+releases.

Added: incubator/aries/branches/site/trunk/content/september-2010.cwiki
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/september-2010.cwiki?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/september-2010.cwiki (added)
+++ incubator/aries/branches/site/trunk/content/september-2010.cwiki Mon Nov 29 12:32:22 2010
@@ -0,0 +1,29 @@
+Aries will deliver a set of pluggable Java components enabling an enterprise OSGi application programming model.
+
+Aries entered incubation on September 22, 2009.
+
+There are currently no issues requiring IPMC or Board attention.
+
+The following sub-components are actively being developed:
+
+* Application
+* Subsystems
+* Blueprint
+* JPA
+* JNDI
+* Transaction
+* Quiesce
+* Samples
+
+
+There continues to be a vibrant community as shown by the activity on the mailing list this year.
+
+We have recently completed our 0.2-incubating release. This is our second release since entering incubation. This release is in support of Geronimo 3.0 which uses Apache Aries.
+
+The OSGi Enterprise Compliance Tests have been run against Blueprint, JMX, JNDI and transactions modules and the results have been published to the aries-dev mailing list and are available from the [Aries web site| http://incubator.apache.org/aries/testresults.html]
+
+Top 2 or 3 things to resolve before graduation:
+
+* Build community  [done]
+* Create a release [done]
+* Address project scope concerns raised during acceptance vote
\ No newline at end of file

Added: incubator/aries/branches/site/trunk/content/september-2010.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/september-2010.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/september-2010.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/september-2010.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,36 @@
+Title: September 2010
+Aries will deliver a set of pluggable Java components enabling an
+enterprise OSGi application programming model.
+
+Aries entered incubation on September 22, 2009.
+
+There are currently no issues requiring IPMC or Board attention.
+
+The following sub-components are actively being developed:
+
+* Application
+* Subsystems
+* Blueprint
+* JPA
+* JNDI
+* Transaction
+* Quiesce
+* Samples
+
+
+There continues to be a vibrant community as shown by the activity on the
+mailing list this year.
+
+We have recently completed our 0.2-incubating release. This is our second
+release since entering incubation. This release is in support of Geronimo
+3.0 which uses Apache Aries.
+
+The OSGi Enterprise Compliance Tests have been run against Blueprint, JMX,
+JNDI and transactions modules and the results have been published to the
+aries-dev mailing list and are available from the [Aries web site](-http://incubator.apache.org/aries/testresults.html.html)
+
+Top 2 or 3 things to resolve before graduation:
+
+* Build community  [done](done.html)
+* Create a release [done](done.html)
+* Address project scope concerns raised during acceptance vote

Added: incubator/aries/branches/site/trunk/content/site.cwiki
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/site.cwiki?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/site.cwiki (added)
+++ incubator/aries/branches/site/trunk/content/site.cwiki Mon Nov 29 12:32:22 2010
@@ -0,0 +1 @@
+{children}

Added: incubator/aries/branches/site/trunk/content/site.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/site.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/site.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/site.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,2 @@
+Title: Site
+{children}

Added: incubator/aries/branches/site/trunk/content/sitemap.cwiki
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/sitemap.cwiki?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/sitemap.cwiki (added)
+++ incubator/aries/branches/site/trunk/content/sitemap.cwiki Mon Nov 29 12:32:22 2010
@@ -0,0 +1 @@
+{children:all=true|page=Index} 

Added: incubator/aries/branches/site/trunk/content/sitemap.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/sitemap.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/sitemap.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/sitemap.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,43 @@
+# Site Map
+
+- [Overview](overview.html)
+ - [Board Reports](boardreports.html)
+ - [Site Map](sitemap.html)
+
+- [Documentation](documentation.html)
+ - [Programming Model](ariesprogrammingmodel.html)
+ - [Pointers to OSGi specs](pointerstoosgispecifications.html)
+ - [Integrators Guide](integrators-guide.html)
+ - [Articles](articles.html)
+ - [Slides](https://svn.apache.org/repos/asf/incubator/aries/slides/)
+ - [Tutorials](tutorials.html)
+
+- [Downloads](downloads.html)
+
+- [Community](community.html)
+ - [Getting Involved](gettinginvolved.html)
+ - [Who we are](people.html)
+ - [Mailing lists](mailinglists.html)
+ - [Aries Group Blog](http://blogs.apache.org/aries/)
+
+- [Development](development.html)
+ - [Source Control ](-https://svn.apache.org/repos/asf/incubator/aries/.html)
+ - [Bug Tracking](-https://issues.apache.org/jira/browse/aries.html)
+ - [Building Aries ](-buildingaries.html)
+ - [Releasing Aries ](-releasingaries.html)
+ - [OSGi Compliance Tests ](-compliancetesting.html)
+ - [Build System](-http://hudson.zones.apache.org/hudson/.html)
+ - [Web Site Maintenance ](-maintainingthewebpages.html)
+
+- [Modules](modules.html)
+ - [Samples](samples.html)
+ - [Blueprint](blueprint.html)
+ - [JNDI](jndiproject.html)
+ - [JPA](jpaproject.html)
+ - [Applications](applications.html)
+ - [Transactions](transactionsproject.html)
+ - [EBA Maven Plugin ](-ebamavenpluginproject.html)
+ - [SPI Fly](spi-fly.html)
+
+- [Sponsorship](sponsorship.html)
+

Added: incubator/aries/branches/site/trunk/content/spi-fly.cwiki
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/spi-fly.cwiki?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/spi-fly.cwiki (added)
+++ incubator/aries/branches/site/trunk/content/spi-fly.cwiki Mon Nov 29 12:32:22 2010
@@ -0,0 +1,23 @@
+This page describes the SPI Fly component.
+The SPI Fly component is aimed at providing general support for the JRE SPI mechanism (including the usage of META-INF/services) in OSGi.
+
+The code can be found in http://svn.apache.org/repos/asf/incubator/aries/trunk/spi-fly
+
+Currently the implementation does the following:
+* It only considers bundles that have the following Manifest (opt-in) header: {{SPI-Provider}} (the value is not used at the moment).
+* For every new bundle being installed that has the opt-in header, it checks the META-INF/services directory for any files. If found it registers a service in the Service Registry for each implementation found with the following property
+ {{spi.provider.url = <the URL to the associated META-INF/services file>}}
+
+Additional ideas/concerns:
+* We need to find a mechanism to find any SPI implementations that are part of the JRE itself and register these in the Service Registry. Since there is typically not a META-INF/services file for these mechanisms nor do they implement a common interface we need another mechanism.
+** Can anyone think of a generic mechanism?
+** An ugly alternative could be to manually enumerate these, but this is a bit of a maintenance nightmare.
+
+* *gnodet:* the javamail spec do use the META-INF/services discovery mechanism, but to detect and instantiate classes using constructors
+that have arguments. We need to investigate if it could cause any real problem with the design ... or find a specific way for javamail maybe ...
+
+We need to support 'traditional' clients that don't look in the OSGi service registry to obtain their SPI implementation. Some ideas in this area are: 
+
+* We could automatically set a System Property for every SPI implementation found. That would typically shift the 'default' choice for an implementation to the last one found. 
+* Classloader problems around loading an implementation?
+* Various Lifecycle issues when using the traditional way.
\ No newline at end of file

Added: incubator/aries/branches/site/trunk/content/spi-fly.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/spi-fly.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/spi-fly.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/spi-fly.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,40 @@
+Title: SPI Fly
+This page describes the SPI Fly component.
+The SPI Fly component is aimed at providing general support for the JRE SPI
+mechanism (including the usage of META-INF/services) in OSGi.
+
+The code can be found in
+http://svn.apache.org/repos/asf/incubator/aries/trunk/spi-fly
+
+Currently the implementation does the following:
+* It only considers bundles that have the following Manifest (opt-in)
+header: *SPI-Provider* (the value is not used at the moment).
+* For every new bundle being installed that has the opt-in header, it
+checks the META-INF/services directory for any files. If found it registers
+a service in the Service Registry for each implementation found with the
+following property
+ *spi.provider.url = <the URL to the associated META-INF/services file>*
+
+Additional ideas/concerns:
+* We need to find a mechanism to find any SPI implementations that are part
+of the JRE itself and register these in the Service Registry. Since there
+is typically not a META-INF/services file for these mechanisms nor do they
+implement a common interface we need another mechanism.
+** Can anyone think of a generic mechanism?
+** An ugly alternative could be to manually enumerate these, but this is a
+bit of a maintenance nightmare.
+
+* *gnodet:* the javamail spec do use the META-INF/services discovery
+mechanism, but to detect and instantiate classes using constructors
+that have arguments. We need to investigate if it could cause any real
+problem with the design ... or find a specific way for javamail maybe ...
+
+We need to support 'traditional' clients that don't look in the OSGi
+service registry to obtain their SPI implementation. Some ideas in this
+area are: 
+
+* We could automatically set a System Property for every SPI implementation
+found. That would typically shift the 'default' choice for an
+implementation to the last one found. 
+* Classloader problems around loading an implementation?
+* Various Lifecycle issues when using the traditional way.

Added: incubator/aries/branches/site/trunk/content/sponsorship.cwiki
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/sponsorship.cwiki?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/sponsorship.cwiki (added)
+++ incubator/aries/branches/site/trunk/content/sponsorship.cwiki Mon Nov 29 12:32:22 2010
@@ -0,0 +1,4 @@
+h1.Sponsorship
+
+ - [Thanks|http://www.apache.org/foundation/thanks.html]
+ - [Sponsoring Apache|http://www.apache.org/foundation/sponsorship.html]

Added: incubator/aries/branches/site/trunk/content/sponsorship.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/sponsorship.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/sponsorship.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/sponsorship.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,6 @@
+Title: Sponsorship
+<a name="Sponsorship-Sponsorship"></a>
+# Sponsorship
+
+ - [Thanks](http://www.apache.org/foundation/thanks.html)
+ - [Sponsoring Apache](http://www.apache.org/foundation/sponsorship.html)

Added: incubator/aries/branches/site/trunk/content/testresults.cwiki
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/testresults.cwiki?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/testresults.cwiki (added)
+++ incubator/aries/branches/site/trunk/content/testresults.cwiki Mon Nov 29 12:32:22 2010
@@ -0,0 +1,18 @@
+These are the test results for the most recent Aries release.
+
+h3. Blueprint
+ * [Blueprint | http://people.apache.org/~zoe/org.osgi.test.cases.blueprint.html]
+ * [Blueprint-java5 | http://people.apache.org/~zoe/org.osgi.test.cases.blueprint.java5.html]
+ * [Blueprint-security | http://people.apache.org/~zoe/org.osgi.test.cases.blueprint.security.html]
+
+h2. JNDI
+ * [JNDI | http://people.apache.org/~zoe/org.osgi.test.cases.jndi.html]
+
+h2. JMX
+ * [JMX | http://people.apache.org/~zoe/org.osgi.test.cases.jmx.html]
+
+h2. JPA
+Not run. The Aries container managed JPA implementation is not expected to pass the existing compliance tests for user managed JPA.
+
+h2. Transaction
+ * [Transaction | http://people.apache.org/~zoe/org.osgi.test.cases.transaction.html]
\ No newline at end of file

Added: incubator/aries/branches/site/trunk/content/testresults.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/testresults.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/testresults.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/testresults.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,25 @@
+Title: TestResults
+These are the test results for the most recent Aries release.
+
+<a name="TestResults-Blueprint"></a>
+### Blueprint
+ * [Blueprint ](-http://people.apache.org/~zoe/org.osgi.test.cases.blueprint.html.html)
+ * [Blueprint-java5 ](-http://people.apache.org/~zoe/org.osgi.test.cases.blueprint.java5.html.html)
+ * [Blueprint-security ](-http://people.apache.org/~zoe/org.osgi.test.cases.blueprint.security.html.html)
+
+<a name="TestResults-JNDI"></a>
+## JNDI
+ * [JNDI ](-http://people.apache.org/~zoe/org.osgi.test.cases.jndi.html.html)
+
+<a name="TestResults-JMX"></a>
+## JMX
+ * [JMX ](-http://people.apache.org/~zoe/org.osgi.test.cases.jmx.html.html)
+
+<a name="TestResults-JPA"></a>
+## JPA
+Not run. The Aries container managed JPA implementation is not expected to
+pass the existing compliance tests for user managed JPA.
+
+<a name="TestResults-Transaction"></a>
+## Transaction
+ * [Transaction ](-http://people.apache.org/~zoe/org.osgi.test.cases.transaction.html.html)

Added: incubator/aries/branches/site/trunk/content/transactionsproject.cwiki
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/transactionsproject.cwiki?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/transactionsproject.cwiki (added)
+++ incubator/aries/branches/site/trunk/content/transactionsproject.cwiki Mon Nov 29 12:32:22 2010
@@ -0,0 +1,3 @@
+The Aries JTA project will focus on making container managed transactions available as OSGi services.
+
+For more information, check out section "123 JTA Transaction Services Specification 1.0" in the "OSGi Service Platform Enterprise Specification, Release 4, Version 4.2" available for public download from the [OSGi Alliance|http://www.osgi.org/Download/Release4V42].

Added: incubator/aries/branches/site/trunk/content/transactionsproject.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/transactionsproject.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/transactionsproject.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/transactionsproject.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,8 @@
+Title: TransactionsProject
+The Aries JTA project will focus on making container managed transactions
+available as OSGi services.
+
+For more information, check out section "123 JTA Transaction Services
+Specification 1.0" in the "OSGi Service Platform Enterprise Specification,
+Release 4, Version 4.2" available for public download from the [OSGi Alliance](http://www.osgi.org/Download/Release4V42)
+.

Added: incubator/aries/branches/site/trunk/content/tutorials.cwiki
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/tutorials.cwiki?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/tutorials.cwiki (added)
+++ incubator/aries/branches/site/trunk/content/tutorials.cwiki Mon Nov 29 12:32:22 2010
@@ -0,0 +1,5 @@
+h1. Tutorials
+
+h3. [Blueprint Hello World tutorial|BlueprintHelloWorldTutorial]
+
+h3. [Greeter: another Blueprint Tutorial|GreeterTutorial]
\ No newline at end of file

Added: incubator/aries/branches/site/trunk/content/tutorials.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/content/tutorials.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/content/tutorials.mdtext (added)
+++ incubator/aries/branches/site/trunk/content/tutorials.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,9 @@
+Title: Tutorials
+<a name="Tutorials-Tutorials"></a>
+# Tutorials
+
+<a name="Tutorials-[BlueprintHelloWorldtutorial](blueprinthelloworldtutorial.html)"></a>
+### [Blueprint Hello World tutorial|BlueprintHelloWorldTutorial]
+
+<a name="Tutorials-[Greeter:anotherBlueprintTutorial](greetertutorial.html)"></a>
+### [Greeter: another Blueprint Tutorial|GreeterTutorial]

Added: incubator/aries/branches/site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/lib/path.pm?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/lib/path.pm (added)
+++ incubator/aries/branches/site/trunk/lib/path.pm Mon Nov 29 12:32:22 2010
@@ -0,0 +1,32 @@
+package path;
+
+# All our pages use the same view function
+our @patterns = (
+    [qr!^/.*\.html$!,   normal_page => {} ],
+    [qr!^/.*\.mdtext$!, normal_page => { template=>"standard_markdown.html" } ],
+);
+
+# for specifying interdependencies between files
+our %dependencies = ();
+
+1;
+
+=head1 LICENSE
+
+           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.
+

Added: incubator/aries/branches/site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/lib/view.pm?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/lib/view.pm (added)
+++ incubator/aries/branches/site/trunk/lib/view.pm Mon Nov 29 12:32:22 2010
@@ -0,0 +1,98 @@
+package view;
+
+#
+# BUILD CONSTRAINT:  all views must return $content, $extension.
+# additional return values (as seen below) are optional.  However,
+# careful use of symlinks and dependency management in path.pm can
+# resolve most issues with this constraint.
+#
+
+use strict;
+use warnings;
+use Dotiac::DTL qw/Template/;
+use Dotiac::DTL::Addon::markup;
+use ASF::Util qw/read_text_file/;
+
+push @Dotiac::DTL::TEMPLATE_DIRS, "templates";
+
+# This is most widely used view.  It takes a
+# 'template' argument and a 'path' argument.
+# Assuming the path ends in foo.mdtext, any files
+# like foo.page/bar.mdtext will be parsed and
+# passed to the template in the "bar" (hash)
+# variable.
+sub normal_page {
+    my %args = @_;
+    my $file = "content$args{path}";
+    $args{path} =~ s/\.mdtext$/\.html/;
+
+    my $template = $file;
+    if($args{template}) {
+       $template = $args{template};
+    }
+
+    read_text_file $file, \%args;
+    $args{breadcrumbs} = breadcrumbs($args{path}, $args{headers});
+
+    my $page_path = $file;
+    $page_path =~ s/\.[^.]+$/.page/;
+    if (-d $page_path) {
+        for my $f (grep -f, glob "$page_path/*.mdtext") {
+            $f =~ m!/([^/]+)\.mdtext$! or die "Bad filename: $f\n";
+            $args{$1} = {};
+            read_text_file $f, $args{$1};
+        }
+    }
+
+    return Dotiac::DTL::Template($template)->render(\%args), html => \%args;
+}
+
+# Generates cwiki-style breadcrumbs
+sub breadcrumbs {
+    my ($fullpath, $headerref) = @_;
+    my @titles = split m!/!, $fullpath;
+    my @paths = split m!/!, $fullpath;
+
+    if($paths[scalar@paths-1] =~ /^index/) { 
+      pop @titles; 
+      pop @paths; 
+    } else {
+      if($headerref && $headerref->{title}) {
+         $titles[scalar@titles-1] = $headerref->{title};
+      }
+    }
+    $titles[0] = "Home";
+
+    my @rv;
+    my $relpath = "/";
+    for(my $i=0; $i<scalar @paths; $i++) {
+        my $title = $titles[$i];
+        $relpath .= $paths[$i];
+        push @rv, qq(<a href="$relpath">\u$title</a>);
+        unless($relpath eq "/") { $relpath .= "/"; }
+    }
+    return join "&nbsp;&raquo&nbsp;", @rv;
+}
+
+1;
+
+=head1 LICENSE
+
+           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.
+
+

Added: incubator/aries/branches/site/trunk/templates/navigation.mdtext
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/templates/navigation.mdtext?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/templates/navigation.mdtext (added)
+++ incubator/aries/branches/site/trunk/templates/navigation.mdtext Mon Nov 29 12:32:22 2010
@@ -0,0 +1,75 @@
+- 
+### [Overview](overview.html)
+  - 
+####[Board Reports](boardreports.html)
+  - 
+####[Site Map](sitemap.html)
+
+- 
+### [Documentation](documentation.html)
+  - 
+#### [Programming Model](ariesprogrammingmodel.html)
+  - 
+#### [Pointers to OSGi specs](pointerstoosgispecifications.html)
+  - 
+#### [Integrators Guide](integrators-guide.html)
+  - 
+#### [Articles](articles.html)
+  - 
+#### [Slides](https://svn.apache.org/repos/asf/incubator/aries/slides/)
+  - 
+#### [Tutorials](tutorials.html)
+
+- 
+### [Downloads](downloads.html)
+
+- 
+### [Community](community.html)
+  - 
+#### [Getting Involved](gettinginvolved.html)
+  - 
+#### [Who we are](people.html)
+  - 
+#### [Mailing lists](mailinglists.html)
+  - 
+#### [Aries Group Blog](http://blogs.apache.org/aries/)
+
+- 
+### [Development](development.html)
+  - 
+#### [Source Control ](https://svn.apache.org/repos/asf/incubator/aries/.html)
+  - 
+#### [Bug Tracking](https://issues.apache.org/jira/browse/aries.html)
+  - 
+#### [Building Aries ](buildingaries.html)
+  - 
+#### [Releasing Aries ](releasingaries.html)
+  - 
+#### [OSGi Compliance Tests ](compliancetesting.html)
+  - 
+#### [Build System](http://hudson.zones.apache.org/hudson/.html)
+  - 
+#### [Web Site Maintenance ](maintainingthewebpages.html)
+
+- 
+### [Modules](modules.html)
+  - 
+#### [Samples](samples.html)
+  - 
+#### [Blueprint](blueprint.html)
+  - 
+#### [JNDI](jndiproject.html)
+  - 
+#### [JPA](jpaproject.html)
+  - 
+#### [Applications](applications.html)
+  - 
+#### [Transactions](transactionsproject.html)
+  - 
+#### [EBA Maven Plugin ](-ebamavenpluginproject.html)
+  - 
+#### [SPI Fly](spi-fly.html)
+
+- 
+### [Sponsorship](sponsorship.html)
+

Added: incubator/aries/branches/site/trunk/templates/standard.html
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/templates/standard.html?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/templates/standard.html (added)
+++ incubator/aries/branches/site/trunk/templates/standard.html Mon Nov 29 12:32:22 2010
@@ -0,0 +1,144 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<!--
+
+    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.
+-->
+<html>
+  <head>
+    <link type="text/css" rel="stylesheet"
+href="http://incubator.apache.org/aries/resources/site.css";></link>
+    <script src="http://incubator.apache.org/aries/resources/space.js";
+type="text/javascript"></script>
+<meta name="keywords" content="..."/>
+<meta name="description" content="..." />
+    <title>
+Apache Aries (incubating) -- $page.title
+    </title>
+  </head>
+<body onload="init()">
+
+<table width="100%" cellpadding="0" cellspacing="0">
+  <tr width="100%">
+    <td id="cell-0-0" colspan="2">&nbsp;</td>
+    <td id="cell-0-1">&nbsp;</td>
+    <td id="cell-0-2" colspan="2">&nbsp;</td>
+  </tr>
+  <tr width="100%">
+    <td id="cell-1-0">&nbsp;</td>
+    <td id="cell-1-1">&nbsp;</td>
+    <td id="cell-1-2">
+      <div style="padding: 5px;">
+        <div id="banner">
+          <!-- Banner -->
+			<table border="0" cellpadding="0" cellspacing="0" width="100%">
+				<tr>
+					<td align="left" class="topbardiv" nowrap="">
+						<a href="http://incubator.apache.org/aries/" title="Apache Aries (incubating)"> <img border="0" src="http://incubator.apache.org/aries/images/Arieslogo_Horizontal.gif"> </a>
+					</td>
+					<td align="right" nowrap="">
+						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://incubator.apache.org/aries/images/apache-incubator-logo.png"> </a>
+      				</td>
+				</tr>
+			</table>
+          <!-- Banner -->
+        </div>
+      </div>
+      <div id="top-menu">
+        <table border="0" cellpadding="1" cellspacing="0" width="100%">
+          <tr>
+            <td>
+              <div align="left">
+                <!-- Breadcrumbs -->
+					<A href="" title="Apache Aries">Apache Aries</A>&nbsp;&gt;&nbsp;<A href="" title="Index">Index</A>
+                <!-- Breadcrumbs -->
+              </div>
+            </td>
+            <td>
+              <div align="right">
+                <!-- Quicklinks -->
+					<DIV style="padding: 5px 5px 0px 25px;">
+						<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+						<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> 
+						<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+						<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+						<INPUT maxlength="255" name="q" size="15" type="text" value></INPUT>
+						<INPUT name="btnG" type="submit" value="Search"></INPUT>
+						<INPUT name="domains" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						<INPUT name="sitesearch" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						</FORM>
+					</DIV>
+                <!-- Quicklinks -->
+              </div>
+            </td>
+          </tr>
+        </table>
+      </div>
+    </td>
+    <td id="cell-1-3">&nbsp;</td>
+    <td id="cell-1-4">&nbsp;</td>
+  </tr>
+  <tr width="100%">
+    <td id="cell-2-0" colspan="2">&nbsp;</td>
+    <td id="cell-2-1">
+      <table>
+        <tr height="100%" valign="top">
+          <td height="100%">
+            <div id="wrapper-menu-page-right">
+              <div id="wrapper-menu-page-top">
+                <div id="wrapper-menu-page-bottom">
+                  <div id="menu-page">
+                    <!-- NavigationBar -->
+					{% filter markdown %}{% include "navigation.mdtext" %}{% endfilter %} 
+                    <!-- NavigationBar -->
+                  </div>
+                </div>
+              </div>
+            </div>
+          </td>
+          <td height="100%" width="100%">
+            <!-- Content -->
+            <div class="wiki-content">{% block content %}{% endblock %}</div>
+            <!-- Content -->
+          </td>
+        </tr>
+      </table>
+   </td>
+   <td id="cell-2-2" colspan="2">&nbsp;</td>
+  </tr>
+  <tr width="100%">
+   <td id="cell-3-0">&nbsp;</td>
+   <td id="cell-3-1">&nbsp;</td>
+   <td id="cell-3-2">
+     <div id="footer">
+       <!-- Footer -->
+       <div id="site-footer">
+         <a href="http://incubator.apache.org/aries/privacy-policy.html";>Privacy
+Policy</a> 
+       </div>
+       <!-- Footer -->
+     </div>
+   </td>
+   <td id="cell-3-3">&nbsp;</td>
+   <td id="cell-3-4">&nbsp;</td>
+  </tr>
+  <tr width="100%">
+    <td id="cell-4-0" colspan="2">&nbsp;</td>
+    <td id="cell-4-1">&nbsp;</td>
+    <td id="cell-4-2" colspan="2">&nbsp;</td>
+  </tr>
+</table>
+</body>
+</html> 

Added: incubator/aries/branches/site/trunk/templates/standard.html_comdev
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/templates/standard.html_comdev?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/templates/standard.html_comdev (added)
+++ incubator/aries/branches/site/trunk/templates/standard.html_comdev Mon Nov 29 12:32:22 2010
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+
+    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.
+-->
+
+<html>
+    <head>
+       <META name="description" content="Apache Community Development"/>
+       <META name="keywords" content="apache, apache community, community development, opensource"/>
+
+		
+	   <META http-equiv="Content-Type" content="text/html; charset=utf-8">
+   	   <LINK rel="stylesheet" href="style/compressed.css" type="text/css" media="screen, projection">
+       <LINK rel="stylesheet" href="style/style.css" type="text/css" media="screen, projection">
+	   <style type="text/css">
+.code {
+	border: 1px dashed #3c78b5;
+	font-size: 11px;
+	font-family: Courier;
+	margin: 10px;
+	margin-left: 0px;
+	line-height: 13px;
+}
+.codeHeader {
+	background-color: #f0f0f0;
+	border-bottom: 1px dashed #3c78b5;
+	padding: 3px;
+	text-align: center;
+}
+.codeContent {
+	text-align: left;
+	background-color: #f0f0f0;
+	padding: 3px;
+}
+
+.preformatted {
+	border: 1px dashed #3c78b5;
+	font-size: 11px;
+	font-family: Courier;
+	margin: 10px;
+	line-height: 13px;
+}
+.preformattedHeader {
+	background-color: #f0f0f0;
+	border-bottom: 1px dashed #3c78b5;
+	padding: 3px;
+	text-align: center;
+}
+.preformattedContent {
+	background-color: #f0f0f0;
+	padding: 3px;
+}
+        </style>
+
+        <LINK rel="SHORTCUT ICON" href="/images/favicon.ico">   
+        <TITLE>Apache Community Development - {% block title %}{% endblock %}</TITLE>
+    </head>
+
+    <body onload="init()">
+    	<div class="container">
+    	<HR class="space col">
+    	<DIV class="block">
+    		<DIV class="column span-24">
+            <DIV id="header">
+                <h1>The Apache Software Foundation<BR />
+                <SPAN class="alt"><small>Meritocracy in Action.</small></SPAN></h1>
+             </DIV>
+          </DIV>
+    	</DIV>
+    	<HR/>
+
+
+        <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+            <TR class="topBar">
+                <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                    &nbsp;{{ breadcrumbs|safe }}
+                </td>
+                <td align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+                    <A href="http://community.apache.org">Apache Community Development</A> | <A href="http://mail-archives.apache.org/mod_mbox/community-dev/">Mailling List</A>
+                </td>
+            </TR>
+        </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%">
+            <TR>
+                <td align="left" valign="top">
+                  <DIV id="PageContent">        
+                     <DIV class="pagecontent">
+                         <DIV class="wiki-content">
+                          {% block content %}{% endblock %}
+                         </DIV>
+                     </DIV>
+                  </DIV>
+                </td>
+            </TR>
+        </TABLE>
+
+        <DIV class="footer">
+            Copyright © 2003-2009, The Apache Software Foundation&nbsp;&nbsp;
+        </DIV>
+
+    </BODY>
+</HTML>

Added: incubator/aries/branches/site/trunk/templates/standard_markdown.html
URL: http://svn.apache.org/viewvc/incubator/aries/branches/site/trunk/templates/standard_markdown.html?rev=1040087&view=auto
==============================================================================
--- incubator/aries/branches/site/trunk/templates/standard_markdown.html (added)
+++ incubator/aries/branches/site/trunk/templates/standard_markdown.html Mon Nov 29 12:32:22 2010
@@ -0,0 +1,3 @@
+{% extends "standard.html" %}
+{% block title %}{{ headers.title }}{% endblock %}
+{% block content %}{{ content|markdown }}{% endblock %}



Mime
View raw message