You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2007/11/08 08:24:43 UTC
svn commit: r593046 - in /incubator/sling/trunk/sling/servlets-standard: ./
src/main/java/org/apache/sling/component/servlets/
src/main/java/org/apache/sling/component/servlets/standard/
src/main/java/org/apache/sling/component/standard/
Author: fmeschbe
Date: Wed Nov 7 23:24:40 2007
New Revision: 593046
URL: http://svn.apache.org/viewvc?rev=593046&view=rev
Log:
SLING-83 Package reorgnaization and SLING-98 API adoption (work in progress)
Added:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/
- copied from r593045, incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/standard/
Removed:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/standard/
Modified:
incubator/sling/trunk/sling/servlets-standard/pom.xml
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/component/servlets/standard/FileContent.java
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/component/servlets/standard/FolderContent.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/HierarchyContent.java
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/component/servlets/standard/ReferenceContent.java
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/component/servlets/standard/ResourceContent.java
Modified: incubator/sling/trunk/sling/servlets-standard/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/pom.xml?rev=593046&r1=593045&r2=593046&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-standard/pom.xml (original)
+++ incubator/sling/trunk/sling/servlets-standard/pom.xml Wed Nov 7 23:24:40 2007
@@ -28,7 +28,7 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <artifactId>sling-component-standard</artifactId>
+ <artifactId>org.apache.sling.servlets.standard</artifactId>
<packaging>bundle</packaging>
<version>2.0.0-incubator-SNAPSHOT</version>
@@ -40,13 +40,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/component-standard
+ scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/sling/servlets-standard
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/component-standard
+ scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/servlets-standard
</developerConnection>
<url>
- http://svn.apache.org/viewvc/incubator/sling/trunk/component-standard
+ http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard
</url>
</scm>
@@ -61,17 +61,13 @@
<artifactId>maven-jcrocm-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.component.standard
+ org.apache.sling.servlets.standard;version=${pom.version}
</Export-Package>
</instructions>
</configuration>
@@ -82,7 +78,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>sling-jackrabbit-api</artifactId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
@@ -93,17 +89,19 @@
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>sling-component-api</artifactId>
+ <artifactId>org.apache.sling.api</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>sling-core</artifactId>
+ <artifactId>org.apache.sling.core</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
+-->
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>sling-content-jcr</artifactId>
+ <artifactId>org.apache.sling.jcr.resource</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
Modified: 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/component/servlets/standard/FileComponent.java?rev=593046&r1=593045&r2=593046&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/component/servlets/standard/FileComponent.java Wed Nov 7 23:24:40 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.standard;
+package org.apache.sling.component.servlets.standard;
import java.io.IOException;
Modified: incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileContent.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileContent.java?rev=593046&r1=593045&r2=593046&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileContent.java (original)
+++ incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FileContent.java Wed Nov 7 23:24:40 2007
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.standard;
+package org.apache.sling.component.servlets.standard;
/**
* The <code>FileContent</code> class represents an nt:file node in the
* repository and as such has no more direct content data as the
- * {@link HierarchyContent}.
+ * {@link HierarchyNodeObject}.
*
* @ocm.mapped jcrType="nt:file" discriminator="false"
*/
-public class FileContent extends HierarchyContent {
+public class FileContent extends HierarchyNodeObject {
// --------- Content interface ---------------------------------------------
Modified: 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/component/servlets/standard/FolderComponent.java?rev=593046&r1=593045&r2=593046&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/component/servlets/standard/FolderComponent.java Wed Nov 7 23:24:40 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.standard;
+package org.apache.sling.component.servlets.standard;
import java.io.IOException;
import java.io.PrintWriter;
Modified: incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderContent.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderContent.java?rev=593046&r1=593045&r2=593046&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderContent.java (original)
+++ incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/FolderContent.java Wed Nov 7 23:24:40 2007
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.standard;
+package org.apache.sling.component.servlets.standard;
/**
* The <code>FolderContent</code> TODO
*
* @ocm.mapped jcrType="nt:folder" discriminator="false"
*/
-public class FolderContent extends HierarchyContent {
+public class FolderContent extends HierarchyNodeObject {
// --------- Content interface ---------------------------------------------
Modified: incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/HierarchyContent.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/HierarchyContent.java?rev=593046&r1=593045&r2=593046&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/HierarchyContent.java (original)
+++ incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/HierarchyContent.java Wed Nov 7 23:24:40 2007
@@ -14,18 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.standard;
-
-import org.apache.sling.core.content.SelectableSimpleContent;
+package org.apache.sling.component.servlets.standard;
/**
- * The <code>HierarchyContent</code> class is an abstract base content class
+ * The <code>HierarchyNodeObject</code> class is an abstract base content class
* for content loaded from nodes of (extensions of) node type
* <code>nt:HierarchyNode</code>.
*
* @ocm.mapped jcrType="nt:hierarchyNode" discriminator="false"
*/
-public abstract class HierarchyContent extends SelectableSimpleContent {
+public abstract class HierarchyContent {
/** @ocm.field jcrName="jcr:created" */
private long creationTime;
Modified: 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/component/servlets/standard/ReferenceComponent.java?rev=593046&r1=593045&r2=593046&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/component/servlets/standard/ReferenceComponent.java Wed Nov 7 23:24:40 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.standard;
+package org.apache.sling.component.servlets.standard;
import java.io.IOException;
Modified: incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceContent.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceContent.java?rev=593046&r1=593045&r2=593046&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceContent.java (original)
+++ incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ReferenceContent.java Wed Nov 7 23:24:40 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.standard;
+package org.apache.sling.component.servlets.standard;
/**
Modified: 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/component/servlets/standard/ResourceComponent.java?rev=593046&r1=593045&r2=593046&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/component/servlets/standard/ResourceComponent.java Wed Nov 7 23:24:40 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.standard;
+package org.apache.sling.component.servlets.standard;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceContent.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceContent.java?rev=593046&r1=593045&r2=593046&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceContent.java (original)
+++ incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/component/servlets/standard/ResourceContent.java Wed Nov 7 23:24:40 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.component.standard;
+package org.apache.sling.component.servlets.standard;
import javax.jcr.Value;