Index: solr/solr.xml
===================================================================
--- solr/solr.xml	(revision 4961)
+++ solr/solr.xml	(working copy)
@@ -1,35 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- All (relative) paths are relative to the installation path
-  
-  persistent: Save changes made via the API to this file
-  sharedLib: path to a lib directory that will be shared across all cores
--->
-<solr persistent="false">
-
-  <!--
-  adminPath: RequestHandler path to manage cores.  
-    If 'null' (or absent), cores will not be manageable via REST
-  -->
-  <cores adminPath="/admin/cores">
-    <core name="statistics" instanceDir="statistics" />
-  </cores>
-  
-</solr>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ All (relative) paths are relative to the installation path
+  
+  persistent: Save changes made via the API to this file
+  sharedLib: path to a lib directory that will be shared across all cores
+-->
+<solr persistent="false">
+
+  <!--
+  adminPath: RequestHandler path to manage cores.  
+    If 'null' (or absent), cores will not be manageable via REST
+  -->
+  <cores adminPath="/admin/cores">
+    <core name="search" instanceDir="search" />
+    <core name="statistics" instanceDir="statistics" />
+  </cores>
+  
+</solr>
Index: config/dspace.cfg
===================================================================
--- config/dspace.cfg	(revision 4961)
+++ config/dspace.cfg	(working copy)
@@ -26,7 +26,7 @@
 ##### Basic information ######
 
 # DSpace installation directory
-dspace.dir = /dspace
+dspace.dir = /dspace-instances/discovery
 
 # DSpace host name - should match base URL.  Do not include port number
 dspace.hostname = localhost
@@ -2029,6 +2029,11 @@
 
 
 #---------------------------------------------------------------#
+#-----------------SOLR SERVER CONFIGURATION---------------------#
+#---------------------------------------------------------------#
+solr.search.server = http://localhost:8080/solr/search
+
+#---------------------------------------------------------------#
 #--------------SOLR STATISTICS CONFIGURATIONS-------------------#
 #---------------------------------------------------------------#
 # These configs are only used by the SOLR interface/webapp to   #
Index: config/launcher.xml
===================================================================
--- config/launcher.xml	(revision 4961)
+++ config/launcher.xml	(working copy)
@@ -310,6 +310,14 @@
     </command>
 
     <command>
+        <name>update-discovery-index</name>
+        <description>Update Discovery Solr Search Index</description>
+        <step>
+            <class>org.dspace.discovery.IndexClient</class>
+        </step>
+</command>
+
+    <command>
         <name>update-handle-prefix</name>
         <description>Update handle records and metadata when moving from one handle to another</description>
         <step>
Index: config/xmlui.xconf
===================================================================
--- config/xmlui.xconf	(revision 4961)
+++ config/xmlui.xconf	(working copy)
@@ -59,7 +59,10 @@
         /xmlui/cocoon/aspects/ directory followed by a slash.
     -->
     <aspects>
-        <aspect name="Artifact Browser" path="resource://aspects/ArtifactBrowser/" />
+        <!-- (1) Remove Artifact Browser as Browse/Search is supported in Discovery         -->
+        <!-- <aspect name="Artifact Browser" path="resource://aspects/ArtifactBrowser/" />  -->
+        <!-- (2) Discovery holds Both Viewers, Recent Submissions and Search/Browse.        -->
+        <aspect name="Discovery" path="resource://aspects/Discovery/" />
         <aspect name="Administration" path="resource://aspects/Administrative/" />
         <aspect name="E-Person" path="resource://aspects/EPerson/" />
         <aspect name="Submission and Workflow" path="resource://aspects/Submission/" />
Index: modules/solr/pom.xml
===================================================================
--- modules/solr/pom.xml	(revision 4961)
+++ modules/solr/pom.xml	(working copy)
@@ -51,15 +51,15 @@
    </build>
    <dependencies>
    	<dependency>
-   		<groupId>org.dspace</groupId>
-   		<artifactId>dspace-solr</artifactId>
-   		<version>1.3.0.2</version>
+   		<groupId>org.dspace.dependencies.solr</groupId>
+   		<artifactId>dspace-solr-webapp</artifactId>
+   		<version>1.4.0.1</version>
    		<classifier>classes</classifier>
    	</dependency>
    	<dependency>
-   		<groupId>org.dspace</groupId>
-   		<artifactId>dspace-solr</artifactId>
-   		<version>1.3.0.2</version>
+   		<groupId>org.dspace.dependencies.solr</groupId>
+   		<artifactId>dspace-solr-webapp</artifactId>
+   		<version>1.4.0.1</version>
    		<classifier>skinny</classifier>
    		<type>war</type>
    	</dependency>
Index: modules/xmlui/pom.xml
===================================================================
--- modules/xmlui/pom.xml	(revision 4961)
+++ modules/xmlui/pom.xml	(working copy)
@@ -168,7 +168,11 @@
          <version>2.3</version>
          <scope>provided</scope>
       </dependency>
-
+      <dependency>
+          <groupId>org.dspace.discovery</groupId>
+          <artifactId>discovery-xmlui-block</artifactId>
+          <version>0.9.1-SNAPSHOT</version>
+      </dependency>
    </dependencies>
 
 </project>
\ No newline at end of file
Index: pom.xml
===================================================================
--- pom.xml	(revision 4961)
+++ pom.xml	(working copy)
@@ -518,6 +518,7 @@
     -->
     <modules>
         <module>modules</module>
+        <module>../../dspace-discovery</module>
     </modules>
 
     <build>
@@ -568,6 +569,11 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dspace.discovery</groupId>
+            <artifactId>discovery-solr-provider</artifactId>
+            <version>0.9.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
