svn commit: r577770 - in /incubator/sling/trunk/core/src/main/java/org/apache/sling/core: components/ components/extensions/ content/

[fm...@apache.org]

Author: fmeschbe
Date: Thu Sep 20 07:32:59 2007
New Revision: 577770

URL: http://svn.apache.org/viewvc?rev=577770&view=rev
Log:
SLING-13 ocm mappings are incorrect: replace jcrNodeType with JcrType

Modified:
    incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/AbstractRepositoryComponent.java
    incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/extensions/AbstractExtension.java
    incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/CommandContent.java
    incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/GenericContent.java
    incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/SelectableBaseContent.java
    incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/Selector.java

Modified: incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/AbstractRepositoryComponent.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/AbstractRepositoryComponent.java?rev=577770&r1=577769&r2=577770&view=diff
==============================================================================
--- incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/AbstractRepositoryComponent.java (original)
+++ incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/AbstractRepositoryComponent.java Thu Sep 20 07:32:59 2007
@@ -30,7 +30,7 @@
 /**
  * The <code>BaseComponent</code> TODO
  *
- * @ocm.mapped jcrNodeType="sling:Component" discriminator="false" extend=""
+ * @ocm.mapped jcrType="sling:Component" discriminator="false" extend=""
  */
 public abstract class AbstractRepositoryComponent extends BaseComponent {
 
@@ -75,7 +75,7 @@
     /**
      * @param extensions
      * @ocm.collection jcrName="sling:extensions"
-     *                 jcrNodeType="sling:ExtensionList"
+     *                 jcrType="sling:ExtensionList"
      *                 elementClassName="org.apache.sling.core.components.extensions.AbstractExtension"
      */
     public void setExtensionCollection(Collection<ComponentExtension> extensions) {

Modified: incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/extensions/AbstractExtension.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/extensions/AbstractExtension.java?rev=577770&r1=577769&r2=577770&view=diff
==============================================================================
--- incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/extensions/AbstractExtension.java (original)
+++ incubator/sling/trunk/core/src/main/java/org/apache/sling/core/components/extensions/AbstractExtension.java Thu Sep 20 07:32:59 2007
@@ -23,7 +23,7 @@
 /**
  * The <code>AbstractExtension</code> TODO
  *
- * @ocm.mapped jcrNodeType="sling:Extension" abstract="true" interfaces=""
+ * @ocm.mapped jcrType="sling:Extension" abstract="true" interfaces=""
  */
 public abstract class AbstractExtension implements ComponentExtension {
 

Modified: incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/CommandContent.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/CommandContent.java?rev=577770&r1=577769&r2=577770&view=diff
==============================================================================
--- incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/CommandContent.java (original)
+++ incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/CommandContent.java Thu Sep 20 07:32:59 2007
@@ -22,7 +22,7 @@
  * The <code>CommandContent</code> is a simple marker content object, which
  * allows implementation of simple command components
  *
- * @ocm.mapped jcrNodeType="sling:Command" discriminator="false"
+ * @ocm.mapped jcrType="sling:Command" discriminator="false"
  */
 public class CommandContent extends SelectableBaseContent {
 

Modified: incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/GenericContent.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/GenericContent.java?rev=577770&r1=577769&r2=577770&view=diff
==============================================================================
--- incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/GenericContent.java (original)
+++ incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/GenericContent.java Thu Sep 20 07:32:59 2007
@@ -23,7 +23,7 @@
 /**
  * The <code>GenericContent</code> TODO
  *
- * @ocm.mapped jcrNodeType="nt:unstructured" discriminator="true"
+ * @ocm.mapped jcrType="nt:unstructured" discriminator="true"
  */
 public class GenericContent extends SelectableBaseContent {
 

Modified: incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/SelectableBaseContent.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/SelectableBaseContent.java?rev=577770&r1=577769&r2=577770&view=diff
==============================================================================
--- incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/SelectableBaseContent.java (original)
+++ incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/SelectableBaseContent.java Thu Sep 20 07:32:59 2007
@@ -26,7 +26,7 @@
  * {@link SelectableContent} interface hence supporting selection as defined by
  * the Sling core bundle.
  *
- * @ocm.mapped jcrNodeType="sling:SelectableContent" discriminator="false"
+ * @ocm.mapped jcrType="sling:SelectableContent" discriminator="false"
  */
 public abstract class SelectableBaseContent extends BaseContent implements
         SelectableContent {

Modified: incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/Selector.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/Selector.java?rev=577770&r1=577769&r2=577770&view=diff
==============================================================================
--- incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/Selector.java (original)
+++ incubator/sling/trunk/core/src/main/java/org/apache/sling/core/content/Selector.java Thu Sep 20 07:32:59 2007
@@ -25,7 +25,7 @@
  * The <code>Selector</code> interface defines the API to be implemented to
  * select content.
  *
- * @ocm.mapped jcrNodeType="sling:Selector" discriminator="false"
+ * @ocm.mapped jcrType="sling:Selector" discriminator="false"
  */
 public interface Selector {