Changeset 4661

Timestamp:

03/10/14 09:44:32 (10 years ago)

Author:

Twan Goosen

Message:

Package structure: separated solr services from other services and moved all panels into new wicket.panels package

Location:

vlo/branches/vlo-3.0/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr (added)
• main/java/eu/clarin/cmdi/vlo/service/solr/FacetFieldsService.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/FacetFieldsService.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/SearchResultsDao.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/SearchResultsDao.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/SolrDocumentQueryFactory.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/SolrDocumentQueryFactory.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/SolrDocumentService.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/SolrDocumentService.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/SolrFacetQueryFactory.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/SolrFacetQueryFactory.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl (added)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/AbstractSolrQueryFactory.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/AutoCompleteDao.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/AutoCompleteDao.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/QueryFacetsSelectionParametersConverter.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverter.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImpl.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SearchResultsDaoImpl.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDaoImpl.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrDaoImpl.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImpl.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrDocumentQueryFactoryImpl.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentServiceImpl.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrDocumentServiceImpl.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetFieldsService.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrFacetFieldsService.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImpl.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrFacetQueryFactoryImpl.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/components/RecordPageLink.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModel.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModel.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/model/SolrDocumentModel.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/panels (added)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetPanel.html)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetPanel.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetValuesPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetValuesPanel.html)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetValuesPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetValuesPanel.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetsPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetsPanel.html)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetsPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetsPanel.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/FieldsTablePanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FieldsTablePanel.html)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/FieldsTablePanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FieldsTablePanel.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinkDetailsPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/ResourceLinkDetailsPanel.html)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinkDetailsPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/ResourceLinkDetailsPanel.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinksPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/ResourceLinksPanel.html)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinksPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/ResourceLinksPanel.java) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinksPanel.properties (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/ResourceLinksPanel.properties)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultItemPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultItemPanel.html)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultItemPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultItemPanel.java) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultsPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultsPanel.html)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultsPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultsPanel.java) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/SelectedFacetPanel.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SelectedFacetPanel.html)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/SelectedFacetPanel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SelectedFacetPanel.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/provider/SolrDocumentProvider.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/service/impl/SearchResultsDaoImplTest.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/service/impl/SolrDocumentServiceImplTest.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/service/impl/SolrFacetQueryFactoryImplTest.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModelTest.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModelTest.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/wicket/pages/TestRecordPage.java (modified) (1 diff)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo;
 
-import eu.clarin.cmdi.vlo.service.SolrDocumentService;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
 import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
 import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -22 +22 @@
 import eu.clarin.cmdi.vlo.VloWicketApplication;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.service.FieldFilter;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
 import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
-import eu.clarin.cmdi.vlo.service.SearchResultsDao;
-import eu.clarin.cmdi.vlo.service.SolrDocumentService;
-import eu.clarin.cmdi.vlo.service.SolrFacetQueryFactory;
-import eu.clarin.cmdi.vlo.service.impl.QueryFacetsSelectionParametersConverter;
+import eu.clarin.cmdi.vlo.service.solr.SearchResultsDao;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
+import eu.clarin.cmdi.vlo.service.solr.SolrFacetQueryFactory;
+import eu.clarin.cmdi.vlo.service.solr.impl.QueryFacetsSelectionParametersConverter;
 import eu.clarin.cmdi.vlo.service.impl.ResourceStringConverterImpl;
 import eu.clarin.cmdi.vlo.service.impl.ResourceTypeCountingServiceImpl;
-import eu.clarin.cmdi.vlo.service.impl.SearchResultsDaoImpl;
-import eu.clarin.cmdi.vlo.service.impl.SolrDocumentQueryFactoryImpl;
-import eu.clarin.cmdi.vlo.service.impl.SolrDocumentServiceImpl;
-import eu.clarin.cmdi.vlo.service.impl.SolrFacetFieldsService;
-import eu.clarin.cmdi.vlo.service.impl.SolrFacetQueryFactoryImpl;
+import eu.clarin.cmdi.vlo.service.solr.impl.SearchResultsDaoImpl;
+import eu.clarin.cmdi.vlo.service.solr.impl.SolrDocumentQueryFactoryImpl;
+import eu.clarin.cmdi.vlo.service.solr.impl.SolrDocumentServiceImpl;
+import eu.clarin.cmdi.vlo.service.solr.impl.SolrFacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.impl.SolrFacetQueryFactoryImpl;
 import java.io.IOException;
 import org.apache.solr.client.solrj.SolrServer;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/FacetFieldsService.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service;
