Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork:[3993] sandbox/3.0.x/geonetwork-persistence-ebrim/ src
|
From: <eri...@us...> - 2009-05-19 12:46:14
|
Revision: 3993
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=3993&view=rev
Author: erikvaningen
Date: 2009-05-19 12:35:22 +0000 (Tue, 19 May 2009)
Log Message:
-----------
adding log4j
Modified Paths:
--------------
sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/ebrim/informationmodel/RegistryObjectListDao.java
sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/facade/RegistryObjectListStoreFacade.java
sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/facade/RegistryObjectStoreFacade.java
sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/search/ebrim/EbrimGenericSearchDao.java
sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/search/ebrim/ElementNameProcessor.java
Added Paths:
-----------
sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/resources/log4j.properties
Modified: sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/ebrim/informationmodel/RegistryObjectListDao.java
===================================================================
--- sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/ebrim/informationmodel/RegistryObjectListDao.java 2009-05-19 12:15:30 UTC (rev 3992)
+++ sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/ebrim/informationmodel/RegistryObjectListDao.java 2009-05-19 12:35:22 UTC (rev 3993)
@@ -2,6 +2,7 @@
import java.util.List;
+import org.apache.log4j.Logger;
import org.geonetwork.domain.ebrim.informationmodel.core.RegistryObjectList;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
import org.springframework.transaction.annotation.Transactional;
@@ -13,13 +14,15 @@
*/
@Transactional
public class RegistryObjectListDao extends HibernateDaoSupport {
+
+ private static Logger log = Logger.getLogger(RegistryObjectListDao.class);
/**
* RegistryObjectList
*/
public void saveRegistryObjectList(RegistryObjectList registryObjectList) {
if (registryObjectList.getIso19139Id() == null) {
- System.out.println("Error: registryObjectList.getIso19139Id() == null");
+ log.error("Error: registryObjectList.getIso19139Id() == null");
}
this.getHibernateTemplate().save(registryObjectList);
}
Modified: sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/facade/RegistryObjectListStoreFacade.java
===================================================================
--- sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/facade/RegistryObjectListStoreFacade.java 2009-05-19 12:15:30 UTC (rev 3992)
+++ sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/facade/RegistryObjectListStoreFacade.java 2009-05-19 12:35:22 UTC (rev 3993)
@@ -20,6 +20,7 @@
//==============================================================================
package org.geonetwork.dao.facade;
+import org.apache.log4j.Logger;
import org.geonetwork.dao.ebrim.informationmodel.RegistryObjectListDao;
import org.geonetwork.domain.ebrim.exception.GeoNetworkException;
import org.geonetwork.domain.ebrim.informationmodel.core.RegistryObjectList;
@@ -37,6 +38,8 @@
*/
public class RegistryObjectListStoreFacade {
+ private static Logger log = Logger.getLogger(RegistryObjectListStoreFacade.class);
+
private RegistryObjectListDao registryObjectListDao;
/**
@@ -49,7 +52,7 @@
*/
public void save(RegistryObjectList registryObjectList) throws GeoNetworkException {
String fileIdentifier = registryObjectList.getIso19139Id();
- System.out.println("saving RegistryObjectList with ISO ID: " + fileIdentifier);
+ log.debug("saving RegistryObjectList with ISO ID: " + fileIdentifier);
if (fileIdentifier != null) {
RegistryObjectList existingRegistryObjectList = registryObjectListDao.findRegistryObjectListByISO19139Id(fileIdentifier);
if(existingRegistryObjectList == null) {
@@ -64,7 +67,7 @@
}
else {
// invalid RegistryObjectList
- System.out.println("ERROR: RegistryObjectList has no ID");
+ log.debug("ERROR: RegistryObjectList has no ID");
throw new GeoNetworkException("ERROR: RegistryObjectList has no ID");
}
}
Modified: sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/facade/RegistryObjectStoreFacade.java
===================================================================
--- sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/facade/RegistryObjectStoreFacade.java 2009-05-19 12:15:30 UTC (rev 3992)
+++ sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/facade/RegistryObjectStoreFacade.java 2009-05-19 12:35:22 UTC (rev 3993)
@@ -22,6 +22,7 @@
import java.util.List;
+import org.apache.log4j.Logger;
import org.geonetwork.dao.ebrim.informationmodel.CoreDao;
import org.geonetwork.domain.ebrim.exception.GeoNetworkException;
import org.geonetwork.domain.ebrim.informationmodel.core.RegistryObject;
@@ -35,6 +36,9 @@
* @author Jose
*/
public class RegistryObjectStoreFacade {
+
+ private static Logger log = Logger.getLogger(RegistryObjectStoreFacade.class);
+
private static final String IDENTIFIER_NAME = "http://purl.org/dc/elements/1.1/identifier";
CoreDao coreDao;
@@ -49,12 +53,12 @@
*/
public void save(RegistryObject registryObject) throws GeoNetworkException {
- System.out.println("\n\n# slots: " + registryObject.getSlots().size());
+ log.debug("\n\n# slots: " + registryObject.getSlots().size());
if(registryObject.getSlots().size() > 0) {
for(Slot slot : registryObject.getSlots()) {
if(slot.getName().getValue().equals(IDENTIFIER_NAME)) {
- System.out.println(": " + registryObject.getObjectType().getValue() + " " + slot.getValueList().getValues().get(0).getValue());
+ log.debug(": " + registryObject.getObjectType().getValue() + " " + slot.getValueList().getValues().get(0).getValue());
}
}
@@ -84,10 +88,10 @@
List<Slot> fileIdentifierSlots = registryObject.findSlotsByName(IDENTIFIER_NAME);
if(fileIdentifierSlots == null || fileIdentifierSlots.size() == 0) {
- System.out.println("\n\n\n\n\n\nNO FILEIDENTIFER IN: ");
- System.out.println(registryObject.getObjectType().getValue());
- System.out.println(registryObject.getId().getValue());
- System.out.println(registryObject.getName().getLocalizedStrings().iterator().next().getValue());
+ log.debug("\n\n\n\n\n\nNO FILEIDENTIFER IN: ");
+ log.debug(registryObject.getObjectType().getValue());
+ log.debug(registryObject.getId().getValue());
+ log.debug(registryObject.getName().getLocalizedStrings().iterator().next().getValue());
}
Modified: sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/search/ebrim/EbrimGenericSearchDao.java
===================================================================
--- sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/search/ebrim/EbrimGenericSearchDao.java 2009-05-19 12:15:30 UTC (rev 3992)
+++ sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/search/ebrim/EbrimGenericSearchDao.java 2009-05-19 12:35:22 UTC (rev 3993)
@@ -22,6 +22,7 @@
import java.util.List;
+import org.apache.log4j.Logger;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.queryParser.ParseException;
@@ -34,6 +35,8 @@
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
public class EbrimGenericSearchDao extends HibernateDaoSupport {
+
+ private static Logger log = Logger.getLogger(EbrimGenericSearchDao.class);
@SuppressWarnings("unchecked")
public List<Object> search(String searchTerm, String[] properties, Class<?>... entities) throws GeoNetworkException {
@@ -45,7 +48,7 @@
} catch (ParseException e) {
throw new GeoNetworkException(e);
}
- System.out.println(query.toString());
+ log.debug(query.toString());
org.hibernate.Query hibQuery = fullTextSession.createFullTextQuery(query, entities);
List<Object> result = hibQuery.list();
return result;
@@ -62,7 +65,7 @@
} catch (ParseException e) {
throw new GeoNetworkException(e);
}
- System.out.println(query.toString());
+ log.debug(query.toString());
org.hibernate.search.FullTextQuery hibQuery = fullTextSession.createFullTextQuery(query, entities);
if (sortFields != null) {
@@ -76,11 +79,11 @@
}
@SuppressWarnings("unchecked")
- public List<RegistryObject> search(org.apache.lucene.search.Query query, List<SortField> sortFields, Class<?>... entities)
- throws GeoNetworkException {
+ public List<RegistryObject> search(org.apache.lucene.search.Query query, List<SortField> sortFields,
+ Class<?>... entities) throws GeoNetworkException {
FullTextSession fullTextSession = Search.getFullTextSession(this.getSession());
- System.out.println(query.toString());
+ log.debug(query.toString());
org.hibernate.search.FullTextQuery hibQuery = fullTextSession.createFullTextQuery(query, entities);
if (sortFields != null) {
Modified: sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/search/ebrim/ElementNameProcessor.java
===================================================================
--- sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/search/ebrim/ElementNameProcessor.java 2009-05-19 12:15:30 UTC (rev 3992)
+++ sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/search/ebrim/ElementNameProcessor.java 2009-05-19 12:35:22 UTC (rev 3993)
@@ -1,5 +1,6 @@
package org.geonetwork.search.ebrim;
+import org.apache.log4j.Logger;
import org.geonetwork.domain.ebrim.informationmodel.core.RegistryObject;
import org.geonetwork.search.ebrim.filter.XPathPropertyResolver;
import org.geonetwork.search.ebrim.filter.queryfields.Field;
@@ -11,6 +12,12 @@
public class ElementNameProcessor {
+
+
+ private static Logger log = Logger.getLogger(ElementNameProcessor.class);
+
+
+
public static void processElementNames(List<RegistryObject> data,
List<String> elementNames, List<String> typeNames) {
@@ -40,7 +47,7 @@
// Show values
for(Object v : values) {
- System.out.println(elementName + " : " + v);
+ log.debug(elementName + " : " + v);
}
}
}
Added: sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/resources/log4j.properties
===================================================================
--- sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/resources/log4j.properties (rev 0)
+++ sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/resources/log4j.properties 2009-05-19 12:35:22 UTC (rev 3993)
@@ -0,0 +1,16 @@
+#LOGGER
+log4j.rootCategory=WARN, APPENDER_OUT, APPENDER_FILE
+log4j.logger.org.geonetwork=INFO
+
+
+#APPENDER_OUT
+log4j.appender.APPENDER_OUT=org.apache.log4j.ConsoleAppender
+log4j.appender.APPENDER_OUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.APPENDER_OUT.layout.ConversionPattern=%d{ISO8601} | %t | %-5p | %-20C{1} | %-15M | %3L | %m %n
+
+#APPENDER_FILE
+log4j.appender.APPENDER_FILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.APPENDER_FILE.File=${catalina.home}/logs/geonetwork-ebrim.html
+log4j.appender.APPENDER_FILE.DatePattern=.yyyyMMdd
+log4j.appender.APPENDER_FILE.layout=org.apache.log4j.HTMLLayout
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|