Moved xwiki-core to annotations

git-svn-id: https://svn.xwiki.org/svnroot/xwiki/platform/core/trunk@19872 f329d543-caf0-0310-9063-dda96c69346f

xwiki-bridge/pom.xml

@@ -34,6 +34,13 @@
   <name>XWiki Platform - Core - Bridge</name>
   <packaging>jar</packaging>
   <description>XWiki Platform - Temporary bridge between new components and the old core, until the old core is completely split into components</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-core-component</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>

xwiki-bridge/src/main/java/org/xwiki/bridge/DocumentAccessBridge.java

@@ -21,6 +21,8 @@
 
 import java.util.Map;
 
+import org.xwiki.component.annotation.ComponentRole;
+
 /**
  * Exposes methods for accessing Document data. This is temporary until we remodel the Model classes and the Document
  * services.
@@ -28,6 +30,7 @@
  * @version $Id$
  * @since 1.6M1
  */
+@ComponentRole
 public interface DocumentAccessBridge
 {
     /**

xwiki-bridge/src/main/java/org/xwiki/bridge/DocumentModelBridge.java

@@ -19,6 +19,8 @@
  */
 package org.xwiki.bridge;
 
+import org.xwiki.component.annotation.ComponentRole;
+
 /**
  * Exposes methods for accessing Documents. This is temporary until we remodel the Model classes and the Document
  * services. The implementation is actually the XWikiDocument class, so this is just a light interface that hides the
@@ -27,6 +29,7 @@
  * @version $Id$
  * @since 1.6M1
  */
+@ComponentRole
 public interface DocumentModelBridge
 {
     /**

xwiki-bridge/src/main/java/org/xwiki/bridge/DocumentName.java

@@ -19,12 +19,15 @@
  */
 package org.xwiki.bridge;
 
+import org.xwiki.component.annotation.ComponentRole;
+
 /**
  * Represents a document name (wiki, space and page names).
  * 
  * @version $Id$
  * @since 1.8RC2
  */
+@ComponentRole
 public class DocumentName
 {
     /**

xwiki-bridge/src/main/java/org/xwiki/bridge/DocumentNameFactory.java

@@ -19,12 +19,15 @@
  */
 package org.xwiki.bridge;
 
+import org.xwiki.component.annotation.ComponentRole;
+
 /**
  * Generate a Document Name from a raw string reference.
  *  
  * @version $Id$
  * @since 1.8.1
  */
+@ComponentRole
 public interface DocumentNameFactory
 {
     /**

xwiki-bridge/src/main/java/org/xwiki/bridge/DocumentNameSerializer.java

@@ -19,6 +19,8 @@
  */
 package org.xwiki.bridge;
 
+import org.xwiki.component.annotation.ComponentRole;
+
 /**
  * Generate a fully qualified document reference string (ie of the form
  * {@code wiki:space.page}) out of a {@link DocumentName}.
@@ -26,6 +28,7 @@
  * @version $Id$
  * @since 1.8.1
  */
+@ComponentRole
 public interface DocumentNameSerializer
 {
     /**

xwiki-bridge/src/main/java/org/xwiki/bridge/SkinAccessBridge.java

@@ -19,12 +19,15 @@
  */
 package org.xwiki.bridge;
 
+import org.xwiki.component.annotation.ComponentRole;
+
 /**
  * Exposes methods for accessing Skin data.
  * 
  * @version $Id$ 
  * @since 1.7
  */
+@ComponentRole
 public interface SkinAccessBridge
 {
     /**

xwiki-core/src/main/java/com/xpn/xwiki/DefaultSkinAccessBridge.java

@@ -22,6 +22,8 @@
 package com.xpn.xwiki;
 
 import org.xwiki.bridge.SkinAccessBridge;
+import org.xwiki.component.annotation.Component;
+import org.xwiki.component.annotation.Requirement;
 import org.xwiki.context.Execution;
 
 /**
@@ -30,9 +32,11 @@
  * @version $Id$ 
  * @since 1.7
  */
+@Component
 public class DefaultSkinAccessBridge implements SkinAccessBridge
 {
     /** Execution context handler, needed for accessing the XWikiContext. */
+    @Requirement
     private Execution execution;
 
     private XWikiContext getContext()

xwiki-core/src/main/java/com/xpn/xwiki/doc/CompactDocumentNameSerializer.java

@@ -20,6 +20,8 @@
 package com.xpn.xwiki.doc;
 
 import org.xwiki.bridge.DocumentName;
+import org.xwiki.component.annotation.Component;
+import org.xwiki.component.annotation.Requirement;
 import org.xwiki.context.Execution;
 
 import com.xpn.xwiki.XWikiContext;
@@ -30,11 +32,13 @@
  * @version $Id$
  * @since 1.8.3
  */
+@Component("compact")
 public class CompactDocumentNameSerializer extends DefaultDocumentNameSerializer
 {
     /**
      * Execution context handler, needed for accessing the XWikiContext.
      */
+    @Requirement
     private Execution execution;
 
     /**

xwiki-core/src/main/java/com/xpn/xwiki/doc/DefaultDocumentAccessBridge.java

@@ -26,6 +26,8 @@
 import org.xwiki.bridge.DocumentAccessBridge;
 import org.xwiki.bridge.DocumentModelBridge;
 import org.xwiki.bridge.DocumentName;
+import org.xwiki.component.annotation.Component;
+import org.xwiki.component.annotation.Requirement;
 import org.xwiki.context.Execution;
 
 import com.xpn.xwiki.XWikiContext;
@@ -42,9 +44,11 @@
  * @version $Id$
  * @since 1.6M1
  */
+@Component
 public class DefaultDocumentAccessBridge implements DocumentAccessBridge
 {
     /** Execution context handler, needed for accessing the XWikiContext. */
+    @Requirement
     private Execution execution;
 
     private XWikiContext getContext()

xwiki-core/src/main/java/com/xpn/xwiki/doc/DefaultDocumentNameFactory.java

@@ -22,6 +22,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.xwiki.bridge.DocumentName;
 import org.xwiki.bridge.DocumentNameFactory;
+import org.xwiki.component.annotation.Component;
+import org.xwiki.component.annotation.Requirement;
 import org.xwiki.context.Execution;
 
 import com.xpn.xwiki.XWikiContext;
@@ -32,6 +34,7 @@
  * @version $Id$
  * @since 1.8.1
  */
+@Component
 public class DefaultDocumentNameFactory implements DocumentNameFactory
 {
     /**
@@ -56,6 +59,7 @@ public class DefaultDocumentNameFactory implements DocumentNameFactory
     /** 
      * Execution context handler, needed for accessing the XWikiContext. 
      */
+    @Requirement
     private Execution execution;
     
     public DocumentName createDocumentName(String reference)

xwiki-core/src/main/java/com/xpn/xwiki/doc/DefaultDocumentNameSerializer.java

@@ -21,6 +21,7 @@
 
 import org.xwiki.bridge.DocumentName;
 import org.xwiki.bridge.DocumentNameSerializer;
+import org.xwiki.component.annotation.Component;
 
 /**
  * Generate a fully qualified document reference string (ie of the form {@code <wiki>:<space>.<page>} out of a
@@ -29,6 +30,7 @@
  * @version $Id$
  * @since 1.8.1
  */
+@Component
 public class DefaultDocumentNameSerializer implements DocumentNameSerializer
 {
     /**

xwiki-core/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java

@@ -27,6 +27,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.runtime.RuntimeConstants;
+import org.xwiki.component.annotation.Component;
+import org.xwiki.component.annotation.Requirement;
 import org.xwiki.component.manager.ComponentManager;
 import org.xwiki.component.phase.Composable;
 import org.xwiki.context.Execution;
@@ -50,6 +52,7 @@
  * @version $Id$
  * @since 1.5M1
  */
+@Component
 public class DefaultVelocityManager implements VelocityManager, Composable
 {
     private ComponentManager componentManager;
@@ -59,6 +62,7 @@ public class DefaultVelocityManager implements VelocityManager, Composable
      */
     private Map<String, VelocityEngine> velocityManagers = new HashMap<String, VelocityEngine>();
 
+    @Requirement
     private Execution execution;
 
     /**

xwiki-core/src/main/java/com/xpn/xwiki/render/XWikiVelocityContextInitializer.java

@@ -21,11 +21,15 @@
 package com.xpn.xwiki.render;
 
 import org.xwiki.velocity.VelocityContextInitializer;
+import org.xwiki.component.annotation.Component;
+import org.xwiki.component.annotation.Requirement;
 import org.xwiki.context.Execution;
 import org.apache.velocity.VelocityContext;
 
+@Component("xwiki")
 public class XWikiVelocityContextInitializer implements VelocityContextInitializer
 {
+    @Requirement
     private Execution execution;
 
     public void initialize(VelocityContext context)

xwiki-core/src/main/java/com/xpn/xwiki/store/AttachmentRecycleBinStore.java

@@ -22,6 +22,8 @@
 import java.util.Date;
 import java.util.List;
 
+import org.xwiki.component.annotation.ComponentRole;
+
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
 import com.xpn.xwiki.doc.DeletedAttachment;
@@ -37,6 +39,7 @@
  * @version $Id$
  * @since 1.4M1
  */
+@ComponentRole
 public interface AttachmentRecycleBinStore
 {
     /**

xwiki-core/src/main/java/com/xpn/xwiki/store/AttachmentVersioningStore.java

@@ -19,6 +19,8 @@
  */
 package com.xpn.xwiki.store;
 
+import org.xwiki.component.annotation.ComponentRole;
+
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
 import com.xpn.xwiki.doc.XWikiAttachment;
@@ -30,6 +32,7 @@
  * @version $Id$
  * @since 1.4M2
  */
+@ComponentRole
 public interface AttachmentVersioningStore
 {
     /**

xwiki-core/src/main/java/com/xpn/xwiki/store/VoidAttachmentVersioningStore.java

@@ -24,6 +24,7 @@
 import org.suigeneris.jrcs.rcs.Archive;
 import org.suigeneris.jrcs.rcs.Version;
 import org.suigeneris.jrcs.util.ToString;
+import org.xwiki.component.annotation.Component;
 
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
@@ -38,6 +39,7 @@
  * @version $Id$
  * @since 1.4M2
  */
+@Component("void")
 public class VoidAttachmentVersioningStore implements AttachmentVersioningStore
 {
     /**

xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiAttachmentStoreInterface.java

@@ -21,6 +21,8 @@
 
 import java.util.List;
 
+import org.xwiki.component.annotation.ComponentRole;
+
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
 import com.xpn.xwiki.doc.XWikiAttachment;
@@ -31,6 +33,7 @@
  * 
  * @version $Id$
  */
+@ComponentRole
 public interface XWikiAttachmentStoreInterface
 {
     void saveAttachmentContent(XWikiAttachment attachment, XWikiContext context, boolean bTransaction)

xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateAttachmentStore.java

@@ -7,6 +7,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.Query;
 import org.hibernate.Session;
+import org.xwiki.component.annotation.Component;
 
 import com.xpn.xwiki.XWiki;
 import com.xpn.xwiki.XWikiContext;
@@ -15,6 +16,7 @@
 import com.xpn.xwiki.doc.XWikiAttachmentContent;
 import com.xpn.xwiki.doc.XWikiDocument;
 
+@Component
 public class XWikiHibernateAttachmentStore extends XWikiHibernateBaseStore implements XWikiAttachmentStoreInterface
 {
     private static final Log log = LogFactory.getLog(XWikiHibernateAttachmentStore.class);

xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java

@@ -22,6 +22,7 @@
 import org.hibernate.jdbc.ConnectionManager;
 import org.hibernate.mapping.Table;
 import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
+import org.xwiki.component.annotation.Requirement;
 import org.xwiki.component.phase.Initializable;
 import org.xwiki.component.phase.InitializationException;
 import org.xwiki.context.Execution;
@@ -43,6 +44,7 @@ public class XWikiHibernateBaseStore implements Initializable
 
     private int nbConnections = 0;
 
+    @Requirement
     private HibernateSessionFactory sessionFactory;
 
     private String hibpath = "/WEB-INF/hibernate.cfg.xml";