Author: buildbot
Date: Tue Jul  1 14:09:38 2014
New Revision: 914601

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    
websites/staging/sling/trunk/content/documentation/development/ide-tooling.html
    websites/staging/sling/trunk/content/downloads.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jul  1 14:09:38 2014
@@ -1 +1 @@
-1607084
+1607087

Modified: 
websites/staging/sling/trunk/content/documentation/development/ide-tooling.html
==============================================================================
--- 
websites/staging/sling/trunk/content/documentation/development/ide-tooling.html 
(original)
+++ 
websites/staging/sling/trunk/content/documentation/development/ide-tooling.html 
Tue Jul  1 14:09:38 2014
@@ -125,41 +125,57 @@ Installation</p>
 <p>All changes performed in the local workspace are synchronized to the 
repository, given that they are included in the workspace filter definition.</p>
 <h3 id="creating-a-new-content-project">Creating a new content project</h3>
 <p>Creating a new Sling content project is easily done by using the new Sling 
Content Project Wizard. To kick off, start by selected File -&gt; New -&gt; 
Project and select Sling Content Project under the Sling category.</p>
+<p><img alt="New content project step 1" 
src="ide-tooling/new-content-project-step-1.png" /></p>
 <p>You will then be asked to name the project and select its location.</p>
+<p><img alt="New content project step 2" 
src="ide-tooling/new-content-project-step-2.png" /></p>
 <p>Finally, you can select whether to add the project to an existing server or 
create a new one.</p>
+<p><img alt="New content project step 3" 
src="ide-tooling/new-content-project-step-3.png" /></p>
 <p>Once you press finish, the project will be created and deployed to the 
server.</p>
 <h3 id="converting-existing-projects">Converting existing projects</h3>
 <p>To mark a project as being a Sling content module, click it in the Project 
Explorer and Select Configure -&gt; Convert to Sling Content Project... . A 
dialog will pop up and will ask you to confirm the inferred location of the 
jcr_root directory. You can also change this from the project properties, the 
Sling page.</p>
 <h3 id="content-navigator">Content navigator</h3>
 <p>In the Project Explorer view there is an additional 'jcr_root' contribution 
to the project. It is denoted by a folder icon with a small web overlay. This 
contribution provides a logical view over the repository content, taking into 
account JCR metadata. As such, .content.xml files will be folded into the 
corresponding node.</p>
+<p><img alt="Content navigator" src="ide-tooling/content-navigator.png" /></p>
 <p>Node properties can be edited in a distinct JCR properties view.</p>
+<p><img alt="JCR properties" src="ide-tooling/jcr-properties.png" /></p>
 <h3 id="filterxml-workspace-filter-definition">filter.xml - workspace filter 
definition</h3>
 <p>A content project does not synchronize all its contents to the workspace. 
Instead, it looks for a filter.xml file which defines which content is included 
in synchronization operations. More information about the filter.xml file 
format and semantics can be found at <a 
href="https://jackrabbit.apache.org/filevault/filter.html";>FileVault docs - 
Workspace Filter</a>.</p>
 <h3 id="deploying-projects-on-the-server">Deploying projects on the server</h3>
 <p>To deploy a project on the server, open the Servers view and use the Add 
and Remove... dialog to add one or more modules.</p>
+<p><img alt="Add and Remove projects from server" 
src="ide-tooling/add-remove-projects.png" /></p>
 <p>After content projects are deployed, each change will cause the changed 
resources to be updated in the repository.</p>
 <h3 id="manual-content-sync">Manual content sync</h3>
 <p>It is possible to manually import/export content from/to the repository. 
The precondition is that the content project must be associated with a started 
Sling launchpad server. The actions are available on the project root, or on 
any child resource under the jcr_root folder.</p>
 <p>The export wizard is available under the Sling -&gt; Export Content ... 
action.</p>
-<p>The import wizard is available under the Sling -&gt; Export Content ... 
action.</p>
+<p><img alt="Repository export" src="ide-tooling/repository-export.png" /></p>
+<p>The import wizard is available under the Sling -&gt; Import Content ... 
action.</p>
+<p><img alt="Repository import" src="ide-tooling/repository-import.png" /></p>
 <h2 id="bundle-sync">Bundle sync</h2>
 <p>The only requirement for bundle projects is that they are Java projects 
which generate an exploded OSGi bundle in their output directory. That requires 
at least a valid OSGi Manifest located in META-INF/MANIFEST.MF, but typically 
one of more Java classes. Other auxiliary files, such as Declarative Service 
descriptors, must also be placed under the project's output directory.</p>
 <h3 id="creating-a-new-bundle-project">Creating a new bundle project</h3>
 <p>Creating a new Sling bundle project is easily done by using the new Sling 
