svn commit: r1721081 [2/2] - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/min-pages/ applications/jetspeed/src/main/webapp/WEB-INF/min-pages/search/ applications/jetspeed/src/main/webapp/WEB-INF/pages/ applications...

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/search-embedded-solr-override.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/search-embedded-solr-override.xml?rev=1721081&r1=1721080&r2=1721081&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/search-embedded-solr-override.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/search-embedded-solr-override.xml Mon Dec 21 04:04:51 2015
@@ -59,11 +59,13 @@
     <constructor-arg value="js" />
   </bean>
   
-  <bean id="org.apache.jetspeed.search.SearchEngine" class="org.apache.jetspeed.search.solr.SolrSearchEngineImpl">
+  <bean id="org.apache.jetspeed.search.SearchEngine" class="org.apache.jetspeed.search.solr.SolrSearchEngineImpl" init-method="start">
     <meta key="j2:cat" value="default or search" />
     <constructor-arg ref="org.apache.solr.client.solrj.SolrServer" />
     <constructor-arg type="boolean" value="${search.index.optimizeAfterUpdate}" />
     <constructor-arg ref="org.apache.jetspeed.search.HandlerFactory" />
+    <property name="documentsEnabled" value="${search.documents.enabled}"/>
+    <property name="documentsLocation" value="${search.documents.location}"/>
   </bean>
   
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/search-http-solr-override.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/search-http-solr-override.xml?rev=1721081&r1=1721080&r2=1721081&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/search-http-solr-override.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/search-http-solr-override.xml Mon Dec 21 04:04:51 2015
@@ -35,11 +35,13 @@
     </property>
   </bean>
   
-  <bean id="org.apache.jetspeed.search.SearchEngine" class="org.apache.jetspeed.search.solr.SolrSearchEngineImpl">
+  <bean id="org.apache.jetspeed.search.SearchEngine" class="org.apache.jetspeed.search.solr.SolrSearchEngineImpl" init-method="start">
     <meta key="j2:cat" value="default or search" />
     <constructor-arg ref="org.apache.solr.client.solrj.SolrServer" />
     <constructor-arg type="boolean" value="${search.index.optimizeAfterUpdate}" />
     <constructor-arg ref="org.apache.jetspeed.search.HandlerFactory" />
+      <property name="documentsEnabled" value="${search.documents.enabled}"/>
+      <property name="documentsLocation" value="${search.documents.location}"/>
   </bean>
   
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml?rev=1721081&r1=1721080&r2=1721081&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml Mon Dec 21 04:04:51 2015
@@ -37,7 +37,7 @@
   </bean>
 
 
-  <bean id="org.apache.jetspeed.search.SearchEngine" class="org.apache.jetspeed.search.lucene.SearchEngineImpl">
+  <bean id="org.apache.jetspeed.search.SearchEngine" class="org.apache.jetspeed.search.lucene.SearchEngineImpl"  init-method="start">
     <meta key="j2:cat" value="default or search" />
     <constructor-arg index="0">
       <value>${search.index.location}</value>
@@ -51,6 +51,7 @@
     <constructor-arg>
       <ref bean="org.apache.jetspeed.search.HandlerFactory" />
     </constructor-arg>
-
+    <property name="documentsEnabled" value="${search.documents.enabled}"/>
+    <property name="documentsLocation" value="${search.documents.location}"/>
   </bean>
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=1721081&r1=1721080&r2=1721081&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties Mon Dec 21 04:04:51 2015
@@ -247,6 +247,11 @@ search.http.solr.url=http://localhost:89
 search.embedded.solr.solr.home=${applicationRoot}/WEB-INF/solr
 search.embedded.solr.data.dir=${applicationRoot}/WEB-INF/solr/data
 
+# Search Documents location
+# New in 2.3.1
+search.documents.enabled=true
+search.documents.location=${applicationRoot}../j2-admin/WEB-INF/view/info
+
 #-------------------------------------------------------------------------
 # Audit Implementation
 #-------------------------------------------------------------------------

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml?rev=1721081&r1=1721080&r2=1721081&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml Mon Dec 21 04:04:51 2015
@@ -91,6 +91,7 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
+            <version>2.4.2</version>
             <executions>
                 <execution>
                     <phase>package</phase>