Author: fmeschbe
Date: Tue Apr 7 11:00:01 2009
New Revision: 762685
URL: http://svn.apache.org/viewvc?rev=762685&view=rev
Log:
SLING-916 move non-exported packages to internal packages and remove javadoc
configuration which will be inherited from parent pom
Added:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java
(contents, props changed)
- copied, changed from r754645,
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsFolderServlet.java
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java
(contents, props changed)
- copied, changed from r754645,
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsProviderConstants.java
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
(contents, props changed)
- copied, changed from r754645,
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResource.java
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
(contents, props changed)
- copied, changed from r754645,
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResourceProvider.java
Removed:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsFolderServlet.java
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsProviderConstants.java
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResource.java
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResourceProvider.java
Modified:
incubator/sling/trunk/bundles/extensions/fsresource/pom.xml
Modified: incubator/sling/trunk/bundles/extensions/fsresource/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=762685&r1=762684&r2=762685&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ incubator/sling/trunk/bundles/extensions/fsresource/pom.xml Tue Apr 7
11:00:01 2009
@@ -62,19 +62,6 @@
</plugin>
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>
- org.apache.sling.bundleresource
- </excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
Copied:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java
(from r754645,
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsFolderServlet.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java?p2=incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java&p1=incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsFolderServlet.java&r1=754645&r2=762685&rev=762685&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsFolderServlet.java
(original)
+++
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java
Tue Apr 7 11:00:01 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fsprovider;
+package org.apache.sling.fsprovider.internal;
import java.io.File;
import java.io.IOException;
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev Url
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java
(from r754645,
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsProviderConstants.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java?p2=incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java&p1=incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsProviderConstants.java&r1=754645&r2=762685&rev=762685&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsProviderConstants.java
(original)
+++
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java
Tue Apr 7 11:00:01 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fsprovider;
+package org.apache.sling.fsprovider.internal;
/**
* The <code>FsProviderConstants</code> interface defines public constants for
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev Url
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
(from r754645,
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResource.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java?p2=incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java&p1=incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResource.java&r1=754645&r2=762685&rev=762685&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResource.java
(original)
+++
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
Tue Apr 7 11:00:01 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fsprovider;
+package org.apache.sling.fsprovider.internal;
import java.io.File;
import java.io.FileInputStream;
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev Url
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
(from r754645,
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResourceProvider.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?p2=incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java&p1=incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResourceProvider.java&r1=754645&r2=762685&rev=762685&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/FsResourceProvider.java
(original)
+++
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
Tue Apr 7 11:00:01 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fsprovider;
+package org.apache.sling.fsprovider.internal;
import java.io.File;
import java.util.Collections;
@@ -45,7 +45,8 @@
* and the file system path from where files and folders are mapped into the
* resource ({...@link #PROP_PROVIDER_FILE}).
*
- * @scr.component label="%resource.resolver.name"
+ * @scr.component name="org.apache.sling.fsprovider.FsResourceProvider"
+ * label="%resource.resolver.name"
* description="%resource.resolver.description"
*
factory="org.apache.sling.fsprovider.FsResourceProviderFactory"
* @scr.service
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev Url
Propchange:
incubator/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
------------------------------------------------------------------------------
svn:mergeinfo =