Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VIVO-1246 Improve the ConfigurationBeanLoader #52

Merged

Conversation

j2blake
Copy link
Member

@j2blake j2blake commented Dec 23, 2016

See description in JIRA issue (https://jira.duraspace.org/browse/VIVO-1246) and README.md in this pull request.

Supersedes #39

Add cardinality parameters minOccurs and maxOccurs
Create README.md document in the edu.cornell.mannlib.vitro.webapp.utils.configuration package
Split large class of unit tests into separate classes by functionality
Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.
…velop

# By Graham Triggs
# Via grahamtriggs (2) and Graham Triggs (1)
* 'develop' of git://github.com/vivo-project/Vitro:
  [VIVO-1224] Suppress default "synthetic" model from the lists on the ingest pages
  [VIVO-1230] Make contact form compatible with SMTP relays
  [VIVO-1233] Wrap large buttons on ontology edit page
  Fix error message (change erroneous UPDATE to SELECT)
…velop

# Conflicts:
#	api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java
#	api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
@j2blake j2blake changed the title Improve the ConfigurationBeanLoader VIVO-1246 Improve the ConfigurationBeanLoader Dec 23, 2016
@j2blake j2blake merged commit a8ec633 into vivo-project:develop Jan 3, 2017
j2blake added a commit to j2blake/Vitro that referenced this pull request Jan 3, 2017
* develop: (72 commits)
  VIVO-1246 Improve the ConfigurationBeanLoader (vivo-project#52)
  Remove unneeded calls to JSONObject.quote()
  Add explicit dependency on commons-collections, as it is used directly in Vitro code
  Doesn’t look like we need cxd or cos anymore, so commented out.
  Migrate last dependencies on commons-lang 2.x
  Allow owlapi to use transitive dependencies
  Move jaxrpc to VIVO
  Remove COS dependency from JSP
  [VIVO-1312] Implement Linked Data Fragment Server (vivo-project#53)
  Exclude rio dependencies so that Sesame isn’t included
  Update POM to require Java 8 (Jena 3.x does not support earlier versions)
  Update JFact, OWLAPI and jsonld-java
  Explode the OWLAPI OSGi distribution to separate JARs so that we don’t bring in the embedded dependencies
  Update httpclient to 4.5.2 to resolve a nonsuchmethoderrror
  Remove VIVOWEB Maven repository as Vitro no longer requires dependencies that are not in Maven central
  Replace old, undistributed CSV parser library with Commons CSV
  Remove unused JAI dependencies
  Remove unused Fedora connection
  Correct stage 1 migration - remove old JAI processor testers to fix the build
  Committed wrong files - removing incomplete image processor testers from image
  ...

# Conflicts:
#	api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
#	api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
#	api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/RdfServiceQueryContext.java
@j2blake j2blake deleted the feature/VIVO-1246_config_loader branch January 5, 2018 15:22
chenejac pushed a commit to chenejac/Vitro that referenced this pull request Sep 29, 2022
* [maven-release-plugin] prepare release vitro-languages-1.12.0

* [maven-release-plugin] prepare for next development iteration
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant