svn commit: r1530386 - in /sling/site/trunk/content: .htaccess documentation/configuration.mdtext site/.htaccess

[dk...@apache.org]

Author: dklco
Date: Tue Oct  8 19:01:33 2013
New Revision: 1530386

URL: http://svn.apache.org/r1530386
Log:
Removing the pages media.html and plugins.html from the current and old site and all associated assets

Modified:
    sling/site/trunk/content/.htaccess
    sling/site/trunk/content/documentation/configuration.mdtext
    sling/site/trunk/content/site/.htaccess

Modified: sling/site/trunk/content/.htaccess
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/.htaccess?rev=1530386&r1=1530385&r2=1530386&view=diff
==============================================================================
--- sling/site/trunk/content/.htaccess (original)
+++ sling/site/trunk/content/.htaccess Tue Oct  8 19:01:33 2013
@@ -2,3 +2,5 @@ ErrorDocument 403 /errors/403.html
 ErrorDocument 404 /errors/404.html
 
 Redirect Permanent /downloads.html /downloads.cgi
+Redirect Permanent /media.html /
+Redirect Permanent /plugins.html /
\ No newline at end of file

Modified: sling/site/trunk/content/documentation/configuration.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/configuration.mdtext?rev=1530386&r1=1530385&r2=1530386&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/configuration.mdtext (original)
+++ sling/site/trunk/content/documentation/configuration.mdtext Tue Oct  8 19:01:33 2013
@@ -9,12 +9,12 @@ Configuration in Sling is aligned with r
    * Framework and Java system properties are available through the `BundleContext.getProperty(String)` method. These properties are provided in Sling through the Sling launcher.
    * Bundle Header values are available through the `Bundle.getHeaders()` and `Bundle.getHeaders(String)` methods. These header values are set by the bundle developer in the `META-INF/MANIFEST.MF` file. In fact, all main manifest attributes are available through these methods.
    * Components managed by the Service Component Runtime and declared in component descriptor files listed in the `Service-Component` manifest header access configuration properties through the `ComponentContext.getProperties()` method. These properties have three sources:
-      *# Configuration specified specifically for factory components
-      *# Properties retrieved from the Configuration Admin Service
-      *# Properties set in the component descriptor
+       1. Configuration specified specifically for factory components
+       2. Properties retrieved from the Configuration Admin Service
+       3. Properties set in the component descriptor
    * Configuration properties provided to `ManagedService` and `ManagedServiceFactory` instances by the Configuration Admin Service.
 
-For the discussion to follow we differentiate between intial configuration provided by Framework and system properties and managed configuration provided by the Configuration Admin Service.
+For the discussion to follow we differentiate between initial configuration provided by Framework and system properties and managed configuration provided by the Configuration Admin Service.
 
 Components managed by the Service Component Runtime are generally configured (as listed above) through the descriptor properties and configuration set by Configuration Admin Service configuration. The descriptor property values may be seen as configuration default values set by the component developer, which may be overwritten by user configuration through the Configuration Admin Service. Components may but are not required to make use of Framework properties by accessing the `BundleContext` through the `ComponentContext` given to the `activate(ComponentContext)` method of the component.
 
@@ -30,15 +30,15 @@ The Sling launcher is responsible to pro
 1. Resolve any property file inclusions. This is mainly used to resolve the correct JRE package definitions for the JRE version used.
 1. Overwrite with any properties provided by the main class or the Sling Servlet.
 1. Make sure the `sling.home` property is set defining a sensible default value if missing
-1. Load the contents of the `$\{sling.home}/sling.properties` file
+1. Load the contents of the `${sling.home}/sling.properties` file
 1. Overwrite properties with Java system properties. This step only considers system properties of the same names as properties already existing. That is, the system properties are not just copied into the properties here. Additionally this step my be omitted if the `sling.ignoreSystemProperties` property is set to `true`.
 1. Resolve any property file inclusions. This may be used to provide more configurability depending on the integration.
 1. Handle OSGi boot delegation support (see below).
-1. Resolve property references of the form `$\{propName`}
+1. Resolve property references of the form `${propName`}
 1. For each property value starting with `ontext:/` do the following, assuming the value to be an URL with scheme `context:`:
-1. * Copy the application resource to `$\{sling.home`} preserving the URL path unless such a file already exists.
-1. * Replace the property value with the path to the newly created file. The path has the form `$\{sling.home}/relpath`.
-1. Store the properties as `$\{sling.home}/sling.properties` to be re-used on next startup
+1. * Copy the application resource to `${sling.home`} preserving the URL path unless such a file already exists.
+1. * Replace the property value with the path to the newly created file. The path has the form `${sling.home}/relpath`.
+1. Store the properties as `${sling.home}/sling.properties` to be re-used on next startup
 1. Setup Bundle auto installation for the Felix Framework
 
 Using file system copies of the initial configuration and referred files, it is easy to modify this configuration without the need to unpack and repackage the web application archive.
@@ -119,7 +119,6 @@ Sometimes, especially in the Servlet Con
 *Examples*
 
 | `sling.bootdelegation.simple = com.some.package` | This setting unconditionally adds the `com.some.package` package to the `org.osgi.framework.bootdelegation` property |
-|
 | `sling.bootdelegation.class.com.some.other.Main = com.some.other` | This setting checks whether the `com.some.other.Main` class is known. If so, the `com.some.other` package is added to the `org.osgi.framework.bootdelegation` property. Otherwise the `com.some.other` package is not added - and therefore must be exported by a bundle if required for use inside the framework. |
 
 
@@ -134,7 +133,6 @@ As listed in the above section on OSGi B
 *Examples*
 
 | `sling.system.packages.simple = com.some.package` | This setting unconditionally adds the `com.some.package` package to the `org.osgi.framework.system.packages` property |
-|
 | `sling.system.packages.class.com.some.other.Main = com.some.other` | This setting checks whether the `com.some.other.Main` class is known. If so, the `com.some.other` package is added to the `org.osgi.framework.system.packages` property. Otherwise the `com.some.other` package is not added - and therefore must be exported by a bundle if required for use inside the framework. |
 
 
@@ -162,7 +160,7 @@ The following table is a collection of w
 
 | Property | Description |
 |--|--|
-| `sling.home` | Defines the file system location where Project Sling will write copies of the initial configuration. This property should also be used to define other local file system locations such as the directory to use for the Apache Felix Bundle Cache (`$\{sling.home}/felix` by default). If this property is not set it defaults to `$\{user.dir}/sling`. |
+| `sling.home` | Defines the file system location where Project Sling will write copies of the initial configuration. This property should also be used to define other local file system locations such as the directory to use for the Apache Felix Bundle Cache (`${sling.home}/felix` by default). If this property is not set it defaults to `${user.dir}/sling`. |
 | `sling.home.url` | Contains the Sling directory set in the `sling.home` property as a valid URL. This property may be used in situations where the Sling directory is required as an URL. This property is automatically set by the Sling application and may not be modified by configuration files. |
 | `sling.ignoreSystemProperties` | Whether to overwrite any configuration properties with Java system properties or not. By default this property is set to `true` by the Sling Servlet but not set by the Sling main class. The reason to set this by default in the Sling Servlet is to not induce values from the environment, which may not be appropriate in the Web Application case. |
 | `obr.repository.url` | A comma-separated list of OSGi Bundle Repository URLs. See *Important Properties* on the page [Initial Provisioning and Startup]({{ refs.launch-sling.path }}). |

Modified: sling/site/trunk/content/site/.htaccess
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/site/.htaccess?rev=1530386&r1=1530385&r2=1530386&view=diff
==============================================================================
--- sling/site/trunk/content/site/.htaccess (original)
+++ sling/site/trunk/content/site/.htaccess Tue Oct  8 19:01:33 2013
@@ -60,4 +60,6 @@ Redirect Permanent /site/manipulating-co
 Redirect Permanent /site/logging.html /documentation/development/logging.html
 Redirect Permanent /site/bundle-resources-extensionsbundleresource.html /documentation/bundles/bundle-resources-extensions-bundleresource.html
 Redirect Permanent /site/client-request-logging.html /documentation/development/client-request-logging.html
-Redirect Permanent /site/assembly.html /old-stuff/assembly.html
\ No newline at end of file
+Redirect Permanent /site/assembly.html /old-stuff/assembly.html
+Redirect Permanent /site/media.html /
+Redirect Permanent /site/plugins.html /
\ No newline at end of file