+package eu.clarin.cmdi.vlo.service.solr;
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/SearchResultsDao.java

@@ -16 +16 @@
  */
 
-package eu.clarin.cmdi.vlo.service;
+package eu.clarin.cmdi.vlo.service.solr;
 
 import java.util.List;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/SolrDocumentQueryFactory.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service;
+package eu.clarin.cmdi.vlo.service.solr;
 
 import eu.clarin.cmdi.vlo.FacetConstants;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/SolrDocumentService.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service;
+package eu.clarin.cmdi.vlo.service.solr;
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/SolrFacetQueryFactory.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service;
+package eu.clarin.cmdi.vlo.service.solr;
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.service.solr.impl;
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AutoCompleteDao.java

@@ -1 @@
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.service.solr.impl;
 
 import eu.clarin.cmdi.vlo.config.VloConfig;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/QueryFacetsSelectionParametersConverter.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.service.solr.impl;
 
 import com.google.common.collect.HashMultimap;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImpl.java

@@ -1 @@
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.service.solr.impl;
 
-import eu.clarin.cmdi.vlo.service.SearchResultsDao;
+import eu.clarin.cmdi.vlo.service.solr.SearchResultsDao;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import java.util.List;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDaoImpl.java

@@ -1 @@
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.service.solr.impl;
 
 import eu.clarin.cmdi.vlo.config.VloConfig;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImpl.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.service.solr.impl;
 
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.SolrDocumentQueryFactory;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentQueryFactory;
 import org.apache.solr.client.solrj.SolrQuery;
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentServiceImpl.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.service.solr.impl;
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.SearchResultsDao;
-import eu.clarin.cmdi.vlo.service.SolrDocumentQueryFactory;
-import eu.clarin.cmdi.vlo.service.SolrDocumentService;
+import eu.clarin.cmdi.vlo.service.solr.SearchResultsDao;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentQueryFactory;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
 import java.util.List;
 import org.apache.solr.client.solrj.SolrQuery;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetFieldsService.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.service.solr.impl;
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.FacetFieldsService;
-import eu.clarin.cmdi.vlo.service.SearchResultsDao;
-import eu.clarin.cmdi.vlo.service.SolrFacetQueryFactory;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.SearchResultsDao;
+import eu.clarin.cmdi.vlo.service.solr.SolrFacetQueryFactory;
 import java.util.List;
 import org.apache.solr.client.solrj.response.FacetField;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImpl.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.service.solr.impl;
 
-import eu.clarin.cmdi.vlo.service.SolrFacetQueryFactory;
+import eu.clarin.cmdi.vlo.service.solr.SolrFacetQueryFactory;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import java.util.List;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/RecordPageLink.java

@@ -27 +27 @@
  * @author twagoo
  */
