jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r1672139 - in /jackrabbit/site/trunk: README.md pom.xml src/site/resources/.htaccess src/site/resources/oak/ src/site/site.xml
Date Wed, 08 Apr 2015 18:49:04 GMT
Author: tripod
Date: Wed Apr  8 18:49:04 2015
New Revision: 1672139

URL: http://svn.apache.org/r1672139
Log:
JCR-3865 Use markdown to generate Jackrabbit Site

Added:
    jackrabbit/site/trunk/src/site/resources/.htaccess
Removed:
    jackrabbit/site/trunk/src/site/resources/oak/
Modified:
    jackrabbit/site/trunk/README.md
    jackrabbit/site/trunk/pom.xml
    jackrabbit/site/trunk/src/site/site.xml

Modified: jackrabbit/site/trunk/README.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/README.md?rev=1672139&r1=1672138&r2=1672139&view=diff
==============================================================================
--- jackrabbit/site/trunk/README.md (original)
+++ jackrabbit/site/trunk/README.md Wed Apr  8 18:49:04 2015
@@ -15,8 +15,6 @@
    limitations under the License.
   -->
 
-**WORK IN PROGRESS**
-
 Jackrabbit Site Generation
 ==========================
 The Jackrabbit site lives as Markdown files in `src/site/markdown` such
@@ -37,7 +35,7 @@ can be used to build and deploy a web si
    $ mvn site-deploy
    ````
 
-4. Finally review the site at `http://jackrabbit.apache.org/index.html`.
+4. Finally review the site at `http://jackrabbit.apache.org/`.
 
 
 Note: To skip the final commit use `-Dscmpublish.skipCheckin=true`. You can then
@@ -46,4 +44,7 @@ up with `svn commit` manually.
 
 Note: Every committer should be able to deploy the site. No fiddling with
 credentials needed since deployment is done via svn commit to
-`https://svn.apache.org/repos/asf/jackrabbit/site/live/JCR`.
+`https://svn.apache.org/repos/asf/jackrabbit/site/live`.
+
+Note: The current scm-publish plugin can't exclude the some scm paths properly, that is why
the checkout takes some
+time.
\ No newline at end of file

Modified: jackrabbit/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/pom.xml?rev=1672139&r1=1672138&r2=1672139&view=diff
==============================================================================
--- jackrabbit/site/trunk/pom.xml (original)
+++ jackrabbit/site/trunk/pom.xml Wed Apr  8 18:49:04 2015
@@ -51,15 +51,26 @@
     <!-- ====================================================================== -->
     <build>
         <plugins>
+            <!-- ======================================================================
-->
+            <!-- S I T E    P L U G I N                                              
  -->
+            <!-- ======================================================================
-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.3</version>
                 <configuration>
+                    <skipDeploy>true</skipDeploy>
                     <generateReports>true</generateReports>
                     <skip>false</skip>
                     <relativizeDecorationLinks>false</relativizeDecorationLinks>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-module-markdown</artifactId>
+                        <version>1.5</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -79,8 +90,14 @@
                     <checkinComment>@trivial: Site checkin for project ${project.name}-${project.version}
                     </checkinComment>
                     <ignorePathsToDelete>
-                        <ignorePathToDelete>apidocs</ignorePathToDelete>
+                        <ignorePathToDelete>analytics/**</ignorePathToDelete>
+                        <ignorePathToDelete>api/**</ignorePathToDelete>
+                        <ignorePathToDelete>api-1/**</ignorePathToDelete>
+                        <ignorePathToDelete>dev/**</ignorePathToDelete>
+                        <ignorePathToDelete>filevault/**</ignorePathToDelete>
+                        <ignorePathToDelete>oak/**</ignorePathToDelete>
                     </ignorePathsToDelete>
+                    <excludes>analytics,api,api-1,dev,filevault,oak</excludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -133,7 +150,7 @@
     <distributionManagement>
         <site>
             <id>jackrabbit.site-deploy</id>
-            <url>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/site/live/JCR</url>
+            <url>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/site/staging-test</url>
         </site>
     </distributionManagement>
 

Added: jackrabbit/site/trunk/src/site/resources/.htaccess
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/resources/.htaccess?rev=1672139&view=auto
==============================================================================
--- jackrabbit/site/trunk/src/site/resources/.htaccess (added)
+++ jackrabbit/site/trunk/src/site/resources/.htaccess Wed Apr  8 18:49:04 2015
@@ -0,0 +1,8 @@
+RewriteEngine on
+RewriteBase /
+
+DirectoryIndex index.html
+
+RewriteRule ^index.html        http://jackrabbit.apache.org/ [R,L]
+RewriteRule ^faq.html          http://jackrabbit.apache.org/frequently-asked-questions.html
[R,L]
+RewriteRule ^downloads.cgi     http://jackrabbit.apache.org/downloads.html [R,L]

Modified: jackrabbit/site/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/site.xml?rev=1672139&r1=1672138&r2=1672139&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/site.xml (original)
+++ jackrabbit/site/trunk/src/site/site.xml Wed Apr  8 18:49:04 2015
@@ -21,6 +21,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"
          name="Apache Jackrabbit">
+    <version position="none"/>
     <body>
         <menu name="Apache Jackrabbit">
             <item name="Welcome" href="index.html"/>
@@ -65,7 +66,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </skin>
 
     <custom>



Mime
View raw message