diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
index fa270411..eb5e93ed 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
@@ -16,7 +16,7 @@
         <profile>
             <id>run</id>
             <properties>
-                <solr.project.dir>../solr</solr.project.dir>
+                <solr.project.dir>${project.basedir}/../solr</solr.project.dir>
             </properties>
             <build>
                 <plugins>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
index b89abd49..b8c44ed9 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
@@ -72,12 +72,6 @@
                             <outputDirectory>${alfresco.solr.war.overlay}/WEB-INF</outputDirectory>
                             <overwrite>true</overwrite>
                             <resources>
-                                <resource>
-                                    <directory>src/main/webapp/WEB-INF</directory>
-                                    <includes>
-                                        <include>web.xml</include>
-                                    </includes>
-                                </resource>
                                 <resource>
                                     <directory>src/main/resources</directory>
                                     <filtering>true</filtering>
@@ -88,6 +82,34 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Replaces web.xml where applicable, commenting out the security-constraints -->
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <executions>
+                    <execution>
+                        <id>disable-securecomms</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <ignoreErrors>true</ignoreErrors>
+                    <file>${alfresco.solr.war.overlay}/WEB-INF/web.xml</file>
+                    <replacements>
+                        <replacement>
+                            <token><![CDATA[<security-constraint>]]></token>
+                            <value><![CDATA[<!-- <security-constraint>]]></value>
+                        </replacement>
+                        <replacement>
+                            <token><![CDATA[</security-role>]]></token>
+                            <value><![CDATA[</security-role> -->]]></value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -135,6 +157,7 @@
                 </executions>
             </plugin>
         </plugins>
+        
     </build>
 
     <dependencies>
@@ -145,4 +168,26 @@
             <type>zip</type>
         </dependency>
     </dependencies>
+
+    <profiles>
+        <!-- Cleans Alfresco data folder, embedded DB and logs -->
+        <profile>
+            <id>purge</id>
+            <build>
+                <plugins>
+                    <!-- Cleaning Alfresco Solr -->
+                    <plugin>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>${project.basedir}/solr_home</directory>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrconfig.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrconfig.xml
index 1477c0d7..1c4aba57 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrconfig.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrconfig.xml
@@ -128,7 +128,7 @@
      -->
     <!--<mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>-->
 
-	  
+      
     <!--
       This option specifies which Lucene LockFactory implementation to use.
       
@@ -210,17 +210,17 @@
 
   </mainIndex>
 
-  <!--	Enables JMX if and only if an existing MBeanServer is found, use this
+  <!--  Enables JMX if and only if an existing MBeanServer is found, use this
     if you want to configure JMX through JVM parameters. Remove this to disable
     exposing Solr configuration and statistics to JMX.
 
-		If you want to connect to a particular server, specify the agentId
-		e.g. <jmx agentId="myAgent" />
+        If you want to connect to a particular server, specify the agentId
+        e.g. <jmx agentId="myAgent" />
 
-		If you want to start a new MBeanServer, specify the serviceUrl
-		e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
+        If you want to start a new MBeanServer, specify the serviceUrl
+        e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
 
-		For more details see http://wiki.apache.org/solr/SolrJmx
+        For more details see http://wiki.apache.org/solr/SolrJmx
   -->
   <jmx />
 
@@ -384,6 +384,11 @@
       initialSize="100"
       autowarmCount="0"
     />
+    
+    <cache name="alfrescoArrayListCache"
+      class="org.alfresco.solr.ArrayListCache"
+    />
+    
 
     <cache name="alfrescoAuthorityCache"
       class="solr.FastLRUCache"
@@ -401,6 +406,14 @@
       regenerator="org.alfresco.solr.FilterCacheRegenerator"
     />
 
+   <!-- No regnerator or warming is required - this will be populated by the authority cache regenration -->
+   <cache name="alfrescoReaderToAclIdsCache"
+      class="solr.FastLRUCache"
+      size="${solr.readerToAclIdsCache.size:512}"
+      initialSize="${solr.readerToAclIdsCache.initialSize:512}"
+      autowarmCount="0"
+    />
+
     <listener event="newSearcher" class="org.alfresco.solr.AlfrescoSolrEventListener">
     </listener>
 
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties
index bff76d9b..ccef52d7 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties
@@ -53,21 +53,22 @@ alfresco.workQueueSize=-1
 
 alfresco.maxTotalConnections=40
 alfresco.maxHostConnections=40