-class RecordPageLink extends Link {
+public class RecordPageLink extends Link {
 
     private final IModel<SolrDocument> documentModel;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModel.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import java.util.Collections;
 import java.util.List;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModel.java

@@ -21 +21 @@
 import com.google.common.collect.ImmutableList;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import java.util.Collection;
 import java.util.List;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/SolrDocumentModel.java

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.VloWicketApplication;
-import eu.clarin.cmdi.vlo.service.SolrDocumentService;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.model.LoadableDetachableModel;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

@@ -3 +3 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;
-import eu.clarin.cmdi.vlo.wicket.components.FacetsPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.FacetsPanel;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
-import eu.clarin.cmdi.vlo.wicket.components.FacetPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.FacetPanel;
 import eu.clarin.cmdi.vlo.wicket.components.SearchForm;
-import eu.clarin.cmdi.vlo.wicket.components.SearchResultsPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.SearchResultsPanel;
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldsModel;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java

@@ -21 +21 @@
 import eu.clarin.cmdi.vlo.service.FieldFilter;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
-import eu.clarin.cmdi.vlo.wicket.components.FieldsTablePanel;
-import eu.clarin.cmdi.vlo.wicket.components.ResourceLinksPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.FieldsTablePanel;
+import eu.clarin.cmdi.vlo.wicket.panels.ResourceLinksPanel;
 import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrDocumentModel;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetPanel.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.components;
+package eu.clarin.cmdi.vlo.wicket.panels;
 
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetValuesPanel.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.components;
+package eu.clarin.cmdi.vlo.wicket.panels;
 
+import eu.clarin.cmdi.vlo.wicket.components.SolrFieldNameLabel;
 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldValuesProvider;
 import java.util.Collection;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetsPanel.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.components;
+package eu.clarin.cmdi.vlo.wicket.panels;
 
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FieldsTablePanel.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.components;
+package eu.clarin.cmdi.vlo.wicket.panels;
 
 import eu.clarin.cmdi.vlo.pojo.DocumentField;
+import eu.clarin.cmdi.vlo.wicket.components.SolrFieldNameLabel;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.list.ListItem;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinkDetailsPanel.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.components;
+package eu.clarin.cmdi.vlo.wicket.panels;
 
 import eu.clarin.cmdi.vlo.pojo.ResourceInfo;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/ResourceLinksPanel.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.components;
+package eu.clarin.cmdi.vlo.wicket.panels;
 
 import eu.clarin.cmdi.vlo.pojo.ResourceInfo;
@@ -22 +22 @@
 import java.util.Collection;
 import java.util.List;
-import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultItemPanel.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.components;
+package eu.clarin.cmdi.vlo.wicket.panels;
 
 import eu.clarin.cmdi.vlo.wicket.provider.ResouceTypeCountDataProvider;
@@ -22 +22 @@
 import eu.clarin.cmdi.vlo.pojo.ResourceTypeCount;
 import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
+import eu.clarin.cmdi.vlo.wicket.components.RecordPageLink;
+import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
 import java.util.Locale;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SearchResultsPanel.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.components;
+package eu.clarin.cmdi.vlo.wicket.panels;
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.SolrDocumentService;
 import eu.clarin.cmdi.vlo.wicket.provider.SolrDocumentProvider;
 import java.util.Arrays;
@@ -37 +36 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
 
 /**

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SelectedFacetPanel.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.components;
+package eu.clarin.cmdi.vlo.wicket.panels;
 
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/SolrDocumentProvider.java

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.VloWicketApplication;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.SolrDocumentService;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
 import eu.clarin.cmdi.vlo.wicket.model.SolrDocumentModel;
 import java.math.BigDecimal;

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.impl;
 
+import eu.clarin.cmdi.vlo.service.solr.impl.QueryFacetsSelectionParametersConverter;
 import com.google.common.collect.HashMultimap;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/SearchResultsDaoImplTest.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.impl;
 
+import eu.clarin.cmdi.vlo.service.solr.impl.SearchResultsDaoImpl;
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.config.VloConfig;

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/SolrDocumentServiceImplTest.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.impl;
 
+import eu.clarin.cmdi.vlo.service.solr.impl.SolrDocumentServiceImpl;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.SearchResultsDao;
-import eu.clarin.cmdi.vlo.service.SolrDocumentQueryFactory;
+import eu.clarin.cmdi.vlo.service.solr.SearchResultsDao;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentQueryFactory;
 import java.util.Collection;
 import java.util.Collections;

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/SolrFacetQueryFactoryImplTest.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.impl;
 
+import eu.clarin.cmdi.vlo.service.solr.impl.SolrFacetQueryFactoryImpl;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import java.util.Arrays;

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModelTest.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import java.util.Arrays;
 import java.util.List;

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModelTest.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import java.util.Arrays;
 import java.util.List;

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java

@@ -6 +6 @@
 import eu.clarin.cmdi.vlo.config.VloSpringConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.FacetFieldsService;
-import eu.clarin.cmdi.vlo.service.SolrDocumentService;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
 import java.util.Arrays;
 import org.apache.solr.client.solrj.response.FacetField;

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestRecordPage.java

@@ -6 +6 @@
 import eu.clarin.cmdi.vlo.config.VloConfigFactory;
 import eu.clarin.cmdi.vlo.config.VloSpringConfig;
-import eu.clarin.cmdi.vlo.service.SolrDocumentService;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.request.mapper.parameter.PageParameters;