- moved images from xdoc folder to site/resources, separated image generators to folder site/templates, which is not used for rendering,
- update README.txt and rename to README.md,
- fix scm url in pom.xml, update parent in pom
- fix .gitignore
fix text
diff --git a/.gitignore b/.gitignore
index 3f6abe7..707e7a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-docs
+docs/
build.properties
-target
+target/
.project
*.log*
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..20bae4a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,42 @@
+# The Turbine Website Instructions
+--------------------------------
+
+The Turbine web site is based on .xml files which are transformed
+into .html files using Maven.
+
+<http://maven.apache.org/>
+
+This is the wrapper site for the released Turbine builds. New/Changed Turbine builds should be added/updated here:
+- xdocs/index.xml
+- xdocs/news.xml
+- src/site/site.xml
+- doap/doap_Turbine.rdf
+
+
+Once you have the site checked out locally, cd into your
+turbine-site directory and execute:
+
+ mvn site
+
+This will build the documentation into the target/site/ directory. The output
+will show you which files got re-generated.
+
+If you would like to make modifications to the web site documents,
+you simply need to edit the files in the xdocs/ directory.
+
+Once you have built your documentation and confirmed that your changes are
+ok, you can check your .xml files back into Git.
+
+## Deployment
+
+To deploy the site execute:
+
+Either save the content from target/site, switch to branch asf-site, copy the saved content to the root, add missing files, commit and push the changes.
+
+Or:
+
+ mvn site site:stage
+
+ mvn scm-publish:publish-scm
+
+
diff --git a/README.txt b/README.txt
deleted file mode 100644
index bcfeebc..0000000
--- a/README.txt
+++ /dev/null
@@ -1,58 +0,0 @@
---------------------------------------------------------------------------
- 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.
---------------------------------------------------------------------------
-$Id$
---------------------------------------------------------------------------
-
-The Turbine Website Instructions
---------------------------------
-
-The Turbine web site is based on .xml files which are transformed
-into .html files using Maven.
-
-<http://maven.apache.org/>
-
-This is the wrapper site for the released Turbine builds. New/Changed Turbine builds should be added/updated here:
-- xdocs/index.xml
-- xdocs/news.xml
-- src/site/site.xml
-- doap/doap_Turbine.rdf
-
-
-Once you have the site checked out locally, cd into your
-turbine-site directory and execute:
-
-mvn site
-
-This will build the documentation into the target/site/ directory. The output
-will show you which files got re-generated.
-
-If you would like to make modifications to the web site documents,
-you simply need to edit the files in the xdocs/ directory.
-
-Once you have built your documentation and confirmed that your changes are
-ok, you can check your .xml files back into Subversion.
-
-To deploy the site execute:
-
-mvn site-deploy
-
-To do this you need an account on the people.apache.org machine!!
-
-- after deployment check/cleanup local deployment path as defined in turbine.site.cache. By default it's in user.home/turbine-sites/site.
-
diff --git a/pom.xml b/pom.xml
index 4b09b82..45eddff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>7-SNAPSHOT</version>
+ <version>9-SNAPSHOT</version>
</parent>
<groupId>org.apache.turbine</groupId>
@@ -157,8 +157,18 @@
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/turbine-site.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/turbine-site.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf/turbine-site.git</url>
+ <url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}</url>
+ <tag>HEAD</tag>
</scm>
+
+ <!-- distributionManagement required for staging to work, id and url defined in parent, adapt turbine.site.path -->
+ <distributionManagement>
+ <site>
+ <name>Turbine Wrapper Website</name>
+ <id>apache.org</id>
+ <url>https://github.com/apache/turbine-fulcrum-site/</url>
+ </site>
+ </distributionManagement>
<build>
<plugins>
diff --git a/xdocs/images/Loaders.gif b/src/site/resources/images/Loaders.gif
similarity index 100%
rename from xdocs/images/Loaders.gif
rename to src/site/resources/images/Loaders.gif
Binary files differ
diff --git a/xdocs/images/ModuleObjectLayout.gif b/src/site/resources/images/ModuleObjectLayout.gif
similarity index 100%
rename from xdocs/images/ModuleObjectLayout.gif
rename to src/site/resources/images/ModuleObjectLayout.gif
Binary files differ
diff --git a/xdocs/images/Modules.gif b/src/site/resources/images/Modules.gif
similarity index 100%
rename from xdocs/images/Modules.gif
rename to src/site/resources/images/Modules.gif
Binary files differ
diff --git a/xdocs/images/ac2004_170x100.gif b/src/site/resources/images/ac2004_170x100.gif
similarity index 100%
rename from xdocs/images/ac2004_170x100.gif
rename to src/site/resources/images/ac2004_170x100.gif
Binary files differ
diff --git a/xdocs/images/blue-logo.gif b/src/site/resources/images/blue-logo.gif
similarity index 100%
rename from xdocs/images/blue-logo.gif
rename to src/site/resources/images/blue-logo.gif
Binary files differ
diff --git a/xdocs/images/logo.gif b/src/site/resources/images/logo.gif
similarity index 100%
rename from xdocs/images/logo.gif
rename to src/site/resources/images/logo.gif
Binary files differ
diff --git a/xdocs/images/powered-by-logo.gif b/src/site/resources/images/powered-by-logo.gif
similarity index 100%
rename from xdocs/images/powered-by-logo.gif
rename to src/site/resources/images/powered-by-logo.gif
Binary files differ
diff --git a/xdocs/images/turbine-project-apache-separate.png b/src/site/resources/images/turbine-project-apache-separate.png
similarity index 100%
rename from xdocs/images/turbine-project-apache-separate.png
rename to src/site/resources/images/turbine-project-apache-separate.png
Binary files differ
diff --git a/xdocs/images/turbine-project-scaled-2500.png b/src/site/resources/images/turbine-project-scaled-2500.png
similarity index 100%
rename from xdocs/images/turbine-project-scaled-2500.png
rename to src/site/resources/images/turbine-project-scaled-2500.png
Binary files differ
diff --git a/xdocs/images/turbine-project-scaled-500-small.png b/src/site/resources/images/turbine-project-scaled-500-small.png
similarity index 100%
rename from xdocs/images/turbine-project-scaled-500-small.png
rename to src/site/resources/images/turbine-project-scaled-500-small.png
Binary files differ
diff --git a/xdocs/images/turbine-project.png b/src/site/resources/images/turbine-project.png
similarity index 100%
rename from xdocs/images/turbine-project.png
rename to src/site/resources/images/turbine-project.png
Binary files differ
diff --git a/xdocs/images/turbine-project.svg b/src/site/resources/images/turbine-project.svg
similarity index 100%
rename from xdocs/images/turbine-project.svg
rename to src/site/resources/images/turbine-project.svg
diff --git a/xdocs/images/Loaders.ai b/src/site/templates/Loaders.ai
similarity index 100%
rename from xdocs/images/Loaders.ai
rename to src/site/templates/Loaders.ai
Binary files differ
diff --git a/xdocs/images/ModuleObjectLayout.ai b/src/site/templates/ModuleObjectLayout.ai
similarity index 100%
rename from xdocs/images/ModuleObjectLayout.ai
rename to src/site/templates/ModuleObjectLayout.ai
Binary files differ
diff --git a/xdocs/images/Modules.ai b/src/site/templates/Modules.ai
similarity index 100%
rename from xdocs/images/Modules.ai
rename to src/site/templates/Modules.ai
Binary files differ
diff --git a/xdocs/images/turbine-project.afdesign b/src/site/templates/turbine-project.afdesign
similarity index 100%
rename from xdocs/images/turbine-project.afdesign
rename to src/site/templates/turbine-project.afdesign
Binary files differ
diff --git a/xdocs/images/turbine-project.png.bak b/src/site/templates/turbine-project.png.bak
similarity index 100%
rename from xdocs/images/turbine-project.png.bak
rename to src/site/templates/turbine-project.png.bak
Binary files differ
