diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java index 90139adaa..75b9c0efa 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java @@ -42,7 +42,8 @@ public class Classes2ClassesOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException f) { - e.printStackTrace(); + log.error(f, f); + throw new RuntimeException(f); } return; } @@ -52,7 +53,8 @@ public class Classes2ClassesOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } return; } @@ -115,7 +117,7 @@ public class Classes2ClassesOperationController extends BaseEditController { } } } catch (Exception e) { - //e.printStackTrace(); + log.error(e, e); } } @@ -127,13 +129,15 @@ public class Classes2ClassesOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } } else { try { response.sendRedirect(referer); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java index 3eb26241c..8bf3792da 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java @@ -88,7 +88,7 @@ public class DatapropEditController extends BaseEditController { try { domainStr = (dp.getDomainClassURI() == null) ? "" : ""+dp.getDomainClassURI()+""; } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + log.error(e, e); } results.add(domainStr); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java index 15289af7b..5a25efc0b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java @@ -145,7 +145,9 @@ public class EntityEditController extends BaseEditController { } } OptionMap.put("externalIds", externalIdOptionList); - } catch (Exception e) {e.printStackTrace();} + } catch (Exception e) { + log.error(e, e); + } List classGroups = vreq.getFullWebappDaoFactory().getVClassGroupDao().getPublicGroupsWithVClasses(true,true,false); // order by displayRank, include uninstantiated classes, don't count the individuals Iterator classGroupIt = classGroups.iterator(); @@ -158,7 +160,9 @@ public class EntityEditController extends BaseEditController { } try { OptionMap.put("VClassURI", optGroupMap); - } catch (Exception e) {e.printStackTrace();} + } catch (Exception e) { + log.error(e, e); + } PropertyInstanceDao piDao = vreq.getFullWebappDaoFactory().getPropertyInstanceDao(); // existing property statements @@ -173,7 +177,7 @@ public class EntityEditController extends BaseEditController { } OptionMap.put("ExistingPropertyInstances", epiOptionList); } catch (Exception e) { - e.printStackTrace(); + log.error(e, e); } // possible property statements try { @@ -182,7 +186,7 @@ public class EntityEditController extends BaseEditController { piList.addAll(piColl); OptionMap.put("PropertyURI", FormUtils.makeOptionListFromBeans(piList, "PropertyURI", "DomainPublic", (String)null, (String)null, false)); } catch (Exception e) { - e.printStackTrace(); + log.error(e, e); } foo.setOptionLists(OptionMap); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java index cc543196a..ff3fa8cd2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java @@ -40,7 +40,8 @@ public class IndividualTypeOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException f) { - e.printStackTrace(); + log.error(f, f); + throw new RuntimeException(f); } return; } @@ -50,7 +51,8 @@ public class IndividualTypeOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } return; } @@ -71,7 +73,7 @@ public class IndividualTypeOperationController extends BaseEditController { dao.addVClass(request.getParameter("individualURI"),request.getParameter("TypeURI")); } } catch (Exception e) { - //e.printStackTrace(); + log.error(e, e); } } @@ -83,13 +85,15 @@ public class IndividualTypeOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } } else { try { response.sendRedirect(referer); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java index b2e726322..5488392b2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java @@ -49,7 +49,8 @@ public class NamespacePrefixOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException f) { - e.printStackTrace(); + log.error(f, f); + throw new RuntimeException(f); } return; } @@ -59,7 +60,8 @@ public class NamespacePrefixOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } return; } @@ -127,13 +129,15 @@ public class NamespacePrefixOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } } else { try { response.sendRedirect(referer); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java index 263abd732..464305508 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java @@ -46,7 +46,8 @@ public class Properties2PropertiesOperationController extends try { response.sendRedirect(defaultLandingPage); } catch (IOException f) { - e.printStackTrace(); + log.error(f, f); + throw new RuntimeException(f); } return; } @@ -88,13 +89,15 @@ public class Properties2PropertiesOperationController extends try { response.sendRedirect(defaultLandingPage); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } } else { try { response.sendRedirect(referer); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java index 71f3b7d12..9802f6452 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java @@ -82,7 +82,9 @@ public class PropertyEditController extends BaseEditController { if (parent != null && parent.getURI() != null) { try { parentPropertyStr = ""+parent.getLocalNameWithPrefix()+""; - } catch (UnsupportedEncodingException e) {e.printStackTrace();} + } catch (UnsupportedEncodingException e) { + log.error(e, e); + } } } results.add(parentPropertyStr); // column 2 @@ -97,7 +99,9 @@ public class PropertyEditController extends BaseEditController { } else { domainStr = ""+domainClass.getLocalNameWithPrefix()+""; } - } catch (UnsupportedEncodingException e) {e.printStackTrace();} + } catch (UnsupportedEncodingException e) { + log.error(e, e); + } } } results.add(domainStr); // column 3 @@ -112,7 +116,9 @@ public class PropertyEditController extends BaseEditController { } else { rangeStr = ""+rangeClass.getLocalNameWithPrefix()+""; } - } catch (UnsupportedEncodingException e) {e.printStackTrace();} + } catch (UnsupportedEncodingException e) { + log.error(e, e); + } } } results.add(rangeStr); // column 4 diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java index d356e928f..88c2a6711 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java @@ -471,7 +471,8 @@ public class RefactorOperationController extends BaseEditController { try { response.sendRedirect(defaultLandingPage); } catch (IOException f) { - e.printStackTrace(); + log.error(f, f); + throw new RuntimeException(f); } return; } @@ -507,7 +508,8 @@ public class RefactorOperationController extends BaseEditController { try { response.sendRedirect(redirectStr); } catch (IOException e) { - e.printStackTrace(); + log.error(e, e); + throw new RuntimeException(e); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java index 88b8d2dca..b96d1c2be 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java @@ -191,12 +191,13 @@ public class RestrictionOperationController extends BaseEditController { } } catch (Exception e) { - e.printStackTrace(); + log.error(e, e); try { response.sendRedirect(defaultLandingPage); return; } catch (Exception f) { - e.printStackTrace(); + log.error(f, f); + throw new RuntimeException(f); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java index 9534a1a97..69d2eff4a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java @@ -181,7 +181,7 @@ public class VclassEditController extends BaseEditController { } request.setAttribute("disjointClasses",djVClasses); } catch (Exception e) { - e.printStackTrace(); + log.error(e, e); } try { @@ -200,7 +200,7 @@ public class VclassEditController extends BaseEditController { request.setAttribute("equivalentClasses",eqVClasses); } catch (Exception e) { log.error("Couldn't get the equivalent classes: "); - e.printStackTrace(); + log.error(e, e); } // add the options diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java index f6e2f92ea..abb572095 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java @@ -319,7 +319,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { } } } catch (Exception e) { - e.printStackTrace(); + log.error(e, e); } for (Iterator oldIt = oldTypeURIsSet.iterator(); oldIt.hasNext();) { String uri = oldIt.next(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java index d9ac6496f..4a877d39e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java @@ -618,7 +618,7 @@ public class IndividualJena extends IndividualImpl implements Individual { else rv = 0; } catch (NullPointerException e) { - e.printStackTrace(); + log.error(e, e); } if( cAsc ) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java index ae48dac7a..14f8fd178 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java @@ -952,7 +952,7 @@ public class IndividualSDB extends IndividualImpl implements Individual { else rv = 0; } catch (NullPointerException e) { - e.printStackTrace(); + log.error(e, e); } if( cAsc ) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java index 739732ae7..14ec5aeb0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java @@ -221,7 +221,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp p.setGroupURI(groupRes.getURI()); } } catch (Throwable t) { - t.printStackTrace(); + log.error(t, t); } return p; } @@ -401,7 +401,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp try { doUpdate(prop,p,inv,ontModel); } catch (Exception e) { - e.printStackTrace(); + log.error(e, e); } } finally { getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),false)); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java index bac0a1480..2fb76b88a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java @@ -105,7 +105,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec try { objPropertyStmt.setObjectURI(((Resource)st.getObject()).getURI()); } catch (Throwable t) { - t.printStackTrace(); + log.error(t, t); } objPropertyStmt.setPropertyURI(st.getPredicate().getURI()); try { @@ -137,7 +137,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec objPropertyStmtList.add(objPropertyStmt); } } catch (Throwable t) { - t.printStackTrace(); + log.error(t, t); } } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java index d945e32a6..3ce03edca 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java @@ -112,7 +112,9 @@ public class VClassDaoSDB extends VClassDaoJena { group.add(vcw); } } - } catch (ClassCastException cce) {cce.printStackTrace();} + } catch (ClassCastException cce) { + log.error(cce, cce); + } } } finally { annotIt.close(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSDBModelMaker.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSDBModelMaker.java index ffc84f15b..2eeb8900f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSDBModelMaker.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSDBModelMaker.java @@ -166,7 +166,7 @@ public class VitroJenaSDBModelMaker implements ModelMaker { qe.execAsk(); return true; } catch (Exception e) { - e.printStackTrace(); + log.error(e, e); return false; } finally { qe.close(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java index 8272acf26..6ac3b4f68 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java @@ -392,8 +392,7 @@ public class PelletListener implements ModelChangedListener { localRemovalQueue.clear(); } catch (Exception e) { - log.error("Exception in "+this.getClass().getName()+".getInferences()"); - e.printStackTrace(); + log.error("Error getting inferences", e); } tempModel = null; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java index 68f2af94d..b2d049f67 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java @@ -293,7 +293,7 @@ public class JenaIngestUtils { processor = stringProcessorClass.newInstance(); meth = stringProcessorClass.getMethod(processorMethod,methArgs); } catch (Exception e) { - e.printStackTrace(); + log.error(e, e); return; } Property prop = ResourceFactory.createProperty(originalPropertyURI); @@ -314,7 +314,7 @@ public class JenaIngestUtils { } newLex = (String) meth.invoke(processor,args); } catch (Exception e) { - e.printStackTrace(); + log.error(e, e); return; } if (!newLex.equals(lex)) {