incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1308967 - in /sling/whiteboard/cwiki-to-svn: ./ README pom.xml template/camel.cfg template/sling.cfg template/template.camel template/template.sling
Date Tue, 03 Apr 2012 15:04:07 GMT
Author: bdelacretaz
Date: Tue Apr  3 15:04:06 2012
New Revision: 1308967

URL: http://svn.apache.org/viewvc?rev=1308967&view=rev
Log:
Experimenting with cwiki-to-svn rendering - page fetching and render works (no style yet)

Added:
    sling/whiteboard/cwiki-to-svn/template/sling.cfg
    sling/whiteboard/cwiki-to-svn/template/template.sling
      - copied, changed from r1308955, sling/whiteboard/cwiki-to-svn/template/template.camel
Removed:
    sling/whiteboard/cwiki-to-svn/template/camel.cfg
    sling/whiteboard/cwiki-to-svn/template/template.camel
Modified:
    sling/whiteboard/cwiki-to-svn/   (props changed)
    sling/whiteboard/cwiki-to-svn/README
    sling/whiteboard/cwiki-to-svn/pom.xml

Propchange: sling/whiteboard/cwiki-to-svn/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr  3 15:04:06 2012
@@ -0,0 +1,11 @@
+target
+content
+bin
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml

Modified: sling/whiteboard/cwiki-to-svn/README
URL: http://svn.apache.org/viewvc/sling/whiteboard/cwiki-to-svn/README?rev=1308967&r1=1308966&r2=1308967&view=diff
==============================================================================
--- sling/whiteboard/cwiki-to-svn/README (original)
+++ sling/whiteboard/cwiki-to-svn/README Tue Apr  3 15:04:06 2012
@@ -1,14 +1,18 @@
+= Experimenting with Camel's cwiki-to-svn tools for Sling. =
 
-This is the start of an export utility to export the CAMEL
-confluence spaces to the sites.    To run this manually, you need to 
-have a copy of the CAMEL website checked out to a local directory:
+To test this use
 
-////TBD 
-////svn checkout https://svn-master.apache.org/repos/infra/websites/production/camel/content
+  mvn clean install exec:java
 
-Build:
-mvn install
+Which downloads and renders the SLINGxSITE cwiki pages to
+the content folder.
 
+When prompted, enter valid cwiki credentials.
+
+Running several times only renders modified pages (unless flags
+force something else, see main method).
+
+= Optional configs =
 You will need to pass credentials for a valid confluence user.  This can be
 done in one of two ways:
 
@@ -31,11 +35,3 @@ should appear in /path/to/content/
 In the confluence profile above, you could add a property like:
    <camel.site.output>/path/to/content</camel.site.output>
 to simplify passing that into the command.
-
-When you commit any changes in the content directory, the changes 
-should be "live" fairly quickly due to the svnpubsub process.
-
-
-
-
-

Modified: sling/whiteboard/cwiki-to-svn/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/cwiki-to-svn/pom.xml?rev=1308967&r1=1308966&r2=1308967&view=diff
==============================================================================
--- sling/whiteboard/cwiki-to-svn/pom.xml (original)
+++ sling/whiteboard/cwiki-to-svn/pom.xml Tue Apr  3 15:04:06 2012
@@ -91,7 +91,7 @@
                             <argument>${svn.arg1}</argument>
                             <argument>${svn.arg2}</argument>
                             <!--argument>-force</argument-->
-                            <argument>${basedir}/template/camel.cfg</argument>
+                            <argument>${basedir}/template/sling.cfg</argument>
                         </arguments>
                     </configuration>
                 </plugin>

Added: sling/whiteboard/cwiki-to-svn/template/sling.cfg
URL: http://svn.apache.org/viewvc/sling/whiteboard/cwiki-to-svn/template/sling.cfg?rev=1308967&view=auto
==============================================================================
--- sling/whiteboard/cwiki-to-svn/template/sling.cfg (added)
+++ sling/whiteboard/cwiki-to-svn/template/sling.cfg Tue Apr  3 15:04:06 2012
@@ -0,0 +1,7 @@
+spaceKey:SLINGxSITE
+pageCacheFile:cache/main.pageCache
+templateName:template/template.sling
+outputDir:/
+globalPages:Navigation
+mainDivClass:main
+breadCrumbRoot:Apache Sling