+alfresco.socketTimeout=60000
 
 # SOLR caching
 
-solr.filterCache.size=512
-solr.filterCache.initialSize=512
-solr.queryResultCache.size=512
-solr.queryResultCache.initialSize=512
-solr.documentCache.size=512
-solr.documentCache.initialSize=512
+solr.filterCache.size=64
+solr.filterCache.initialSize=64
+solr.queryResultCache.size=64
+solr.queryResultCache.initialSize=64
+solr.documentCache.size=64
+solr.documentCache.initialSize=64
 solr.queryResultMaxDocsCached=200
 
-solr.authorityCache.size=512
-solr.authorityCache.initialSize=512
-solr.pathCache.size=512
-solr.pathCache.initialSize=512
+solr.authorityCache.size=64
+solr.authorityCache.initialSize=64
+solr.pathCache.size=64
+solr.pathCache.initialSize=64
 
 # SOLR
 
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrconfig.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrconfig.xml
index 27be2c52..789666f8 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrconfig.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrconfig.xml
@@ -128,7 +128,7 @@
      -->
     <!--<mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>-->
 
-	  
+      
     <!--
       This option specifies which Lucene LockFactory implementation to use.
       
@@ -210,17 +210,17 @@
 
   </mainIndex>
 
-  <!--	Enables JMX if and only if an existing MBeanServer is found, use this
+  <!--  Enables JMX if and only if an existing MBeanServer is found, use this
     if you want to configure JMX through JVM parameters. Remove this to disable
     exposing Solr configuration and statistics to JMX.
 
-		If you want to connect to a particular server, specify the agentId
-		e.g. <jmx agentId="myAgent" />
+        If you want to connect to a particular server, specify the agentId
+        e.g. <jmx agentId="myAgent" />
 
-		If you want to start a new MBeanServer, specify the serviceUrl
-		e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
+        If you want to start a new MBeanServer, specify the serviceUrl
+        e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
 
-		For more details see http://wiki.apache.org/solr/SolrJmx
+        For more details see http://wiki.apache.org/solr/SolrJmx
   -->
   <jmx />
 
@@ -385,6 +385,11 @@
       autowarmCount="0"
     />
 
+    <cache name="alfrescoArrayListCache"
+      class="org.alfresco.solr.ArrayListCache"
+    />
+
+
     <cache name="alfrescoAuthorityCache"
       class="solr.FastLRUCache"
       size="${solr.authorityCache.size:512}"
@@ -401,6 +406,14 @@
       regenerator="org.alfresco.solr.FilterCacheRegenerator"
     />
 
+   <!-- No regnerator or warming is required - this will be populated by the authority cache regenration -->
+   <cache name="alfrescoReaderToAclIdsCache"
+      class="solr.FastLRUCache"
+      size="${solr.readerToAclIdsCache.size:512}"
+      initialSize="${solr.readerToAclIdsCache.initialSize:512}"
+      autowarmCount="0"
+    />
+
     <listener event="newSearcher" class="org.alfresco.solr.AlfrescoSolrEventListener">
     </listener>
 
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties
index a755bfc1..470ae2bf 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties
@@ -58,21 +58,25 @@ alfresco.workQueueSize=-1
 
 alfresco.maxTotalConnections=40
 alfresco.maxHostConnections=40
+alfresco.socketTimeout=60000
 
 # SOLR caching
 
-solr.filterCache.size=512
-solr.filterCache.initialSize=512
+solr.filterCache.size=64
+solr.filterCache.initialSize=64
 solr.queryResultCache.size=1024
 solr.queryResultCache.initialSize=1024
-solr.documentCache.size=512
-solr.documentCache.initialSize=512
+solr.documentCache.size=64
+solr.documentCache.initialSize=64
 solr.queryResultMaxDocsCached=2000
 
-solr.authorityCache.size=512
-solr.authorityCache.initialSize=512
-solr.pathCache.size=512
-solr.pathCache.initialSize=512
+solr.authorityCache.size=64
+solr.authorityCache.initialSize=64
+solr.pathCache.size=64
+solr.pathCache.initialSize=64
+
+solr.readerToAclIdsCache.size=64
+solr.readerToAclIdsCache.initialSize=64
 
 # SOLR
 
@@ -101,3 +105,6 @@ solr.queryResultWindowSize=200
 # logging check report ....
 #
 # 
+
+
+alfresco.doPermissionChecks=true
\ No newline at end of file