Bundle Project Wizard. This wizard is only available when the Maven-based 
integration is installed. To kick off, start by selected File -&gt; New -&gt; 
Project and select Sling Bundle Project under the Sling category.</p>
+<p><img alt="New bundle project step 1" 
src="ide-tooling/new-bundle-project-step-1.png" /></p>
 <p>The next page allows you to select the archetype to use. It's recommended 
to select the latest version of the archetype.</p>
+<p><img alt="New bundle project step 2" 
src="ide-tooling/new-bundle-project-step-2.png" /></p>
 <p>You will be asked to configure the archetype's properties.</p>
+<p><img alt="New bundle project step 3" 
src="ide-tooling/new-bundle-project-step-3.png" /></p>
 <p>Finally, you can select whether to add the project to an existing server or 
create a new one.</p>
+<p><img alt="New bundle project step 4" 
src="ide-tooling/new-bundle-project-step-4.png" /></p>
 <p>Once you press finish, the project will be created and deployed to the 
server.</p>
 <h3 id="converting-existing-projects_1">Converting existing projects</h3>
 <p>To mark a project as being a Sling bundle module, right click it in the 
Project Explorer and Select Configure -&gt; Convert to Sling Bundle Project... 
. A dialog will appear with all the candidate Sling bundle project from the 
workspace so that you can quickly select multiple projects.</p>
 <h3 id="deploying-projects-on-the-server_1">Deploying projects on the 
server</h3>
 <p>To deploy a project on the server, open the Servers view and use the Add 
and Remove... dialog to add one or more modules.</p>
+<p><img alt="Add and Remove projects from server" 
src="ide-tooling/add-remove-projects.png" /></p>
 <p>After OSGi bundle projects are deployed, each change will cause the bundle 
to be redeployed on the server.</p>
 <h2 id="troubleshooting">Troubleshooting</h2>
 <h3 id="gathering-debug-information">Gathering debug information</h3>
 <p>All operations that are performed on the Sling launchpad are logged in the 
Sling console. To view these operations, open the Eclipse console view and 
select Open Console -&gt; Sling Console.</p>
+<p><img alt="Sling Console" src="ide-tooling/sling-console.png" /></p>
 <p>Additional information can be obtained by enabling the Eclipse platform 
tracing facility. To do so, open the Eclipse preferences and navigate to 
General -&gt; Tracing. Make sure that 'Enable tracing' is checked and all 
options under 'Sling IDE Tooling' are enabled.</p>
-<p>Why do I get an errror about "No DS descriptor found at..."?</p>
+<p><img alt="Tracing" src="ide-tooling/tracing.png" /></p>
+<h3 id="why-do-i-get-an-errror-about-no-ds-descriptor-found-at">Why do I get 
an errror about "No DS descriptor found at..."?</h3>
+<p><img alt="Missing SCR descriptors" 
src="ide-tooling/missing-scr-descriptors.png" /></p>
 <p>Bundle deployment assumes that the OSGi bundle is packaged into the 
project's output directory. This includes:</p>
 <ul>
 <li>the manifest</li>
@@ -168,7 +184,7 @@ Installation</p>
 <li>Declarative Services descriptors</li>
 </ul>
 <p>One often-occuring situation is that a Maven project using the 
maven-scr-plugin generates the descriptors outside of target/classes, typically 
in target/scr-plugin-generated. To fix this, make sure that you're using the 
maven-scr-plugin 1.15.0 or newer and that you have not set a custom 
outputDirectory.</p>
-<h1 id="known-issues">Known issues</h1>
+<h2 id="known-issues">Known issues</h2>
 <p>The content sync implementation tries to mimic the FileVault semantics as 
closely as possible. However, it is possible that some more exotic content 
structures will not be handled properly. Some of the problems we're are of 
are:</p>
 <ul>
 <li><a href="https://issues.apache.org/jira/browse/SLING-3586";>SLING-3586 - 
Publishing content fails if intermediate nodes are not present in the 
repository</a> . The workaround is to manually create the missing nodes in the 
repository .</li>
@@ -177,7 +193,7 @@ Installation</p>
 <li><a href="https://issues.apache.org/jira/browse/SLING-3644";>SLING-3644 - 
Improve handling of binary properties outside nt:file file nodes</a> . 
Currently there is no workaround, but in practice this is not an 
often-encountered situation.</li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1607078 by rombert on Tue, 1 Jul 2014 13:46:09 +0000
+        Rev. 1607087 by rombert on Tue, 1 Jul 2014 14:09:25 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

Modified: websites/staging/sling/trunk/content/downloads.html
==============================================================================
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Tue Jul  1 14:09:38 2014
@@ -200,8 +200,8 @@ incubator releases of Apache Sling, have
 <tr>
 <th>Artifact</th>
 <th>Version</th>
+<th>Provides</th>
 <th>Online update site</th>
-<th>Zipped update site</th>
 </tr>
 </thead>
 <tbody>


Reply via email to