Copied: sling/whiteboard/cwiki-to-svn/template/template.sling (from r1308955, sling/whiteboard/cwiki-to-svn/template/template.camel)
URL: http://svn.apache.org/viewvc/sling/whiteboard/cwiki-to-svn/template/template.sling?p2=sling/whiteboard/cwiki-to-svn/template/template.sling&p1=sling/whiteboard/cwiki-to-svn/template/template.camel&r1=1308955&r2=1308967&rev=1308967&view=diff
==============================================================================
--- sling/whiteboard/cwiki-to-svn/template/template.camel (original)
+++ sling/whiteboard/cwiki-to-svn/template/template.sling Tue Apr  3 15:04:06 2012
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,118 +18,19 @@
 -->
 <html>
 <head>
-    <link href="http://camel.apache.org/styles/site.css" rel="stylesheet" type="text/css">
-    <link href="http://camel.apache.org/styles/type-settings.css" rel="stylesheet" type="text/css">
-    <script src="http://camel.apache.org/styles/prototype.js" type="text/javascript"></script>
-    <script src="http://camel.apache.org/styles/rico.js" type="text/javascript"></script>
   
-    <script src="http://camel.apache.org/styles/site.js" type="text/javascript"></script>
-
-    <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-
-    <style type="text/css">
-      .maincontent { overflow:hidden; }
-    </style>
-    <!--[if IE]>
-    <style type="text/css">
-      .maincontent { width:100%; }
-    </style>
-    <![endif]-->
-
-    <title>
-    Apache Camel: $page.title
-    </title>
+    <title>Apache Sling: $page.title</title>
 </head>
 <body>
-<div class="white_box">
-<div class="header">
-  <div class="header_l">
-    <div class="header_r">
-    </div>
-  </div>
-</div>
-<div class="content">
-  <div class="content_l">
-    <div class="content_r">
-      <div>
-          <!-- Banner -->
-#set($content = $exporter.getPageContent("Banner", "banner-content"))
-$content
-          <!-- Banner -->
-        <div class="top_red_bar">
-          <div id="site-breadcrumbs">
-                <!-- Breadcrumbs -->
-#set($content = $exporter.breadcrumbs($page))
-$content
-          </div>
-          <!-- Quicklinks -->
-#set($content = $exporter.getPageContent("QuickLinks", "site-quicklinks"))
-$content
-          <!-- Quicklinks -->
-        </div>
 
-	<table border="0">
-	<tbody>
-        <tr>
-        <td valign="top" width="100%">
-#set($content = $page.getContent())
-$content
-        </td>
-        <td valign="top">
-          <div class="navigation">
-            <div class="navigation_top">
-                <!-- NavigationBar -->
+<div class="navigation" style="float:right">
 #set($content = $exporter.getPageContent("Navigation", "navigation_bottom", "navigation_bottom"))
 $content
-                <!-- NavigationBar -->
-            </div>
-          </div>
-        </td>
-        </tr>
-	</tbody>
-        </table>
-
-
-        <div class="bottom_red_bar"></div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="black_box">
-<div class="footer">
-  <div class="footer_l">
-    <div class="footer_r">
-      <div>
-        <a href="$base/privacy-policy.html">Privacy Policy</a> -
-        (<a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a>)

-      </div>
-    </div>
-  </div>
 </div>
-</div>
-</div>
-<div class="design_attribution">
-&copy; 2004-2011 The Apache Software Foundation.
-<br>          
-Apache Camel, Camel, Apache, the Apache feather logo, and the Apache Camel project logo are
trademarks of The Apache Software Foundation.  All other marks mentioned may be trademarks
or registered trademarks of their respective owners.
-<br>
-<a href="http://hiramchirino.com">Graphic Design By Hiram</a>
-</div>
-
-<!-- Camel committers that would like access to the Analytics, send a note to private@camel.apache.org
-->
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-25976253-1']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
 
+<div class="content">
+#set($content = $page.getContent())
+$content
+</div>
 </body>
 </html>
 



Mime
View raw message