diff --git a/webapp/lib/arq-2.8.5-tests.jar b/webapp/lib/arq-2.8.5-tests.jar deleted file mode 100644 index d8a6997ca..000000000 Binary files a/webapp/lib/arq-2.8.5-tests.jar and /dev/null differ diff --git a/webapp/lib/arq-2.8.5.jar b/webapp/lib/arq-2.8.5.jar deleted file mode 100644 index f89b6937e..000000000 Binary files a/webapp/lib/arq-2.8.5.jar and /dev/null differ diff --git a/webapp/lib/arq-2.8.7-tests.jar b/webapp/lib/arq-2.8.7-tests.jar new file mode 100644 index 000000000..734452525 Binary files /dev/null and b/webapp/lib/arq-2.8.7-tests.jar differ diff --git a/webapp/lib/arq-2.8.7.jar b/webapp/lib/arq-2.8.7.jar new file mode 100644 index 000000000..e6fdf2aba Binary files /dev/null and b/webapp/lib/arq-2.8.7.jar differ diff --git a/webapp/lib/jena-2.6.3-sources.jar b/webapp/lib/jena-2.6.3-sources.jar deleted file mode 100644 index ef40629be..000000000 Binary files a/webapp/lib/jena-2.6.3-sources.jar and /dev/null differ diff --git a/webapp/lib/jena-2.6.3-test-sources.jar b/webapp/lib/jena-2.6.3-test-sources.jar deleted file mode 100644 index 235e0815d..000000000 Binary files a/webapp/lib/jena-2.6.3-test-sources.jar and /dev/null differ diff --git a/webapp/lib/jena-2.6.3-tests.jar b/webapp/lib/jena-2.6.4-tests.jar similarity index 90% rename from webapp/lib/jena-2.6.3-tests.jar rename to webapp/lib/jena-2.6.4-tests.jar index 398ef942c..fe410be35 100644 Binary files a/webapp/lib/jena-2.6.3-tests.jar and b/webapp/lib/jena-2.6.4-tests.jar differ diff --git a/webapp/lib/jena-2.6.3.jar b/webapp/lib/jena-2.6.4.jar similarity index 76% rename from webapp/lib/jena-2.6.3.jar rename to webapp/lib/jena-2.6.4.jar index 47a67dca6..efc64a94f 100644 Binary files a/webapp/lib/jena-2.6.3.jar and b/webapp/lib/jena-2.6.4.jar differ diff --git a/webapp/lib/mysql-connector-java-3.0.16-ga-bin.jar b/webapp/lib/mysql-connector-java-3.0.16-ga-bin.jar deleted file mode 100644 index 8deaaf498..000000000 Binary files a/webapp/lib/mysql-connector-java-3.0.16-ga-bin.jar and /dev/null differ diff --git a/webapp/lib/mysql-connector-java-5.1.16-bin.jar b/webapp/lib/mysql-connector-java-5.1.16-bin.jar new file mode 100644 index 000000000..e62f2cb77 Binary files /dev/null and b/webapp/lib/mysql-connector-java-5.1.16-bin.jar differ diff --git a/webapp/lib/sdb-1.3.2-tests.jar b/webapp/lib/sdb-1.3.4-tests.jar similarity index 73% rename from webapp/lib/sdb-1.3.2-tests.jar rename to webapp/lib/sdb-1.3.4-tests.jar index ba4bb4ceb..98505d8bc 100644 Binary files a/webapp/lib/sdb-1.3.2-tests.jar and b/webapp/lib/sdb-1.3.4-tests.jar differ diff --git a/webapp/lib/sdb-1.3.2.jar b/webapp/lib/sdb-1.3.4.jar similarity index 76% rename from webapp/lib/sdb-1.3.2.jar rename to webapp/lib/sdb-1.3.4.jar index d8e3d3af2..e05df4095 100644 Binary files a/webapp/lib/sdb-1.3.2.jar and b/webapp/lib/sdb-1.3.4.jar differ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java index 4d1a8b6cf..ba230dbba 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java @@ -52,24 +52,15 @@ public class PropertyRestrictionPolicyHelper { private static final Collection PERMITTED_EXCEPTIONS = Arrays .asList(new String[] { VitroVocabulary.MONIKER, - VitroVocabulary.BLURB, - VitroVocabulary.DESCRIPTION, VitroVocabulary.MODTIME, - VitroVocabulary.TIMEKEY, - VitroVocabulary.CITATION, VitroVocabulary.IND_MAIN_IMAGE, VitroVocabulary.LINK, VitroVocabulary.PRIMARY_LINK, VitroVocabulary.ADDITIONAL_LINK, VitroVocabulary.LINK_ANCHOR, - VitroVocabulary.LINK_URL, - - VitroVocabulary.KEYWORD_INDIVIDUALRELATION, - VitroVocabulary.KEYWORD_INDIVIDUALRELATION_INVOLVESKEYWORD, - VitroVocabulary.KEYWORD_INDIVIDUALRELATION_INVOLVESINDIVIDUAL, - VitroVocabulary.KEYWORD_INDIVIDUALRELATION_MODE }); + VitroVocabulary.LINK_URL }); /** * The bean is attached to the ServletContext using this attribute name. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java index 5d0100cc7..1131effdc 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java @@ -36,17 +36,5 @@ public interface DataPropertyStatement { public void setLanguage(String language); - public Date getSunrise(); - - public void setSunrise(Date sunrise); - - public Date getSunset(); - - public void setSunset(Date sunset); - /* - public String getQualifier(); - - public void setQualifier(String qualifier); - */ public String getString(); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java index ca65aaa75..5f2be0e50 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java @@ -8,19 +8,15 @@ import java.util.Date; * a class representing an particular instance of a data property * */ -public class DataPropertyStatementImpl implements VitroTimeWindowedResource, DataPropertyStatement +public class DataPropertyStatementImpl implements DataPropertyStatement { private Individual individual = null; private String individualURI = null; private String data = null; private String datapropURI = null; private String datatypeURI = null; - private String language = null; - - private Date sunrise = null; - private Date sunset = null; - //private String qualifier = null; - + private String language = null; + public DataPropertyStatementImpl(){ } @@ -84,30 +80,6 @@ public class DataPropertyStatementImpl implements VitroTimeWindowedResource, Dat this.language = language; } - public Date getSunrise() { - return sunrise; - } - - public void setSunrise(Date sunrise) { - this.sunrise = sunrise; - } - - public Date getSunset() { - return sunset; - } - - public void setSunset(Date sunset) { - this.sunset = sunset; - } - /* - public String getQualifier() { - return qualifier; - } - - public void setQualifier(String qualifier) { - this.qualifier = qualifier; - } - */ public String getString(){ String out = "instance of dataprop: " + datapropURI; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java index ac4da1848..1cda72999 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java @@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch; * Date: Oct 18, 2007 * Time: 3:08:33 PM */ -public interface Individual extends ResourceBean, VitroTimeWindowedResource, Comparable { +public interface Individual extends ResourceBean, Comparable { String getName(); void setName(String in); @@ -31,15 +31,6 @@ public interface Individual extends ResourceBean, VitroTimeWindowedResource, Com String getVClassURI(); void setVClassURI(String in); - //Date getSunrise(); - void setSunrise(Date in); - - //Date getSunset(); - void setSunset(Date in); - - Date getTimekey(); - void setTimekey(Date in); - Timestamp getModTime(); void setModTime(Timestamp in); @@ -92,24 +83,6 @@ public interface Individual extends ResourceBean, VitroTimeWindowedResource, Com List getExternalIds(); void setExternalIds(List externalIds); - String getMoniker(); - void setMoniker(String in); - - String getDescription(); - void setDescription(String in); - - String getAnchor(); - void setAnchor(String in); - - String getBlurb(); - void setBlurb(String in); - - int getStatusId(); - void setStatusId(int in); - - String getStatus(); - void setStatus(String s); - void setMainImageUri(String mainImageUri); String getMainImageUri(); @@ -117,22 +90,6 @@ public interface Individual extends ResourceBean, VitroTimeWindowedResource, Com String getThumbUrl(); boolean hasThumb(); - String getUrl(); - void setUrl(String url); - - List getLinksList(); - void setLinksList(List linksList); - - Link getPrimaryLink(); - void setPrimaryLink(Link link); - - List getKeywords(); - void setKeywords(List keywords); - String getKeywordString(); - - List getKeywordObjects(); - void setKeywordObjects(List keywords); - void sortForDisplay(); JSONObject toJSON() throws JSONException; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java index c9a3a9c4b..ab3024b86 100755 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java @@ -2,17 +2,25 @@ package edu.cornell.mannlib.vitro.webapp.beans; +import java.lang.reflect.Method; +import java.sql.Timestamp; +import java.text.Collator; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; + import org.json.JSONException; import org.json.JSONObject; import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo; import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch; -import java.lang.reflect.Method; -import java.sql.Timestamp; -import java.text.Collator; -import java.util.*; - /** * Represents a single entity record. */ @@ -31,9 +39,6 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp protected VClass vClass = null; protected List directVClasses = null; protected List allVClasses = null; - protected Date sunrise = null; - protected Date sunset = null; - protected Date timekey = null; protected Timestamp modTime = null; protected List propertyList = null; protected List populatedObjectPropertyList = null; @@ -46,19 +51,8 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp protected List rangeEnts2Ents = null; protected List externalIds = null; - protected String moniker = null; - protected String url = null; - protected String description = null; - protected String anchor = null; - protected String blurb = null; protected String mainImageUri = NOT_INITIALIZED; protected ImageInfo imageInfo = null; - protected int statusId = 0; - protected String status = null; - protected List linksList = null; - protected Link primaryLink = null; - protected List keywords=null; - protected List keywordObjects=null; protected Float searchBoost; /** indicates if sortForDisplay has been called */ @@ -86,23 +80,10 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp public String getRdfsLabel(){ return rdfsLabel; } public void setRdfsLabel(String s){ rdfsLabel = s; } - -// private String modTime = null; -// public String getModtime(){return modTime;} -// public void setModtime(String in){modTime=in;} public String getVClassURI(){return vClassURI;} public void setVClassURI(String in){vClassURI=in;} - public Date getSunrise(){return sunrise;} - public void setSunrise(Date in){sunrise=in;} - - public Date getSunset(){return sunset;} - public void setSunset(Date in){sunset=in;} - - public Date getTimekey(){return timekey;} - public void setTimekey(Date in){timekey=in;} - /** * Returns the last time this object was changed in the model. * Notice Java API craziness: Timestamp is a subclass of Date @@ -271,26 +252,6 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp public void setExternalIds(List externalIds){ this.externalIds = externalIds; } - - - public String getMoniker(){return moniker;} - public void setMoniker(String in){moniker=in;} - - public String getDescription(){return description;} - public void setDescription(String in){description=in;} - - public String getAnchor(){return anchor;} - public void setAnchor(String in){anchor=in;} - - public String getBlurb(){return blurb;} - public void setBlurb(String in){blurb=in;} - - public int getStatusId(){return statusId;} - public void setStatusId(int in){statusId=in;} - - public String getStatus() {return status;} - public void setStatus(String s) {status=s; } - @Override public String getMainImageUri() { @@ -313,61 +274,6 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp return "thumbUrl"; } - public String getUrl() { - return url; - } - public void setUrl(String url) { - this.url = url; - } - public List getLinksList() { - return linksList; - } - public void setLinksList(List linksList) { - this.linksList = linksList; - } - - public Link getPrimaryLink() { - return primaryLink; - } - - public void setPrimaryLink(Link link) { - primaryLink = link; - } - - public List getKeywords() { return keywords; } - public void setKeywords(List keywords) {this.keywords = keywords;} - public String getKeywordString(){ - String rv = ""; - List keywords=getKeywords(); - if (getKeywords()!=null){ - Iterator it1 = getKeywords().iterator(); - TreeSet keywordSet = new TreeSet(new Comparator() { - public int compare( String first, String second ) { - if (first==null) { - return 1; - } - if (second==null) { - return -1; - } - Collator collator = Collator.getInstance(); - return collator.compare(first,second); - } - }); - while( it1.hasNext() ){ - keywordSet.add(it1.next()); - } - Iterator it2 = keywordSet.iterator(); - while (it2.hasNext()) { - rv+= it2.next(); - if( it2.hasNext()) - rv+=", "; - } - } - return rv; - } - public List getKeywordObjects() { return keywordObjects; } - public void setKeywordObjects(List keywords) {this.keywordObjects = keywords;} - public Float getSearchBoost() { return searchBoost; } public void setSearchBoost(Float boost) { searchBoost = boost; } @@ -421,8 +327,6 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp if( "name".equalsIgnoreCase(fieldName) ) return getName(); - if( "timekey".equalsIgnoreCase(fieldName) ) - return getTimekey(); //not one of the more common ones, try reflection diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java index b5a831bbe..cbe60b321 100755 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java @@ -7,10 +7,6 @@ public interface ObjectPropertyStatement { public String toString(); - public String getDescription(); - - public void setDescription(String description); - public boolean isSubjectOriented(); public void setSubjectOriented(boolean subjectOriented); @@ -19,10 +15,6 @@ public interface ObjectPropertyStatement { public void setSubjectURI(String subjectURI); - public String getQualifier(); - - public void setQualifier(String qualifier); - public String getObjectURI(); public void setObjectURI(String objectURI); @@ -43,14 +35,6 @@ public interface ObjectPropertyStatement { public void setPropertyURI(String URI); - public void setSunrise(Date date); - - public Date getSunrise(); - - public void setSunset(Date date); - - public Date getSunset(); - public PropertyInstance toPropertyInstance(); } \ No newline at end of file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java index 8504d859d..af6776fc4 100755 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java @@ -9,7 +9,7 @@ import java.util.Date; * a class representing a particular instance of an object property * */ -public class ObjectPropertyStatementImpl implements VitroTimeWindowedResource, ObjectPropertyStatement +public class ObjectPropertyStatementImpl implements ObjectPropertyStatement { private String subjectURI = null; private Individual subject = null; @@ -41,22 +41,6 @@ public class ObjectPropertyStatementImpl implements VitroTimeWindowedResource, O return "Object Property Statements: "+dom+" "+prop+" to "+ran+" "+orent; } - /* (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getDescription() - */ - public String getDescription() { - return description; - } - - - /* (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setDescription(java.lang.String) - */ - public void setDescription(String description) { - this.description = description; - } - - /* (non-Javadoc) * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#isSubjectOriented() */ @@ -87,22 +71,6 @@ public class ObjectPropertyStatementImpl implements VitroTimeWindowedResource, O this.subjectURI = subjectURI; } - /* (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getQualifier() - */ - public String getQualifier() { - return qualifier; - } - - - /* (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setQualifier(java.lang.String) - */ - public void setQualifier(String qualifier) { - this.qualifier = qualifier; - } - - /* (non-Javadoc) * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getObjectURI() */ @@ -196,32 +164,6 @@ public class ObjectPropertyStatementImpl implements VitroTimeWindowedResource, O } } - private Date sunrise = null; - /* (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setSunrise(java.util.Date) - */ - public void setSunrise(Date date) { - sunrise = date; - } - /* (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getSunrise() - */ - public Date getSunrise(){ - return sunrise; - } - - private Date sunset = null; - /* (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setSunset(java.util.Date) - */ - public void setSunset(Date date) { - sunset = date; - } - /* (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getSunset() - */ - public Date getSunset(){ return sunset; } - /* (non-Javadoc) * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#toPropertyInstance() */ @@ -231,7 +173,6 @@ public class ObjectPropertyStatementImpl implements VitroTimeWindowedResource, O pi.setPropertyURI(propertyURI); pi.setSubjectEntURI(subjectURI); pi.setObjectEntURI(objectURI); - pi.setQualifier(qualifier); pi.setSubjectSide(subjectOriented); return pi; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java index 73b78eb56..a74d3b04f 100755 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java @@ -14,9 +14,6 @@ public class PropertyInstance implements PropertyInstanceIface, Comparable results = new ArrayList(); - int colCount = 6; + int colCount = 4; results.add("Name"); - results.add("moniker"); results.add("class"); - results.add("blurb"); results.add("display level"); results.add("edit level"); results.add("last updated"); @@ -100,8 +94,6 @@ public class EntityEditController extends BaseEditController { rName = "[resource]"; } results.add(rName); - String rMoniker = (ent.getMoniker()==null) ? "unspecified" : ent.getMoniker(); - results.add(rMoniker); String classStr = ""; List classList = inferredEnt.getVClasses(false); @@ -123,10 +115,7 @@ public class EntityEditController extends BaseEditController { } } results.add(classStr); - - String rBlurb = (ent.getBlurb()==null) ? "" : ent.getBlurb(); - results.add(rBlurb); - + results.add(ent.getHiddenFromDisplayBelowRoleLevel() == null ? "unspecified" : ent.getHiddenFromDisplayBelowRoleLevel().getLabel()); results.add(ent.getProhibitedFromUpdateBelowRoleLevel() == null ? "unspecified" : ent.getProhibitedFromUpdateBelowRoleLevel().getLabel()); @@ -157,11 +146,7 @@ public class EntityEditController extends BaseEditController { } OptionMap.put("externalIds", externalIdOptionList); } catch (Exception e) {e.printStackTrace();} - - try { - OptionMap.put("ExtraURL", FormUtils.makeOptionListFromBeans(ent.getLinksList(), "URI", "Anchor", null, null, false)); - } catch (Exception e) {e.printStackTrace();} - + List classGroups = vreq.getFullWebappDaoFactory().getVClassGroupDao().getPublicGroupsWithVClasses(true,true,false); // order by displayRank, include uninstantiated classes, don't count the individuals Iterator classGroupIt = classGroups.iterator(); ListOrderedMap optGroupMap = new ListOrderedMap(); @@ -201,28 +186,6 @@ public class EntityEditController extends BaseEditController { } foo.setOptionLists(OptionMap); - - List