Merge branch 'master' of https://github.com/rlogiacco/Natural
diff --git a/org.agileware.natural.update/.gitignore b/org.agileware.natural.update/.gitignore
new file mode 100644
index 0000000..45acd00
--- /dev/null
+++ b/org.agileware.natural.update/.gitignore
@@ -0,0 +1,4 @@
+/artifacts.jar
+/content.jar
+/features
+/plugins
diff --git a/org.agileware.natural.update/.project b/org.agileware.natural.update/.project
index 51f0d1b..ecb050c 100644
--- a/org.agileware.natural.update/.project
+++ b/org.agileware.natural.update/.project
@@ -1,17 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.agileware.natural.update</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.UpdateSiteBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.UpdateSiteNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.agileware.natural.update</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.UpdateSiteBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.UpdateSiteNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.agileware.natural.update/index.html b/org.agileware.natural.update/index.html
index d5311b6..1b51575 100644
--- a/org.agileware.natural.update/index.html
+++ b/org.agileware.natural.update/index.html
@@ -1,6 +1,6 @@
<html>
<head>
-<title>org.rlogiacco.eclipse.update</title>
+<title>Natural Eclipse Plugin Update Site</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style>@import url("web/site.css");</style>
<script type="text/javascript">
diff --git a/org.agileware.natural.update/site.xml b/org.agileware.natural.update/site.xml
index d66dfca..b24b418 100644
--- a/org.agileware.natural.update/site.xml
+++ b/org.agileware.natural.update/site.xml
@@ -1,7 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.rlogiacco.eclipse.bdd_0.2.0.qualifier.jar" id="org.rlogiacco.eclipse.bdd" version="0.2.0.qualifier"/>
- <feature url="features/org.rlogiacco.eclipse.bdd_0.3.1.qualifier.jar" id="org.rlogiacco.eclipse.bdd" version="0.3.1.qualifier"/>
- <feature url="features/org.rlogiacco.eclipse.bdd_0.3.2.qualifier.jar" id="org.rlogiacco.eclipse.bdd" version="0.3.2.qualifier"/>
- <feature url="features/org.rlogiacco.eclipse.bdd_0.3.3.qualifier.jar" id="org.rlogiacco.eclipse.bdd" version="0.3.3.qualifier"/>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description name="Natural" url="http://piergiuseppe82.github.com/Natural/eclipse-plugins/update">
+ Natural is a collection of Eclipse plugins to enable rich smart editing of acceptance tests using natural language definition files. It currently supports Cucumber and JBehave syntax.
+ </description>
+ <feature url="features/org.agileware.natural.cucumber.feature_0.7.2.201212070055.jar" id="org.agileware.natural.cucumber.feature" version="0.7.2.201212070055">
+ <category name="Natural"/>
+ </feature>
+ <feature url="features/org.agileware.natural.jbehave.feature_0.3.0.201212070055.jar" id="org.agileware.natural.jbehave.feature" version="0.3.0.201212070055">
+ <category name="Natural"/>
+ </feature>
+ <category-def name="Natural" label="Natural">
+ <description>
+ Rich editors for behavioral testing definition files
+ </description>
+ </category-def>
+</site>
diff --git a/org.agileware.natural.update/web/site.xsl b/org.agileware.natural.update/web/site.xsl
index 977bea8..42485ba 100644
--- a/org.agileware.natural.update/web/site.xsl
+++ b/org.agileware.natural.update/web/site.xsl
@@ -5,11 +5,11 @@
<xsl:for-each select="site">
<html>
<head>
- <title>org.rlogiacco.eclipse.update</title>
+ <title>Natural Eclipse Plugin</title>
<style>@import url("web/site.css");</style>
</head>
<body>
- <h1 class="title">org.rlogiacco.eclipse.update</h1>
+ <h1 class="title">Natural Eclipse Plugin</h1>
<p class="bodyText"><xsl:value-of select="description"/></p>
<table width="100%" border="0" cellspacing="1" cellpadding="2">
<xsl:for-each select="category-def">