Author: fmeschbe
Date: Thu Nov 8 00:09:01 2007
New Revision: 593052
URL: http://svn.apache.org/viewvc?rev=593052&view=rev
Log:
SLING-83 Package reorgnaization and SLING-98 API adoption
(wrong packaging ...)
Added:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/
- copied from r593046,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileComponent.java
- copied, changed from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileComponent.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileObject.java
- copied, changed from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileObject.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderComponent.java
- copied, changed from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderComponent.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderObject.java
- copied, changed from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderObject.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/HierarchyNodeObject.java
- copied, changed from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/HierarchyNodeObject.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceComponent.java
- copied, changed from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceComponent.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceObject.java
- copied, changed from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceObject.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceComponent.java
- copied, changed from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceComponent.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceObject.java
- copied, changed from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceObject.java
Removed:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileContent.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderContent.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/HierarchyContent.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceContent.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceContent.java
Modified:
incubator/sling/trunk/sling/servlets-standard/pom.xml
Modified: incubator/sling/trunk/sling/servlets-standard/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/pom.xml?rev=593052&r1=593051&r2=593052&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-standard/pom.xml (original)
+++ incubator/sling/trunk/sling/servlets-standard/pom.xml Thu Nov 8 00:09:01
2007
@@ -92,13 +92,6 @@
<artifactId>org.apache.sling.api</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.core</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- </dependency>
--->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
Copied:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileComponent.java
(from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileComponent.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileComponent.java?p2=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileComponent.java&p1=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileComponent.java&r1=593051&r2=593052&rev=593052&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileComponent.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileComponent.java
Thu Nov 8 00:09:01 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.servlets.standard;
+package org.apache.sling.servlets.standard;
import java.io.IOException;
@@ -56,7 +56,8 @@
}
// just render the child content
- Resource jcrContent =
request.getResourceResolver().getResource(resource, "jcr:content");
+ Resource jcrContent = request.getResourceResolver().getResource(
+ resource, "jcr:content");
if (jcrContent != null) {
RequestDispatcher rd = request.getRequestDispatcher(jcrContent);
rd.include(request, response);
Copied:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileObject.java
(from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileObject.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileObject.java?p2=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileObject.java&p1=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileObject.java&r1=593051&r2=593052&rev=593052&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileObject.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileObject.java
Thu Nov 8 00:09:01 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.servlets.standard;
+package org.apache.sling.servlets.standard;
/**
* The <code>FileObject</code> class represents an nt:file node in the
@@ -25,14 +25,4 @@
*/
public class FileObject extends HierarchyNodeObject {
- /** @ocm.bean jcrName="jcr:content" */
- private Object content;
-
- public void setContent(Object content) {
- this.content = content;
- }
-
- public Object getContent() {
- return content;
- }
}
Copied:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderComponent.java
(from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderComponent.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderComponent.java?p2=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderComponent.java&p1=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderComponent.java&r1=593051&r2=593052&rev=593052&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderComponent.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderComponent.java
Thu Nov 8 00:09:01 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.servlets.standard;
+package org.apache.sling.servlets.standard;
import java.io.IOException;
import java.io.PrintWriter;
Copied:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderObject.java
(from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderObject.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderObject.java?p2=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderObject.java&p1=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderObject.java&r1=593051&r2=593052&rev=593052&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderObject.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderObject.java
Thu Nov 8 00:09:01 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.servlets.standard;
+package org.apache.sling.servlets.standard;
/**
* The <code>FolderObject</code> TODO
Copied:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/HierarchyNodeObject.java
(from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/HierarchyNodeObject.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/HierarchyNodeObject.java?p2=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/HierarchyNodeObject.java&p1=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/HierarchyNodeObject.java&r1=593051&r2=593052&rev=593052&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/HierarchyNodeObject.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/HierarchyNodeObject.java
Thu Nov 8 00:09:01 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.servlets.standard;
+package org.apache.sling.servlets.standard;
import org.apache.sling.jcr.resource.AbstractMappedObject;
Copied:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceComponent.java
(from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceComponent.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceComponent.java?p2=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceComponent.java&p1=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceComponent.java&r1=593051&r2=593052&rev=593052&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceComponent.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceComponent.java
Thu Nov 8 00:09:01 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.servlets.standard;
+package org.apache.sling.servlets.standard;
import java.io.IOException;
Copied:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceObject.java
(from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceObject.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceObject.java?p2=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceObject.java&p1=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceObject.java&r1=593051&r2=593052&rev=593052&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceObject.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceObject.java
Thu Nov 8 00:09:01 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.servlets.standard;
+package org.apache.sling.servlets.standard;
import org.apache.sling.jcr.resource.AbstractMappedObject;
Copied:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceComponent.java
(from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceComponent.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceComponent.java?p2=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceComponent.java&p1=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceComponent.java&r1=593051&r2=593052&rev=593052&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceComponent.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceComponent.java
Thu Nov 8 00:09:01 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.servlets.standard;
+package org.apache.sling.servlets.standard;
import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED;
import static
org.apache.sling.api.servlets.HttpConstants.HEADER_IF_MODIFIED_SINCE;
Copied:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceObject.java
(from r593051,
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceObject.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceObject.java?p2=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceObject.java&p1=incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceObject.java&r1=593051&r2=593052&rev=593052&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceObject.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceObject.java
Thu Nov 8 00:09:01 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.servlets.standard;
+package org.apache.sling.servlets.standard;
import javax.jcr.Value;
