Author: cziegeler
Date: Wed Apr 22 06:20:35 2009
New Revision: 767389
URL: http://svn.apache.org/viewvc?rev=767389&view=rev
Log:
Fix fsresource provider and sling plugin after recent refactorings.
Modified:
incubator/sling/trunk/bundles/extensions/fsresource/pom.xml
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
Modified: incubator/sling/trunk/bundles/extensions/fsresource/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=767389&r1=767388&r2=767389&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ incubator/sling/trunk/bundles/extensions/fsresource/pom.xml Wed Apr 22
06:20:35 2009
@@ -55,7 +55,7 @@
<configuration>
<instructions>
<Private-Package>
- org.apache.sling.fsprovider.*
+ org.apache.sling.fsprovider.internal
</Private-Package>
</instructions>
</configuration>
Modified:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?rev=767389&r1=767388&r2=767389&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
(original)
+++
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
Wed Apr 22 06:20:35 2009
@@ -45,10 +45,10 @@
* and the file system path from where files and folders are mapped into the
* resource ({...@link #PROP_PROVIDER_FILE}).
*
- * @scr.component name="org.apache.sling.fsprovider.FsResourceProvider"
+ * @scr.component
name="org.apache.sling.fsprovider.internal.FsResourceProvider"
* label="%resource.resolver.name"
* description="%resource.resolver.description"
- *
factory="org.apache.sling.fsprovider.FsResourceProviderFactory"
+ *
factory="org.apache.sling.fsprovider.internal.FsResourceProviderFactory"
* @scr.service
* @scr.property name="service.description" value="Sling Filesystem Resource
* Provider"
Modified:
incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java?rev=767389&r1=767388&r2=767389&view=diff
==============================================================================
---
incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
(original)
+++
incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
Wed Apr 22 06:20:35 2009
@@ -57,7 +57,7 @@
/** Header containing the sling initial content information. */
private static final String HEADER_INITIAL_CONTENT =
"Sling-Initial-Content";
/** The fs resource provider factory. */
- private static final String FS_FACTORY =
"org.apache.sling.fsprovider.FsResourceProvider";
+ private static final String FS_FACTORY =
"org.apache.sling.fsprovider.internal.FsResourceProvider";
/** Mime type for json response. */
private static final String JSON_MIME_TYPE = "application/json";
/** Http header for content type. */