diff --git a/_maven-base/pom.xml b/_maven-base/pom.xml index 0bf45ed..d3fafd3 100644 --- a/_maven-base/pom.xml +++ b/_maven-base/pom.xml @@ -83,17 +83,41 @@ - ../requel + ../exception + ../initializer ../command + ../repository + ../nlp + ../requel + + com.rreganjr.requel + exception + 1.0.3 + + + com.rreganjr.requel + initializer + 1.0.3 + com.rreganjr.requel command 1.0.3 + + com.rreganjr.requel + nlp + 1.0.3 + + + com.rreganjr.requel + repository + 1.0.3 + com.rreganjr.requel requel @@ -248,14 +272,6 @@ spellchecker 2.6.0 - - edu.stanford.nlp diff --git a/command/command.iml b/command/command.iml index 9dd1534..fc58a17 100644 --- a/command/command.iml +++ b/command/command.iml @@ -11,6 +11,20 @@ + + + + + + + + + + + + + + diff --git a/command/pom.xml b/command/pom.xml index 75c7be9..9961f52 100644 --- a/command/pom.xml +++ b/command/pom.xml @@ -14,6 +14,11 @@ + + com.rreganjr.requel + exception + + org.springframework diff --git a/requel/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryTest.java b/dictionary/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryTest.java similarity index 95% rename from requel/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryTest.java rename to dictionary/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryTest.java index 7de8a0b..17b0015 100644 --- a/requel/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryTest.java +++ b/dictionary/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryTest.java @@ -9,9 +9,6 @@ import java.io.FileOutputStream; import com.rreganjr.AbstractIntegrationTestCase; -import com.rreganjr.nlp.dictionary.Dictionary; -import com.rreganjr.nlp.dictionary.Sense; -import com.rreganjr.nlp.dictionary.Word; import com.rreganjr.nlp.dictionary.command.ExportDictionaryCommand; import com.rreganjr.nlp.dictionary.impl.command.ExportDictionaryCommandImpl; import com.rreganjr.nlp.dictionary.impl.command.ImportDictionaryCommandImpl; diff --git a/requel/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryWordnetTests.java b/dictionary/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryWordnetTests.java similarity index 87% rename from requel/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryWordnetTests.java rename to dictionary/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryWordnetTests.java index d602d4f..f883aaf 100644 --- a/requel/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryWordnetTests.java +++ b/dictionary/src/test/java/com/rreganjr/nlp/dictionary/DictionaryRepositoryWordnetTests.java @@ -61,7 +61,7 @@ public void testSimilarityCancerCold() throws Exception { try { assertMostSimilar("cancer", PartOfSpeech.NOUN, 1, "cold", PartOfSpeech.NOUN, 1); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -70,7 +70,7 @@ public void testSimilarityBankLibrary() throws Exception { try { assertMostSimilar("bank", PartOfSpeech.NOUN, 9, "library", PartOfSpeech.NOUN, 3); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -79,7 +79,7 @@ public void testSimilarityBankBrae() throws Exception { try { assertMostSimilar("bank", PartOfSpeech.NOUN, 1, "brae", PartOfSpeech.NOUN, 1); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -88,7 +88,7 @@ public void testSimilarityRunWalk() throws Exception { try { assertMostSimilar("run", PartOfSpeech.NOUN, 7, "walk", PartOfSpeech.NOUN, 1); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -97,7 +97,7 @@ public void testSimilarityRunDevelop() throws Exception { try { assertMostSimilar("run", PartOfSpeech.VERB, 37, "develop", PartOfSpeech.VERB, 18); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -107,7 +107,7 @@ public void testDefinitionSimilarityDepositDeposit() throws Exception { assertMostDefinitionSimilarity("deposit", PartOfSpeech.NOUN, 4, "deposit", PartOfSpeech.VERB, 2); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -116,7 +116,7 @@ public void testRelatednessDepositDeposit() throws Exception { try { assertMostRelated("deposit", PartOfSpeech.NOUN, 4, "deposit", PartOfSpeech.VERB, 2); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -187,7 +187,7 @@ public void testDefinitionSimilarityBankDeposit() throws Exception { assertMostDefinitionSimilarity("bank", PartOfSpeech.NOUN, 2, "deposit", PartOfSpeech.VERB, 2); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -197,7 +197,7 @@ public void testDefinitionSimilarityBillPay() throws Exception { assertMostDefinitionSimilarity("bill", PartOfSpeech.NOUN, 2, "pay", PartOfSpeech.VERB, 1); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -209,7 +209,7 @@ public void testDefinitionSimilarityBillUnconstitutional() throws Exception { assertMostDefinitionSimilarity("bill", PartOfSpeech.NOUN, 1, "unconstitutional", PartOfSpeech.ADJECTIVE, 1); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -221,7 +221,7 @@ public void testDefinitionSimilarityAmendmentUnconstitutional() throws Exception assertMostDefinitionSimilarity("amendment", PartOfSpeech.NOUN, 2, "unconstitutional", PartOfSpeech.ADJECTIVE, 1); } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -246,7 +246,7 @@ public void testColocations() throws Exception { } } } catch (Exception e) { - log.error("exception in test: " + e, e); + AbstractIntegrationTestCase.log.error("exception in test: " + e, e); throw e; } } @@ -257,11 +257,11 @@ public void testDisambiguate() { NLPText text = process(sentence); long start = System.currentTimeMillis(); wordSenseDisambiguator.process(text); - log.info("wsd time: " + (System.currentTimeMillis() - start) + " ms"); - log.info(constituentPrinter.process(text)); - log.info(dependencyPrinter.process(text)); + AbstractIntegrationTestCase.log.info("wsd time: " + (System.currentTimeMillis() - start) + " ms"); + AbstractIntegrationTestCase.log.info(constituentPrinter.process(text)); + AbstractIntegrationTestCase.log.info(dependencyPrinter.process(text)); String actualSenseInfo = senseInfoPrinter.process(text); - log.info(actualSenseInfo); + AbstractIntegrationTestCase.log.info(actualSenseInfo); for (NLPText word : text.getLeaves()) { if (word.getDictionaryWordSense() != null) { Synset synset = word.getDictionaryWordSense().getSynset(); @@ -279,18 +279,18 @@ public void testDisambiguate2() { NLPText text = process(sentence); long start = System.currentTimeMillis(); wordSenseDisambiguator.process(text); - log.info("wsd time: " + (System.currentTimeMillis() - start) + " ms"); - log.info(constituentPrinter.process(text)); - log.info(dependencyPrinter.process(text)); + AbstractIntegrationTestCase.log.info("wsd time: " + (System.currentTimeMillis() - start) + " ms"); + AbstractIntegrationTestCase.log.info(constituentPrinter.process(text)); + AbstractIntegrationTestCase.log.info(dependencyPrinter.process(text)); String actualSenseInfo = senseInfoPrinter.process(text); - log.info(actualSenseInfo); + AbstractIntegrationTestCase.log.info(actualSenseInfo); for (NLPText word : text.getLeaves()) { if (word.getDictionaryWordSense() != null) { Synset synset = word.getDictionaryWordSense().getSynset(); - log.info(word + "[" + synset.getId() + "]: " + synset.getDefinition()); - log.info(word.getDictionaryWordSenseRelationInfo()); + AbstractIntegrationTestCase.log.info(word + "[" + synset.getId() + "]: " + synset.getDefinition()); + AbstractIntegrationTestCase.log.info(word.getDictionaryWordSenseRelationInfo()); } else { - log.info(word); + AbstractIntegrationTestCase.log.info(word); } } TestCase.assertEqualsIgnoreWhitespace(expectedSenseInfo, actualSenseInfo); @@ -317,7 +317,7 @@ private void assertMostSimilar(String lemma1, PartOfSpeech pos1, int senseRank1, SenseRelationInfo expectedMaxSimilarity = wordSenseDisambiguator.similarity( expectedMostSimilar.getSense1(), expectedMostSimilar.getSense2()); - log.info(expectedMostSimilar + " -> " + expectedMaxSimilarity); + AbstractIntegrationTestCase.log.info(expectedMostSimilar + " -> " + expectedMaxSimilarity); for (Sense sense1 : word1.getSenses()) { for (Sense sense2 : word2.getSenses()) { sensePairs.put(new SensePair(sense1, sense2), wordSenseDisambiguator.similarity( @@ -334,7 +334,7 @@ private void assertMostSimilar(String lemma1, PartOfSpeech pos1, int senseRank1, actualMostSimilar = key; } if (similarity.getRank() > 0.0) { - log.info(key + " -> " + similarity); + AbstractIntegrationTestCase.log.info(key + " -> " + similarity); } } Assert.assertEquals(expectedMostSimilar, actualMostSimilar); @@ -354,7 +354,7 @@ private void assertMostRelated(String lemma1, PartOfSpeech pos1, int senseRank1, senseRank2); SenseRelationInfo expectedMaxRelatedness = wordSenseDisambiguator.relatedness( expectedMostRelated.getSense1(), expectedMostRelated.getSense2()); - log.info(expectedMostRelated + " -> " + expectedMaxRelatedness); + AbstractIntegrationTestCase.log.info(expectedMostRelated + " -> " + expectedMaxRelatedness); Word word1 = expectedMostRelated.getSense1().getWord(); Word word2 = expectedMostRelated.getSense2().getWord(); @@ -384,10 +384,10 @@ private void assertMostRelated(String lemma1, PartOfSpeech pos1, int senseRank1, actualMostRelated.add(key); } if (relatedness.getRank() > 0.0) { - log.info(key + " -> " + relatedness); + AbstractIntegrationTestCase.log.info(key + " -> " + relatedness); } } - assertContains(expectedMostRelated, actualMostRelated); + AbstractIntegrationTestCase.assertContains(expectedMostRelated, actualMostRelated); } private void assertMostDefinitionSimilarity(String lemma1, PartOfSpeech pos1, int senseRank1, @@ -397,7 +397,7 @@ private void assertMostDefinitionSimilarity(String lemma1, PartOfSpeech pos1, in senseRank2); SenseRelationInfo expectedMaxRelatedness = wordSenseDisambiguator.definitionSimilarity( expectedMostRelated.getSense1(), expectedMostRelated.getSense2()); - log.info(expectedMostRelated + " -> " + expectedMaxRelatedness); + AbstractIntegrationTestCase.log.info(expectedMostRelated + " -> " + expectedMaxRelatedness); Word word1 = expectedMostRelated.getSense1().getWord(); Word word2 = expectedMostRelated.getSense2().getWord(); @@ -427,10 +427,10 @@ private void assertMostDefinitionSimilarity(String lemma1, PartOfSpeech pos1, in actualMostRelated.add(key); } if (relatedness.getRank() > 0.0) { - log.info(key + " -> " + relatedness); + AbstractIntegrationTestCase.log.info(key + " -> " + relatedness); } } - assertContains(expectedMostRelated, actualMostRelated); + AbstractIntegrationTestCase.assertContains(expectedMostRelated, actualMostRelated); } protected static class SensePair { diff --git a/requel/src/test/java/com/rreganjr/nlp/dictionary/LemmatizerTests.java b/dictionary/src/test/java/com/rreganjr/nlp/dictionary/LemmatizerTests.java similarity index 100% rename from requel/src/test/java/com/rreganjr/nlp/dictionary/LemmatizerTests.java rename to dictionary/src/test/java/com/rreganjr/nlp/dictionary/LemmatizerTests.java diff --git a/requel/src/test/java/com/rreganjr/nlp/dictionary/NERTests.java b/dictionary/src/test/java/com/rreganjr/nlp/dictionary/NERTests.java similarity index 100% rename from requel/src/test/java/com/rreganjr/nlp/dictionary/NERTests.java rename to dictionary/src/test/java/com/rreganjr/nlp/dictionary/NERTests.java diff --git a/exception/exception.iml b/exception/exception.iml new file mode 100644 index 0000000..166ccb3 --- /dev/null +++ b/exception/exception.iml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/exception/pom.xml b/exception/pom.xml new file mode 100644 index 0000000..c01344c --- /dev/null +++ b/exception/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + exception + 1.0.3 + + + com.rreganjr.requel + maven-base + 1.0.3 + ../_maven-base/pom.xml + + + + + + + + org.hibernate + hibernate-validator + + + \ No newline at end of file diff --git a/requel/src/main/java/com/rreganjr/ApplicationException.java b/exception/src/main/java/com/rreganjr/ApplicationException.java similarity index 100% rename from requel/src/main/java/com/rreganjr/ApplicationException.java rename to exception/src/main/java/com/rreganjr/ApplicationException.java diff --git a/requel/src/main/java/com/rreganjr/repository/EntityException.java b/exception/src/main/java/com/rreganjr/EntityException.java similarity index 96% rename from requel/src/main/java/com/rreganjr/repository/EntityException.java rename to exception/src/main/java/com/rreganjr/EntityException.java index e397a0b..c5fd025 100644 --- a/requel/src/main/java/com/rreganjr/repository/EntityException.java +++ b/exception/src/main/java/com/rreganjr/EntityException.java @@ -18,14 +18,12 @@ * along with Requel. If not, see . * */ -package com.rreganjr.repository; - -import com.rreganjr.requel.RequelException; +package com.rreganjr; /** * @author ron */ -public class EntityException extends RequelException { +public class EntityException extends ApplicationException { static final long serialVersionUID = 0; private final Class entityType; @@ -149,7 +147,7 @@ protected EntityException(Class entityType, Object entity, String entityPrope /** * @param entityType * @param entity - * @param entityPropertyName + * @param entityPropertyNames * @param entityPropertyValues * @param actionType * @param staleEntity @@ -176,9 +174,15 @@ protected EntityException(Throwable cause, Class entityType, Object entity, } /** + * * @param cause + * @param entityType + * @param entity + * @param entityPropertyNames + * @param entityPropertyValues + * @param actionType * @param format - * @param args + * @param messageArgs */ protected EntityException(Throwable cause, Class entityType, Object entity, String[] entityPropertyNames, Object[] entityPropertyValues, diff --git a/requel/src/main/java/com/rreganjr/repository/EntityExceptionActionType.java b/exception/src/main/java/com/rreganjr/EntityExceptionActionType.java similarity index 96% rename from requel/src/main/java/com/rreganjr/repository/EntityExceptionActionType.java rename to exception/src/main/java/com/rreganjr/EntityExceptionActionType.java index d5ba142..e370483 100644 --- a/requel/src/main/java/com/rreganjr/repository/EntityExceptionActionType.java +++ b/exception/src/main/java/com/rreganjr/EntityExceptionActionType.java @@ -18,7 +18,7 @@ * along with Requel. If not, see . * */ -package com.rreganjr.repository; +package com.rreganjr; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/requel/EntityLockException.java b/exception/src/main/java/com/rreganjr/EntityLockException.java similarity index 94% rename from requel/src/main/java/com/rreganjr/requel/EntityLockException.java rename to exception/src/main/java/com/rreganjr/EntityLockException.java index c9b26f3..8a8b9ec 100644 --- a/requel/src/main/java/com/rreganjr/requel/EntityLockException.java +++ b/exception/src/main/java/com/rreganjr/EntityLockException.java @@ -18,10 +18,7 @@ * along with Requel. If not, see . * */ -package com.rreganjr.requel; - -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +package com.rreganjr; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/requel/EntityValidationException.java b/exception/src/main/java/com/rreganjr/EntityValidationException.java similarity index 94% rename from requel/src/main/java/com/rreganjr/requel/EntityValidationException.java rename to exception/src/main/java/com/rreganjr/EntityValidationException.java index fe33061..df3268c 100644 --- a/requel/src/main/java/com/rreganjr/requel/EntityValidationException.java +++ b/exception/src/main/java/com/rreganjr/EntityValidationException.java @@ -18,16 +18,11 @@ * along with Requel. If not, see . * */ -package com.rreganjr.requel; +package com.rreganjr; -import com.rreganjr.requel.user.User; -import com.rreganjr.requel.user.exception.NoSuchUserException; import org.hibernate.validator.InvalidStateException; import org.hibernate.validator.InvalidValue; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; - /** * @author ron */ diff --git a/requel/src/main/java/com/rreganjr/requel/NoSuchEntityException.java b/exception/src/main/java/com/rreganjr/NoSuchEntityException.java similarity index 96% rename from requel/src/main/java/com/rreganjr/requel/NoSuchEntityException.java rename to exception/src/main/java/com/rreganjr/NoSuchEntityException.java index 5991181..f5cd230 100644 --- a/requel/src/main/java/com/rreganjr/requel/NoSuchEntityException.java +++ b/exception/src/main/java/com/rreganjr/NoSuchEntityException.java @@ -18,10 +18,7 @@ * along with Requel. If not, see . * */ -package com.rreganjr.requel; - -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +package com.rreganjr; /** * @author ron diff --git a/initializer/initializer.iml b/initializer/initializer.iml new file mode 100644 index 0000000..5ec1a68 --- /dev/null +++ b/initializer/initializer.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/initializer/pom.xml b/initializer/pom.xml new file mode 100644 index 0000000..265ec0c --- /dev/null +++ b/initializer/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + initializer + + + com.rreganjr.requel + maven-base + 1.0.3 + ../_maven-base/pom.xml + + + + \ No newline at end of file diff --git a/requel/src/main/java/com/rreganjr/AbstractSystemInitializer.java b/initializer/src/main/java/com/rreganjr/initializer/AbstractSystemInitializer.java similarity index 97% rename from requel/src/main/java/com/rreganjr/AbstractSystemInitializer.java rename to initializer/src/main/java/com/rreganjr/initializer/AbstractSystemInitializer.java index d636a52..fe36b2f 100644 --- a/requel/src/main/java/com/rreganjr/AbstractSystemInitializer.java +++ b/initializer/src/main/java/com/rreganjr/initializer/AbstractSystemInitializer.java @@ -19,7 +19,7 @@ * along with Requel. If not, see . * */ -package com.rreganjr; +package com.rreganjr.initializer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/requel/src/main/java/com/rreganjr/SystemInitializer.java b/initializer/src/main/java/com/rreganjr/initializer/SystemInitializer.java similarity index 97% rename from requel/src/main/java/com/rreganjr/SystemInitializer.java rename to initializer/src/main/java/com/rreganjr/initializer/SystemInitializer.java index fbe35ed..5f127e0 100644 --- a/requel/src/main/java/com/rreganjr/SystemInitializer.java +++ b/initializer/src/main/java/com/rreganjr/initializer/SystemInitializer.java @@ -18,7 +18,7 @@ * along with Requel. If not, see . * */ -package com.rreganjr; +package com.rreganjr.initializer; /** * A SystemInitializer does some initialization on system start up such as diff --git a/nlp/nlp.iml b/nlp/nlp.iml new file mode 100644 index 0000000..3a8d566 --- /dev/null +++ b/nlp/nlp.iml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nlp/pom.xml b/nlp/pom.xml new file mode 100644 index 0000000..558394f --- /dev/null +++ b/nlp/pom.xml @@ -0,0 +1,93 @@ + + + 4.0.0 + nlp + 1.0.3 + + + com.rreganjr.requel + maven-base + 1.0.3 + ../_maven-base/pom.xml + + + + + + + + com.rreganjr.requel + exception + + + com.rreganjr.requel + initializer + + + com.rreganjr.requel + command + + + com.rreganjr.requel + repository + + + + + + com.rreganjr.echopm + echopm + + + + + edu.stanford.nlp + stanford-corenlp + 3.8.0 + + + edu.stanford.nlp + stanford-corenlp + 3.8.0 + models + + + + + opennlp + tools + + + + opennlp + maxent + + + + + com.fifesoft + spellchecker + + + + org.springframework + spring-orm + + + + org.hibernate + hibernate-core + + + + + commons-digester + commons-digester + + + + \ No newline at end of file diff --git a/requel/src/main/java/com/rreganjr/nlp/GrammaticalRelation.java b/nlp/src/main/java/com/rreganjr/nlp/GrammaticalRelation.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/GrammaticalRelation.java rename to nlp/src/main/java/com/rreganjr/nlp/GrammaticalRelation.java diff --git a/requel/src/main/java/com/rreganjr/nlp/GrammaticalRelationType.java b/nlp/src/main/java/com/rreganjr/nlp/GrammaticalRelationType.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/GrammaticalRelationType.java rename to nlp/src/main/java/com/rreganjr/nlp/GrammaticalRelationType.java diff --git a/requel/src/main/java/com/rreganjr/nlp/GrammaticalStructureLevel.java b/nlp/src/main/java/com/rreganjr/nlp/GrammaticalStructureLevel.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/GrammaticalStructureLevel.java rename to nlp/src/main/java/com/rreganjr/nlp/GrammaticalStructureLevel.java diff --git a/requel/src/main/java/com/rreganjr/nlp/LemmatizerRule.java b/nlp/src/main/java/com/rreganjr/nlp/LemmatizerRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/LemmatizerRule.java rename to nlp/src/main/java/com/rreganjr/nlp/LemmatizerRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/NLPProcessor.java b/nlp/src/main/java/com/rreganjr/nlp/NLPProcessor.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/NLPProcessor.java rename to nlp/src/main/java/com/rreganjr/nlp/NLPProcessor.java diff --git a/requel/src/main/java/com/rreganjr/nlp/NLPProcessorFactory.java b/nlp/src/main/java/com/rreganjr/nlp/NLPProcessorFactory.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/NLPProcessorFactory.java rename to nlp/src/main/java/com/rreganjr/nlp/NLPProcessorFactory.java diff --git a/requel/src/main/java/com/rreganjr/nlp/NLPText.java b/nlp/src/main/java/com/rreganjr/nlp/NLPText.java similarity index 99% rename from requel/src/main/java/com/rreganjr/nlp/NLPText.java rename to nlp/src/main/java/com/rreganjr/nlp/NLPText.java index 93801ce..7784fa2 100644 --- a/requel/src/main/java/com/rreganjr/nlp/NLPText.java +++ b/nlp/src/main/java/com/rreganjr/nlp/NLPText.java @@ -271,7 +271,8 @@ public interface NLPText extends Cloneable { public void setDictionaryWord(Word dictionaryWord); /** - * @return The WordNet word sense of a WORD level element. + * @return The Wor + * dNet word sense of a WORD level element. */ public Sense getDictionaryWordSense(); diff --git a/requel/src/main/java/com/rreganjr/nlp/ParseTag.java b/nlp/src/main/java/com/rreganjr/nlp/ParseTag.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/ParseTag.java rename to nlp/src/main/java/com/rreganjr/nlp/ParseTag.java diff --git a/requel/src/main/java/com/rreganjr/nlp/ParserException.java b/nlp/src/main/java/com/rreganjr/nlp/ParserException.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/ParserException.java rename to nlp/src/main/java/com/rreganjr/nlp/ParserException.java diff --git a/requel/src/main/java/com/rreganjr/nlp/PartOfSpeech.java b/nlp/src/main/java/com/rreganjr/nlp/PartOfSpeech.java similarity index 97% rename from requel/src/main/java/com/rreganjr/nlp/PartOfSpeech.java rename to nlp/src/main/java/com/rreganjr/nlp/PartOfSpeech.java index d812b1e..7ae356a 100644 --- a/requel/src/main/java/com/rreganjr/nlp/PartOfSpeech.java +++ b/nlp/src/main/java/com/rreganjr/nlp/PartOfSpeech.java @@ -106,7 +106,7 @@ public enum PartOfSpeech { /** * For example "the", "a", "all", "any", "which" * - * @see http://en.wikipedia.org/wiki/Determiner_%28class%29 + * @see Determiner */ DETERMINER(); diff --git a/requel/src/main/java/com/rreganjr/nlp/SemanticRole.java b/nlp/src/main/java/com/rreganjr/nlp/SemanticRole.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/SemanticRole.java rename to nlp/src/main/java/com/rreganjr/nlp/SemanticRole.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Category.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Category.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Category.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Category.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Dictionary.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Dictionary.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Dictionary.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Dictionary.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/DictionaryRepository.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/DictionaryRepository.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/DictionaryRepository.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/DictionaryRepository.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Lexlinkref.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Lexlinkref.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Lexlinkref.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Lexlinkref.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/LexlinkrefId.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/LexlinkrefId.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/LexlinkrefId.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/LexlinkrefId.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Linkdef.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Linkdef.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Linkdef.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Linkdef.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Morphdef.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Morphdef.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Morphdef.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Morphdef.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Morphref.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Morphref.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Morphref.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Morphref.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/MorphrefId.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/MorphrefId.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/MorphrefId.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/MorphrefId.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/SemcorFile.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/SemcorFile.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/SemcorFile.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/SemcorFile.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/SemcorSentence.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/SemcorSentence.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/SemcorSentence.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/SemcorSentence.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/SemcorSentenceWord.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/SemcorSentenceWord.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/SemcorSentenceWord.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/SemcorSentenceWord.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Semlinkref.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Semlinkref.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Semlinkref.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Semlinkref.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/SemlinkrefId.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/SemlinkrefId.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/SemlinkrefId.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/SemlinkrefId.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Sense.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Sense.java similarity index 99% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Sense.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Sense.java index 346deeb..1376bcc 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/Sense.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Sense.java @@ -241,7 +241,7 @@ public String toString() { * creator with an existing user. * * @param parent - * @see ImportDictionaryCommandImpl.UnmarshallerListener + * @see ImportDictionaryCommandImpl */ public void afterUnmarshal(Object parent) { setWord((Word) parent); diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/SenseId.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/SenseId.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/SenseId.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/SenseId.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Synset.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Synset.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Synset.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Synset.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/SynsetDefinitionWord.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/SynsetDefinitionWord.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/SynsetDefinitionWord.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/SynsetDefinitionWord.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/UnmarshallerListener.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/UnmarshallerListener.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/UnmarshallerListener.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/UnmarshallerListener.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetClass.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetClass.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetClass.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetClass.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetFrame.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetFrame.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetFrame.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetFrame.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetFrameRef.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetFrameRef.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetFrameRef.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetFrameRef.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetRole.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetRole.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetRole.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetRole.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetRoleRef.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetRoleRef.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetRoleRef.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetRoleRef.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetSelectionRestriction.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetSelectionRestriction.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetSelectionRestriction.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetSelectionRestriction.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetSelectionRestrictionType.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetSelectionRestrictionType.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/VerbNetSelectionRestrictionType.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/VerbNetSelectionRestrictionType.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/Word.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Word.java similarity index 98% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/Word.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/Word.java index a2c54e9..8e50495 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/Word.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/Word.java @@ -46,9 +46,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.hibernate.annotations.Sort; import org.hibernate.annotations.SortNatural; -import org.hibernate.annotations.SortType; import com.rreganjr.nlp.PartOfSpeech; diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/BuildWordNetDefinitionWordsCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/BuildWordNetDefinitionWordsCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/BuildWordNetDefinitionWordsCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/BuildWordNetDefinitionWordsCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/CalculateWordFrequenceCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/CalculateWordFrequenceCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/CalculateWordFrequenceCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/CalculateWordFrequenceCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/DictionaryCommandFactory.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/DictionaryCommandFactory.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/DictionaryCommandFactory.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/DictionaryCommandFactory.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditDictionaryWordCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditDictionaryWordCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditDictionaryWordCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditDictionaryWordCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditSemlinkRefCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditSemlinkRefCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditSemlinkRefCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditSemlinkRefCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditSenseCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditSenseCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditSenseCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditSenseCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditSynsetCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditSynsetCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditSynsetCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditSynsetCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditSynsetDefinitionWordCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditSynsetDefinitionWordCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditSynsetDefinitionWordCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditSynsetDefinitionWordCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditVerbNetSelectionRestrictionCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditVerbNetSelectionRestrictionCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/EditVerbNetSelectionRestrictionCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/EditVerbNetSelectionRestrictionCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/ExportDictionaryCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/ExportDictionaryCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/ExportDictionaryCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/ExportDictionaryCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/ImportDictionaryCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/ImportDictionaryCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/ImportDictionaryCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/ImportDictionaryCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/ImportSemcorCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/ImportSemcorCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/ImportSemcorCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/ImportSemcorCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/LoadWordNetTaggedGlossesCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/LoadWordNetTaggedGlossesCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/LoadWordNetTaggedGlossesCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/LoadWordNetTaggedGlossesCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/command/SynsetHypernymWalkCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/command/SynsetHypernymWalkCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/command/SynsetHypernymWalkCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/command/SynsetHypernymWalkCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/AbstractDictionaryCommand.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/AbstractDictionaryCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/AbstractDictionaryCommand.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/AbstractDictionaryCommand.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/CalculateWordFrequenceCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/CalculateWordFrequenceCommandImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/CalculateWordFrequenceCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/CalculateWordFrequenceCommandImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/DictionaryCommandFactoryImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/DictionaryCommandFactoryImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/DictionaryCommandFactoryImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/DictionaryCommandFactoryImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/DigesterRuleLoggingDecorator.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/DigesterRuleLoggingDecorator.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/DigesterRuleLoggingDecorator.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/DigesterRuleLoggingDecorator.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditDictionaryWordCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditDictionaryWordCommandImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditDictionaryWordCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditDictionaryWordCommandImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSemlinkRefCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSemlinkRefCommandImpl.java similarity index 98% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSemlinkRefCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSemlinkRefCommandImpl.java index 3dfb19c..00de25d 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSemlinkRefCommandImpl.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSemlinkRefCommandImpl.java @@ -28,7 +28,7 @@ import com.rreganjr.nlp.dictionary.Semlinkref; import com.rreganjr.nlp.dictionary.SemlinkrefId; import com.rreganjr.nlp.dictionary.command.EditSemlinkRefCommand; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.NoSuchEntityException; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSenseCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSenseCommandImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSenseCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSenseCommandImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSynsetCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSynsetCommandImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSynsetCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSynsetCommandImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSynsetDefinitionWordCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSynsetDefinitionWordCommandImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSynsetDefinitionWordCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditSynsetDefinitionWordCommandImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditVerbNetSelectionRestrictionCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditVerbNetSelectionRestrictionCommandImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditVerbNetSelectionRestrictionCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/EditVerbNetSelectionRestrictionCommandImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/ExportDictionaryCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/ExportDictionaryCommandImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/ExportDictionaryCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/ExportDictionaryCommandImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/ImportDictionaryCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/ImportDictionaryCommandImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/ImportDictionaryCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/ImportDictionaryCommandImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/LoadWordNetTaggedGlossesCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/LoadWordNetTaggedGlossesCommandImpl.java similarity index 99% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/LoadWordNetTaggedGlossesCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/LoadWordNetTaggedGlossesCommandImpl.java index 169f357..7b45ef5 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/LoadWordNetTaggedGlossesCommandImpl.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/LoadWordNetTaggedGlossesCommandImpl.java @@ -43,7 +43,7 @@ import com.rreganjr.nlp.dictionary.command.DictionaryCommandFactory; import com.rreganjr.nlp.dictionary.command.EditSynsetDefinitionWordCommand; import com.rreganjr.nlp.dictionary.command.LoadWordNetTaggedGlossesCommand; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.NoSuchEntityException; /** * An XML processor for the WordNet synset merged gloss parse and word sense diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/SynsetHypernymWalkCommandImpl.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/SynsetHypernymWalkCommandImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/command/SynsetHypernymWalkCommandImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/command/SynsetHypernymWalkCommandImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/NoSuchWordException.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/NoSuchWordException.java similarity index 94% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/NoSuchWordException.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/NoSuchWordException.java index b888c46..1287628 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/NoSuchWordException.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/NoSuchWordException.java @@ -21,8 +21,8 @@ package com.rreganjr.nlp.dictionary.impl.repository; import com.rreganjr.nlp.dictionary.Word; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; /** * @author ron @@ -57,7 +57,6 @@ public static NoSuchWordException forLemmaAndPOS(String text, String pos) { /** * @param format - * @param args */ protected NoSuchWordException(Class entityType, Object entity, String entityPropertyName, Object entityValue, EntityExceptionActionType actionType, String format, @@ -68,7 +67,6 @@ protected NoSuchWordException(Class entityType, Object entity, String entityP /** * @param cause * @param format - * @param args */ protected NoSuchWordException(Throwable cause, Class entityType, Object entity, String entityPropertyName, Object entityValue, EntityExceptionActionType actionType, diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryInitializer.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryInitializer.java similarity index 93% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryInitializer.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryInitializer.java index f706741..5848219 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryInitializer.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryInitializer.java @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import net.sf.echopm.ResourceBundleHelper; import com.rreganjr.command.CommandHandler; import com.rreganjr.nlp.dictionary.DictionaryRepository; @@ -86,12 +86,12 @@ public void initialize() { commandHandler.execute(command); } } catch (Exception e) { - log.error("failed to initialize dictionary from xml: " + e, e); + AbstractSystemInitializer.log.error("failed to initialize dictionary from xml: " + e, e); } } private InputStream getDataFileInputStream(String dataFilePath) throws IOException { - log.debug("loading data file " + dataFilePath); + AbstractSystemInitializer.log.debug("loading data file " + dataFilePath); InputStream dataInputStream = getClass().getClassLoader().getResourceAsStream(dataFilePath); if (dataFilePath.endsWith(".gz")) { dataInputStream = new GZIPInputStream(dataInputStream); diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryPhoneticCodeInitializer.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryPhoneticCodeInitializer.java similarity index 90% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryPhoneticCodeInitializer.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryPhoneticCodeInitializer.java index 57005b7..2ed5466 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryPhoneticCodeInitializer.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionaryPhoneticCodeInitializer.java @@ -27,7 +27,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import com.rreganjr.nlp.dictionary.DictionaryRepository; import com.rreganjr.nlp.dictionary.Word; @@ -64,14 +64,14 @@ public void initialize() { String phoneticCode = dictionaryRepository.findWord("a").getPhoneticCode(); if ((phoneticCode == null) || (phoneticCode.length() == 0)) { try { - log.info("initializing phonetic codes for word net words."); + AbstractSystemInitializer.log.info("initializing phonetic codes for word net words."); for (Word word : dictionaryRepository.findWords()) { word .setPhoneticCode(dictionaryRepository.generatePhoneticCode(word .getLemma())); } } catch (Exception e) { - log.error("failed to initialize phonetic codes: " + e, e); + AbstractSystemInitializer.log.error("failed to initialize phonetic codes: " + e, e); } } } diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionarySQLInitializer.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionarySQLInitializer.java similarity index 95% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionarySQLInitializer.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionarySQLInitializer.java index be5bdbe..071b927 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionarySQLInitializer.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/DictionarySQLInitializer.java @@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import net.sf.echopm.ResourceBundleHelper; import com.rreganjr.nlp.dictionary.DictionaryRepository; @@ -115,16 +115,16 @@ public void initialize() { try { conn.rollback(); } catch (SQLException se) { - log.error("could not rollback: " + se, se); + AbstractSystemInitializer.log.error("could not rollback: " + se, se); } } - log.error("could not load dictionary via SQL: " + e, e); + AbstractSystemInitializer.log.error("could not load dictionary via SQL: " + e, e); } } } private void loadSQLFile(String path, Statement statement) throws IOException, SQLException { - log.info("loading sql file: " + path); + AbstractSystemInitializer.log.info("loading sql file: " + path); InputStream inputStream = getClass().getClassLoader().getResourceAsStream(path); if (path.endsWith(".gz")) { inputStream = new GZIPInputStream(inputStream); @@ -138,7 +138,7 @@ private void loadSQLFile(String path, Statement statement) throws IOException, S if (sql.length() == 0) { break; } - log.debug("sql = " + sql); + AbstractSystemInitializer.log.debug("sql = " + sql); if (!sql.toLowerCase().startsWith("lock tables")) { statement.executeUpdate(sql); } diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetDefinitionWordsInitializer.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetDefinitionWordsInitializer.java similarity index 94% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetDefinitionWordsInitializer.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetDefinitionWordsInitializer.java index 5683b7f..77bd8cc 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetDefinitionWordsInitializer.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetDefinitionWordsInitializer.java @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import net.sf.echopm.ResourceBundleHelper; import com.rreganjr.command.CommandHandler; import com.rreganjr.nlp.dictionary.DictionaryRepository; @@ -90,7 +90,7 @@ public void initialize() { if (true) { return; } - log.info("initializing WordNet tagged definitions..."); + AbstractSystemInitializer.log.info("initializing WordNet tagged definitions..."); if (dictionaryRepository.buildSynsetDefinitionWords()) { ResourceBundleHelper resourceBundleHelper = new ResourceBundleHelper( WordNetDefinitionWordsInitializer.class.getName()); @@ -114,12 +114,12 @@ public void initialize() { } } } catch (Exception e) { - log.error("failed to load WordNet tagged gloss files: " + e, e); + AbstractSystemInitializer.log.error("failed to load WordNet tagged gloss files: " + e, e); } } private InputStream getDataFileInputStream(String dataFilePath) throws IOException { - log.debug("loading data file " + dataFilePath); + AbstractSystemInitializer.log.debug("loading data file " + dataFilePath); InputStream dataInputStream = getClass().getClassLoader().getResourceAsStream(dataFilePath); if (dataFilePath.endsWith(".gz")) { dataInputStream = new GZIPInputStream(dataInputStream); diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetHyponymCountInitializer.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetHyponymCountInitializer.java similarity index 96% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetHyponymCountInitializer.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetHyponymCountInitializer.java index d0436a5..f92d8a6 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetHyponymCountInitializer.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetHyponymCountInitializer.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import com.rreganjr.command.BatchCommand; import com.rreganjr.command.CommandHandler; import com.rreganjr.nlp.dictionary.Dictionary; @@ -120,7 +120,7 @@ public void initialize() { for (Long synset : semanticGraph.keySet()) { count++; if (count % 1000 == 0) { - log.info("walking " + count); + AbstractSystemInitializer.log.info("walking " + count); } walkSynsetRelations(synset); } @@ -132,7 +132,7 @@ public void initialize() { if (count % 100 == 0) { commandHandler.execute(batchCommand); batchCommand = dictionaryCommandFactory.newBatchCommand(); - log.info("generating updates " + count); + AbstractSystemInitializer.log.info("generating updates " + count); } SynsetNode node = semanticGraph.get(synset.getId().intValue()); EditSynsetCommand command = dictionaryCommandFactory.newEditSynsetCommand(); @@ -165,9 +165,9 @@ public void initialize() { } } } catch (Exception e) { - log.error("failed to initialize wordnet hyponym counts: " + e, e); + AbstractSystemInitializer.log.error("failed to initialize wordnet hyponym counts: " + e, e); } catch (Error e) { - log.error("failed to initialize wordnet hyponym counts: " + e, e); + AbstractSystemInitializer.log.error("failed to initialize wordnet hyponym counts: " + e, e); } } diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetSenseKeyInitializer.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetSenseKeyInitializer.java similarity index 91% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetSenseKeyInitializer.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetSenseKeyInitializer.java index 4c75af4..2e69bbd 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetSenseKeyInitializer.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/init/WordNetSenseKeyInitializer.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import net.sf.echopm.ResourceBundleHelper; import com.rreganjr.command.CommandHandler; import com.rreganjr.nlp.PartOfSpeech; @@ -38,7 +38,7 @@ import com.rreganjr.nlp.dictionary.Sense; import com.rreganjr.nlp.dictionary.command.DictionaryCommandFactory; import com.rreganjr.nlp.dictionary.command.EditSenseCommand; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.NoSuchEntityException; /** * Create SynsetDefinitionWords from the wsd field in the synsets. @@ -82,7 +82,7 @@ public void initialize() { if (true) { return; } - log.info("initializing WordNet sense sense keys..."); + AbstractSystemInitializer.log.info("initializing WordNet sense sense keys..."); try { if (dictionaryRepository.buildSenseKeys()) { ResourceBundleHelper resourceBundleHelper = new ResourceBundleHelper( @@ -112,19 +112,19 @@ public void initialize() { command.setSense(sense); command.setSenseKey(senseKey); command = commandHandler.execute(command); - log.info(sense + " -> " + senseKey); + AbstractSystemInitializer.log.info(sense + " -> " + senseKey); } catch (NoSuchEntityException e) { - log.warn("no sense for " + lemma + " " + synsetId); + AbstractSystemInitializer.log.warn("no sense for " + lemma + " " + synsetId); } } } } catch (Exception e) { - log.error("failed to initialize semcor: " + e, e); + AbstractSystemInitializer.log.error("failed to initialize semcor: " + e, e); } } private InputStream getDataFileInputStream(String dataFilePath) throws IOException { - log.debug("loading data file " + dataFilePath); + AbstractSystemInitializer.log.debug("loading data file " + dataFilePath); InputStream dataInputStream = getClass().getClassLoader().getResourceAsStream(dataFilePath); if (dataFilePath.endsWith(".gz")) { dataInputStream = new GZIPInputStream(dataInputStream); diff --git a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/jpa/JpaDictionaryRepository.java b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/jpa/JpaDictionaryRepository.java similarity index 96% rename from requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/jpa/JpaDictionaryRepository.java rename to nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/jpa/JpaDictionaryRepository.java index 9346253..c4b008a 100644 --- a/requel/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/jpa/JpaDictionaryRepository.java +++ b/nlp/src/main/java/com/rreganjr/nlp/dictionary/impl/repository/jpa/JpaDictionaryRepository.java @@ -37,6 +37,7 @@ import javax.persistence.OptimisticLockException; import javax.persistence.Query; +import com.rreganjr.repository.AbstractRepository; import org.fife.com.swabunga.spell.engine.DoubleMeta; import org.fife.com.swabunga.spell.engine.SpellDictionary; import org.fife.com.swabunga.spell.engine.SpellDictionaryHashMap; @@ -54,12 +55,6 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -//import com.swabunga.spell.engine.DoubleMeta; -//import com.swabunga.spell.engine.SpellDictionary; -//import com.swabunga.spell.engine.SpellDictionaryHashMap; -//import com.swabunga.spell.engine.Transformator; -//import com.swabunga.spell.event.SpellChecker; - import net.sf.echopm.ResourceBundleHelper; import com.rreganjr.nlp.PartOfSpeech; import com.rreganjr.nlp.dictionary.Category; @@ -79,13 +74,13 @@ import com.rreganjr.nlp.dictionary.Word; import com.rreganjr.nlp.dictionary.impl.repository.NoSuchWordException; import com.rreganjr.nlp.impl.DatabaseSpellDictionary; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.repository.jpa.AbstractJpaRepository; import com.rreganjr.repository.ExceptionMapper; import com.rreganjr.repository.jpa.GenericPropertyValueExceptionAdapter; import com.rreganjr.repository.jpa.InvalidStateExceptionAdapter; import com.rreganjr.repository.jpa.OptimisticLockExceptionAdapter; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.NoSuchEntityException; /** * EJB3/JPA based repository @@ -131,7 +126,7 @@ public class JpaDictionaryRepository extends AbstractJpaRepository implements Di if (dictionaryFilePaths.contains("|")) { for (String dictionaryFilePath : dictionaryFilePaths.split("\\|")) { if (!"".equals(dictionaryFilePath.trim())) { - log.info("loading dictionary: " + dictionaryFilePath); + AbstractRepository.log.info("loading dictionary: " + dictionaryFilePath); try (InputStreamReader reader = new InputStreamReader(JpaDictionaryRepository.class.getClassLoader().getResourceAsStream(dictionaryFilePath))) { // TODO: try using SpellDictionaryDisk for less memory usage than SpellDictionaryHashMap dictionaries.add(new SpellDictionaryHashMap(reader)); @@ -146,7 +141,7 @@ public class JpaDictionaryRepository extends AbstractJpaRepository implements Di } staticDictionaries = Collections.unmodifiableCollection(dictionaries); } catch (Exception e) { - log.error("Error initializing dictionary repository", e); + AbstractRepository.log.error("Error initializing dictionary repository", e); throw new ExceptionInInitializerError(e); } } @@ -276,8 +271,8 @@ public double infoContent(Synset synset, Linkdef linkType) { Integer conceptCount = getConceptCount(synset.getPos()); double infoContent = (1.0d - ((Math.log(synset.getSubsumerCount(linkType) + 1)) / (Math .log(conceptCount)))); - if (log.isDebugEnabled()) { - log.debug("synset: " + synset + " conceptCount: " + conceptCount + " ic: " + if (AbstractRepository.log.isDebugEnabled()) { + AbstractRepository.log.debug("synset: " + synset + " conceptCount: " + conceptCount + " ic: " + infoContent); } return infoContent; @@ -639,7 +634,7 @@ public Lexlinkref findLexlinkref(Sense fromSense, Sense toSense, Linkdef linkTyp throw NoSuchEntityException.byQuery(Semlinkref.class, new String[] { "fromSense", "toSense", "linkDef" }, new Object[] { fromSense, toSense, linkType }); } catch (Exception e) { - log.debug(e, e); + AbstractRepository.log.debug(e, e); throw new RuntimeException("failed to find " + linkType.getName() + " lexo-semantic link from " + fromSense + " to " + toSense, e); } @@ -661,7 +656,7 @@ public Collection findLexlinkref(Sense fromSense, Sense toSense) { query.setParameter("toWord", toSense.getWord()); return query.getResultList(); } catch (Exception e) { - log.debug(e, e); + AbstractRepository.log.debug(e, e); throw new RuntimeException("failed to find lexo-semantic link from " + fromSense + " to " + toSense, e); } @@ -744,7 +739,7 @@ public Synset findSynset(Long id) { @Override public List findSynsetsWithColocatedDefinitionSenseAndWord(Sense sense, Word word) { - log.debug("sense: " + sense + " word: " + word); + AbstractRepository.log.debug("sense: " + sense + " word: " + word); try { // TODO: use named query so it can be configured externally Query query = getEntityManager() @@ -766,7 +761,7 @@ public List findSynsetsWithColocatedDefinitionSenseAndWord(Sense sense, } catch (NoResultException e) { return new ArrayList(); } catch (Exception e) { - log.debug(e, e); + AbstractRepository.log.debug(e, e); throw new RuntimeException("failed to find colocation in synset defintions with " + sense + " and " + word, e); } @@ -774,7 +769,7 @@ public List findSynsetsWithColocatedDefinitionSenseAndWord(Sense sense, @Override public List findSynsetsWithColocatedDefinitionWords(Word word1, Word word2) { - log.debug("word1: " + word1 + " word2: " + word2); + AbstractRepository.log.debug("word1: " + word1 + " word2: " + word2); try { // TODO: use named query so it can be configured externally Query query = getEntityManager() @@ -804,7 +799,7 @@ public List findSynsetsWithColocatedDefinitionWords(Word word1, Word wor } catch (NoResultException e) { return new ArrayList(); } catch (Exception e) { - log.debug(e, e); + AbstractRepository.log.debug(e, e); throw new RuntimeException("failed to find colocation in synset defintions with " + word1 + " and " + word2, e); } @@ -837,7 +832,7 @@ public Semlinkref findSemlinkref(Synset fromSynset, Synset toSynset, Linkdef lin "toSynset", "linkDef", "distance" }, new Object[] { fromSynset, toSynset, linkType, distance }); } catch (Exception e) { - log.debug(e, e); + AbstractRepository.log.debug(e, e); throw new RuntimeException("failed to find " + linkType.getName() + " semantic link from " + fromSynset + " to " + toSynset + " at distance " + distance, e); @@ -873,12 +868,12 @@ public Set getLowestCommonHypernyms(Synset synset1, Synset synset2) { } lowestCommonHypernymsCache.put(synsetPair, lcsSet); } - if (log.isDebugEnabled()) { - log.debug("synset1: " + synset1 + " synset2: " + synset2 + " -> " + lcsSet); + if (AbstractRepository.log.isDebugEnabled()) { + AbstractRepository.log.debug("synset1: " + synset1 + " synset2: " + synset2 + " -> " + lcsSet); } return Collections.unmodifiableSet(lcsSet); } catch (Exception e) { - log.debug(e, e); + AbstractRepository.log.debug(e, e); throw new RuntimeException("failed to get lowest common hypernyms for " + synset1 + " and " + synset2, e); } @@ -903,15 +898,15 @@ public Synset getRootHypernym(Synset synset) { rootHypernym = (Synset) query.getSingleResult(); rootHypernymCache.put(synset, rootHypernym); } - if (log.isDebugEnabled()) { - log.debug("synset: " + synset + " rootHypernym: " + rootHypernym); + if (AbstractRepository.log.isDebugEnabled()) { + AbstractRepository.log.debug("synset: " + synset + " rootHypernym: " + rootHypernym); } return rootHypernym; } catch (NoResultException e) { // return the original synset return synset; } catch (Exception e) { - log.debug(e, e); + AbstractRepository.log.debug(e, e); throw new RuntimeException("failed to get root hypernym for " + synset, e); } } @@ -1074,7 +1069,7 @@ public Collection findSemcorFiles() { @Override public List findSemcorSentencesWithColocatedDefinitionSenseAndWord( Sense sense, Word word) { - log.debug("sense: " + sense + " word: " + word); + AbstractRepository.log.debug("sense: " + sense + " word: " + word); try { // TODO: use named query so it can be configured externally Query query = getEntityManager().createNativeQuery( @@ -1097,7 +1092,7 @@ public List findSemcorSentencesWithColocatedDefinitionSenseA } catch (NoResultException e) { return new ArrayList(); } catch (Exception e) { - log.debug(e, e); + AbstractRepository.log.debug(e, e); throw new RuntimeException("failed to find colocation in semcor sentences with " + sense + " and " + word, e); } @@ -1106,7 +1101,7 @@ public List findSemcorSentencesWithColocatedDefinitionSenseA @Override public List findSemcorSentencesWithColocatedDefinitionWords(Word word1, Word word2) { - log.debug("word1: " + word1 + " word2: " + word2); + AbstractRepository.log.debug("word1: " + word1 + " word2: " + word2); try { // TODO: use named query so it can be configured externally Query query = getEntityManager().createNativeQuery( @@ -1129,7 +1124,7 @@ public List findSemcorSentencesWithColocatedDefinitionWords( } catch (NoResultException e) { return new ArrayList(); } catch (Exception e) { - log.debug(e, e); + AbstractRepository.log.debug(e, e); throw new RuntimeException("failed to find colocation in semcor sentences with " + word1 + " and " + word2, e); } @@ -1160,7 +1155,7 @@ public boolean isHyponym(Sense hypernym, Sense sense) { @Override public boolean isHyponym(Synset hypernym, Synset synset) { - log.debug("checking if " + synset + " is a hyponym of " + hypernym); + AbstractRepository.log.debug("checking if " + synset + " is a hyponym of " + hypernym); try { Query query = getEntityManager().createNativeQuery( "select count(*) from semlinkref slr1 left join synset hypernym on ( " @@ -1174,7 +1169,7 @@ public boolean isHyponym(Synset hypernym, Synset synset) { long count = ((BigInteger) query.getSingleResult()).longValue(); return count > 0L; } catch (Exception e) { - log.error(e, e); + AbstractRepository.log.error(e, e); throw new RuntimeException("failed to determine if " + synset + " is a hyponym of " + hypernym, e); } @@ -1182,7 +1177,7 @@ public boolean isHyponym(Synset hypernym, Synset synset) { @Override public Collection findHyponyms(Synset hypernym, int maxDistance) { - log.debug("get the hyponyms of " + hypernym + " with a max distance of " + maxDistance); + AbstractRepository.log.debug("get the hyponyms of " + hypernym + " with a max distance of " + maxDistance); try { Query query = getEntityManager().createNativeQuery( "select sy1.* from semlinkref slr " @@ -1198,7 +1193,7 @@ public Collection findHyponyms(Synset hypernym, int maxDistance) { query.setParameter("maxDistance", maxDistance); return query.getResultList(); } catch (Exception e) { - log.error(e, e); + AbstractRepository.log.error(e, e); throw new RuntimeException("failed to get the hyponyms of " + hypernym + " with a max distance of " + maxDistance, e); } diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/AbstractNLPTextWalker.java b/nlp/src/main/java/com/rreganjr/nlp/impl/AbstractNLPTextWalker.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/AbstractNLPTextWalker.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/AbstractNLPTextWalker.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/AbstractOpenNLPTool.java b/nlp/src/main/java/com/rreganjr/nlp/impl/AbstractOpenNLPTool.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/AbstractOpenNLPTool.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/AbstractOpenNLPTool.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/ConstituentTreeDepthFinder.java b/nlp/src/main/java/com/rreganjr/nlp/impl/ConstituentTreeDepthFinder.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/ConstituentTreeDepthFinder.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/ConstituentTreeDepthFinder.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/ConstituentTreePrinter.java b/nlp/src/main/java/com/rreganjr/nlp/impl/ConstituentTreePrinter.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/ConstituentTreePrinter.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/ConstituentTreePrinter.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/DatabaseSpellDictionary.java b/nlp/src/main/java/com/rreganjr/nlp/impl/DatabaseSpellDictionary.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/DatabaseSpellDictionary.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/DatabaseSpellDictionary.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/DependencyPrimaryVerbFinder.java b/nlp/src/main/java/com/rreganjr/nlp/impl/DependencyPrimaryVerbFinder.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/DependencyPrimaryVerbFinder.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/DependencyPrimaryVerbFinder.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/DependencyPrinter.java b/nlp/src/main/java/com/rreganjr/nlp/impl/DependencyPrinter.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/DependencyPrinter.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/DependencyPrinter.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/DependencySubjectFinder.java b/nlp/src/main/java/com/rreganjr/nlp/impl/DependencySubjectFinder.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/DependencySubjectFinder.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/DependencySubjectFinder.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/DependencyVerbRelationFinder.java b/nlp/src/main/java/com/rreganjr/nlp/impl/DependencyVerbRelationFinder.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/DependencyVerbRelationFinder.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/DependencyVerbRelationFinder.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/Dictionizer.java b/nlp/src/main/java/com/rreganjr/nlp/impl/Dictionizer.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/Dictionizer.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/Dictionizer.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/GrammaticalRelationImpl.java b/nlp/src/main/java/com/rreganjr/nlp/impl/GrammaticalRelationImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/GrammaticalRelationImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/GrammaticalRelationImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/IntegerNLPTextWalker.java b/nlp/src/main/java/com/rreganjr/nlp/impl/IntegerNLPTextWalker.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/IntegerNLPTextWalker.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/IntegerNLPTextWalker.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/MoreSpecificWordSuggester.java b/nlp/src/main/java/com/rreganjr/nlp/impl/MoreSpecificWordSuggester.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/MoreSpecificWordSuggester.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/MoreSpecificWordSuggester.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/NLPProcessorException.java b/nlp/src/main/java/com/rreganjr/nlp/impl/NLPProcessorException.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/NLPProcessorException.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/NLPProcessorException.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/NLPProcessorFactoryImpl.java b/nlp/src/main/java/com/rreganjr/nlp/impl/NLPProcessorFactoryImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/NLPProcessorFactoryImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/NLPProcessorFactoryImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/NLPTextImpl.java b/nlp/src/main/java/com/rreganjr/nlp/impl/NLPTextImpl.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/NLPTextImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/NLPTextImpl.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/NLPTextWalkerFunction.java b/nlp/src/main/java/com/rreganjr/nlp/impl/NLPTextWalkerFunction.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/NLPTextWalkerFunction.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/NLPTextWalkerFunction.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/NounPhraseFinder.java b/nlp/src/main/java/com/rreganjr/nlp/impl/NounPhraseFinder.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/NounPhraseFinder.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/NounPhraseFinder.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/OpenNLPParser.java b/nlp/src/main/java/com/rreganjr/nlp/impl/OpenNLPParser.java similarity index 99% rename from requel/src/main/java/com/rreganjr/nlp/impl/OpenNLPParser.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/OpenNLPParser.java index b5be6f8..daf030c 100644 --- a/requel/src/main/java/com/rreganjr/nlp/impl/OpenNLPParser.java +++ b/nlp/src/main/java/com/rreganjr/nlp/impl/OpenNLPParser.java @@ -20,7 +20,6 @@ */ package com.rreganjr.nlp.impl; -import java.net.URLDecoder; import java.util.List; import java.util.regex.Pattern; diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/OpenNLPTagger.java b/nlp/src/main/java/com/rreganjr/nlp/impl/OpenNLPTagger.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/OpenNLPTagger.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/OpenNLPTagger.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/OpenNLPTokenizer.java b/nlp/src/main/java/com/rreganjr/nlp/impl/OpenNLPTokenizer.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/OpenNLPTokenizer.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/OpenNLPTokenizer.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/PartOfSpeechAndSensePrinter.java b/nlp/src/main/java/com/rreganjr/nlp/impl/PartOfSpeechAndSensePrinter.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/PartOfSpeechAndSensePrinter.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/PartOfSpeechAndSensePrinter.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/PredicateVerbFinder.java b/nlp/src/main/java/com/rreganjr/nlp/impl/PredicateVerbFinder.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/PredicateVerbFinder.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/PredicateVerbFinder.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/PrimaryVerbPhraseFinder.java b/nlp/src/main/java/com/rreganjr/nlp/impl/PrimaryVerbPhraseFinder.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/PrimaryVerbPhraseFinder.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/PrimaryVerbPhraseFinder.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/Sentencizer.java b/nlp/src/main/java/com/rreganjr/nlp/impl/Sentencizer.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/Sentencizer.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/Sentencizer.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/SpellingChecker.java b/nlp/src/main/java/com/rreganjr/nlp/impl/SpellingChecker.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/SpellingChecker.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/SpellingChecker.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/SpellingSuggester.java b/nlp/src/main/java/com/rreganjr/nlp/impl/SpellingSuggester.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/SpellingSuggester.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/SpellingSuggester.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/StanfordLexicalizedParser.java b/nlp/src/main/java/com/rreganjr/nlp/impl/StanfordLexicalizedParser.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/StanfordLexicalizedParser.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/StanfordLexicalizedParser.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/StanfordNameEntityRecognizer.java b/nlp/src/main/java/com/rreganjr/nlp/impl/StanfordNameEntityRecognizer.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/StanfordNameEntityRecognizer.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/StanfordNameEntityRecognizer.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/Stemmer.java b/nlp/src/main/java/com/rreganjr/nlp/impl/Stemmer.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/Stemmer.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/Stemmer.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/StringNLPTextWalker.java b/nlp/src/main/java/com/rreganjr/nlp/impl/StringNLPTextWalker.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/StringNLPTextWalker.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/StringNLPTextWalker.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/SubjectPhraseFinder.java b/nlp/src/main/java/com/rreganjr/nlp/impl/SubjectPhraseFinder.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/SubjectPhraseFinder.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/SubjectPhraseFinder.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/lemmatizer/AbstractDictionaryLemmatizerRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/lemmatizer/AbstractDictionaryLemmatizerRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/lemmatizer/AbstractDictionaryLemmatizerRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/lemmatizer/AbstractDictionaryLemmatizerRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/lemmatizer/DictionarySuffixExchangingLemmatizerRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/lemmatizer/DictionarySuffixExchangingLemmatizerRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/lemmatizer/DictionarySuffixExchangingLemmatizerRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/lemmatizer/DictionarySuffixExchangingLemmatizerRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/lemmatizer/IdentityLemmatizerRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/lemmatizer/IdentityLemmatizerRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/lemmatizer/IdentityLemmatizerRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/lemmatizer/IdentityLemmatizerRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/lemmatizer/SimpleLemmatizer.java b/nlp/src/main/java/com/rreganjr/nlp/impl/lemmatizer/SimpleLemmatizer.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/lemmatizer/SimpleLemmatizer.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/lemmatizer/SimpleLemmatizer.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/AdjectiveMatchingRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/AdjectiveMatchingRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/AdjectiveMatchingRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/AdjectiveMatchingRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/AdverbMatchingRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/AdverbMatchingRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/AdverbMatchingRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/AdverbMatchingRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/LexicalMatchingRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/LexicalMatchingRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/LexicalMatchingRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/LexicalMatchingRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/NounPhraseMatchingRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/NounPhraseMatchingRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/NounPhraseMatchingRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/NounPhraseMatchingRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/PrepositionMatchingRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/PrepositionMatchingRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/PrepositionMatchingRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/PrepositionMatchingRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleCollector.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleCollector.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleCollector.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleCollector.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleCollectorFunction.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleCollectorFunction.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleCollectorFunction.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleCollectorFunction.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleLabeler.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleLabeler.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleLabeler.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleLabeler.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleLabelerException.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleLabelerException.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleLabelerException.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRoleLabelerException.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRolePrinter.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRolePrinter.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRolePrinter.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/SemanticRolePrinter.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/SyntaxMatchingContext.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/SyntaxMatchingContext.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/SyntaxMatchingContext.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/SyntaxMatchingContext.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/SyntaxMatchingRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/SyntaxMatchingRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/SyntaxMatchingRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/SyntaxMatchingRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/VerbMatchingRule.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/VerbMatchingRule.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/VerbMatchingRule.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/VerbMatchingRule.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/VerbNetFrameSyntaxParser.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/VerbNetFrameSyntaxParser.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/VerbNetFrameSyntaxParser.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/VerbNetFrameSyntaxParser.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/srl/VerbNetSelectionalRestrictionsParser.java b/nlp/src/main/java/com/rreganjr/nlp/impl/srl/VerbNetSelectionalRestrictionsParser.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/srl/VerbNetSelectionalRestrictionsParser.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/srl/VerbNetSelectionalRestrictionsParser.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/verbnet/VerbNetImporter.java b/nlp/src/main/java/com/rreganjr/nlp/impl/verbnet/VerbNetImporter.java similarity index 92% rename from requel/src/main/java/com/rreganjr/nlp/impl/verbnet/VerbNetImporter.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/verbnet/VerbNetImporter.java index 15be922..e129dbd 100644 --- a/requel/src/main/java/com/rreganjr/nlp/impl/verbnet/VerbNetImporter.java +++ b/nlp/src/main/java/com/rreganjr/nlp/impl/verbnet/VerbNetImporter.java @@ -21,14 +21,6 @@ */ package com.rreganjr.nlp.impl.verbnet; -import java.io.File; - -import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/wordnet/ClassPathFileManagerImpl.java b/nlp/src/main/java/com/rreganjr/nlp/impl/wordnet/ClassPathFileManagerImpl.java similarity index 95% rename from requel/src/main/java/com/rreganjr/nlp/impl/wordnet/ClassPathFileManagerImpl.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/wordnet/ClassPathFileManagerImpl.java index 50021c7..d9246b0 100644 --- a/requel/src/main/java/com/rreganjr/nlp/impl/wordnet/ClassPathFileManagerImpl.java +++ b/nlp/src/main/java/com/rreganjr/nlp/impl/wordnet/ClassPathFileManagerImpl.java @@ -66,13 +66,13 @@ public ClassPathFileManagerImpl(String searchDir, Class dictionaryFileType) public Object create(Map params) throws JWNLException { Class fileClass = null; try { - fileClass = Class.forName(((Param) params.get(FILE_TYPE)).getValue()); + fileClass = Class.forName(((Param) params.get(FileManagerImpl.FILE_TYPE)).getValue()); } catch (ClassNotFoundException ex) { throw new JWNLRuntimeException("DICTIONARY_EXCEPTION_002", ex); } checkFileType(fileClass); - String path = ((Param) params.get(PATH)).getValue(); + String path = ((Param) params.get(FileManagerImpl.PATH)).getValue(); try { if (path.startsWith("classpath:")) { URL dictPath = getClass().getResource(path.substring("classpath:".length())); diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/wsd/AbstractSenseRelationInfo.java b/nlp/src/main/java/com/rreganjr/nlp/impl/wsd/AbstractSenseRelationInfo.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/wsd/AbstractSenseRelationInfo.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/wsd/AbstractSenseRelationInfo.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/wsd/ColocationSenseRelationInfo.java b/nlp/src/main/java/com/rreganjr/nlp/impl/wsd/ColocationSenseRelationInfo.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/wsd/ColocationSenseRelationInfo.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/wsd/ColocationSenseRelationInfo.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/wsd/SemanticRelatednessSenseRelationInfo.java b/nlp/src/main/java/com/rreganjr/nlp/impl/wsd/SemanticRelatednessSenseRelationInfo.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/wsd/SemanticRelatednessSenseRelationInfo.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/wsd/SemanticRelatednessSenseRelationInfo.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/wsd/SemanticSimilaritySenseRelationInfo.java b/nlp/src/main/java/com/rreganjr/nlp/impl/wsd/SemanticSimilaritySenseRelationInfo.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/wsd/SemanticSimilaritySenseRelationInfo.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/wsd/SemanticSimilaritySenseRelationInfo.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/wsd/SenseRelationInfo.java b/nlp/src/main/java/com/rreganjr/nlp/impl/wsd/SenseRelationInfo.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/wsd/SenseRelationInfo.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/wsd/SenseRelationInfo.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/wsd/SimpleLeskWSD.java b/nlp/src/main/java/com/rreganjr/nlp/impl/wsd/SimpleLeskWSD.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/impl/wsd/SimpleLeskWSD.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/wsd/SimpleLeskWSD.java diff --git a/requel/src/main/java/com/rreganjr/nlp/impl/wsd/WordnetWSD.java b/nlp/src/main/java/com/rreganjr/nlp/impl/wsd/WordnetWSD.java similarity index 99% rename from requel/src/main/java/com/rreganjr/nlp/impl/wsd/WordnetWSD.java rename to nlp/src/main/java/com/rreganjr/nlp/impl/wsd/WordnetWSD.java index ed55d17..3728c7e 100644 --- a/requel/src/main/java/com/rreganjr/nlp/impl/wsd/WordnetWSD.java +++ b/nlp/src/main/java/com/rreganjr/nlp/impl/wsd/WordnetWSD.java @@ -44,7 +44,7 @@ import com.rreganjr.nlp.dictionary.SynsetDefinitionWord; import com.rreganjr.nlp.dictionary.Word; import com.rreganjr.nlp.impl.wsd.ColocationSenseRelationInfo.ColocationSource; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.NoSuchEntityException; /** * A dictionary based word sense disambiguator that uses the information content @@ -60,7 +60,6 @@ public class WordnetWSD implements NLPProcessor { /** * @param dictionaryRepository - * @param processorFactory */ @Autowired public WordnetWSD(DictionaryRepository dictionaryRepository) { diff --git a/requel/src/main/java/com/rreganjr/nlp/utils/GrammaticalRelationTypeBuilder.java b/nlp/src/main/java/com/rreganjr/nlp/utils/GrammaticalRelationTypeBuilder.java similarity index 100% rename from requel/src/main/java/com/rreganjr/nlp/utils/GrammaticalRelationTypeBuilder.java rename to nlp/src/main/java/com/rreganjr/nlp/utils/GrammaticalRelationTypeBuilder.java diff --git a/repository/pom.xml b/repository/pom.xml new file mode 100644 index 0000000..d4745b7 --- /dev/null +++ b/repository/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + repository + + com.rreganjr.requel + maven-base + 1.0.3 + ../_maven-base/pom.xml + + + + + com.rreganjr.requel + exception + + + com.rreganjr.requel + initializer + + + com.rreganjr.requel + command + + + + + + cglib + cglib-nodep + + + + + org.aspectj + aspectjrt + + + + + com.fifesoft + spellchecker + + + + org.springframework + spring-orm + + + + org.hibernate + hibernate-core + + + + + mysql + mysql-connector-java + + + + + \ No newline at end of file diff --git a/repository/repository.iml b/repository/repository.iml new file mode 100644 index 0000000..91ed79d --- /dev/null +++ b/repository/repository.iml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/requel/src/main/java/com/rreganjr/repository/AbstractRepository.java b/repository/src/main/java/com/rreganjr/repository/AbstractRepository.java similarity index 96% rename from requel/src/main/java/com/rreganjr/repository/AbstractRepository.java rename to repository/src/main/java/com/rreganjr/repository/AbstractRepository.java index 0ed9ef2..142e97b 100644 --- a/requel/src/main/java/com/rreganjr/repository/AbstractRepository.java +++ b/repository/src/main/java/com/rreganjr/repository/AbstractRepository.java @@ -20,6 +20,8 @@ */ package com.rreganjr.repository; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/requel/src/main/java/com/rreganjr/repository/AbstractRepositoryCommand.java b/repository/src/main/java/com/rreganjr/repository/AbstractRepositoryCommand.java similarity index 100% rename from requel/src/main/java/com/rreganjr/repository/AbstractRepositoryCommand.java rename to repository/src/main/java/com/rreganjr/repository/AbstractRepositoryCommand.java diff --git a/requel/src/main/java/com/rreganjr/repository/DatabaseInitializer.java b/repository/src/main/java/com/rreganjr/repository/DatabaseInitializer.java similarity index 97% rename from requel/src/main/java/com/rreganjr/repository/DatabaseInitializer.java rename to repository/src/main/java/com/rreganjr/repository/DatabaseInitializer.java index b25c002..922cd27 100644 --- a/requel/src/main/java/com/rreganjr/repository/DatabaseInitializer.java +++ b/repository/src/main/java/com/rreganjr/repository/DatabaseInitializer.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.SystemInitializer; +import com.rreganjr.initializer.SystemInitializer; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/repository/EntityExceptionAdapter.java b/repository/src/main/java/com/rreganjr/repository/EntityExceptionAdapter.java similarity index 91% rename from requel/src/main/java/com/rreganjr/repository/EntityExceptionAdapter.java rename to repository/src/main/java/com/rreganjr/repository/EntityExceptionAdapter.java index 53de007..bdfa5d1 100644 --- a/requel/src/main/java/com/rreganjr/repository/EntityExceptionAdapter.java +++ b/repository/src/main/java/com/rreganjr/repository/EntityExceptionAdapter.java @@ -20,6 +20,9 @@ */ package com.rreganjr.repository; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; + /** * @author ron */ @@ -41,6 +44,6 @@ public interface EntityExceptionAdapter { * @return */ public EntityException convert(Throwable original, Class entityType, Object entity, - EntityExceptionActionType actionType); + EntityExceptionActionType actionType); } diff --git a/requel/src/main/java/com/rreganjr/repository/ExceptionMapper.java b/repository/src/main/java/com/rreganjr/repository/ExceptionMapper.java similarity index 98% rename from requel/src/main/java/com/rreganjr/repository/ExceptionMapper.java rename to repository/src/main/java/com/rreganjr/repository/ExceptionMapper.java index ce7ff2f..e1cc058 100644 --- a/requel/src/main/java/com/rreganjr/repository/ExceptionMapper.java +++ b/repository/src/main/java/com/rreganjr/repository/ExceptionMapper.java @@ -30,6 +30,8 @@ import javax.persistence.EntityExistsException; import javax.persistence.OptimisticLockException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.jpa.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/requel/src/main/java/com/rreganjr/repository/ExceptionMappingCommandHandler.java b/repository/src/main/java/com/rreganjr/repository/ExceptionMappingCommandHandler.java similarity index 100% rename from requel/src/main/java/com/rreganjr/repository/ExceptionMappingCommandHandler.java rename to repository/src/main/java/com/rreganjr/repository/ExceptionMappingCommandHandler.java diff --git a/requel/src/main/java/com/rreganjr/repository/Repository.java b/repository/src/main/java/com/rreganjr/repository/Repository.java similarity index 98% rename from requel/src/main/java/com/rreganjr/repository/Repository.java rename to repository/src/main/java/com/rreganjr/repository/Repository.java index 0be240a..bd8e5d2 100644 --- a/requel/src/main/java/com/rreganjr/repository/Repository.java +++ b/repository/src/main/java/com/rreganjr/repository/Repository.java @@ -20,6 +20,8 @@ */ package com.rreganjr.repository; +import com.rreganjr.EntityException; + /** * A generic set of methods common to all repositories. * diff --git a/requel/src/main/java/com/rreganjr/repository/RetryOnLockFailuresCommandHandler.java b/repository/src/main/java/com/rreganjr/repository/RetryOnLockFailuresCommandHandler.java similarity index 98% rename from requel/src/main/java/com/rreganjr/repository/RetryOnLockFailuresCommandHandler.java rename to repository/src/main/java/com/rreganjr/repository/RetryOnLockFailuresCommandHandler.java index f5ba633..6316aee 100644 --- a/requel/src/main/java/com/rreganjr/repository/RetryOnLockFailuresCommandHandler.java +++ b/repository/src/main/java/com/rreganjr/repository/RetryOnLockFailuresCommandHandler.java @@ -24,6 +24,7 @@ import javax.persistence.OptimisticLockException; +import com.rreganjr.EntityException; import com.rreganjr.command.Command; import com.rreganjr.command.CommandHandler; import org.apache.commons.logging.Log; @@ -33,8 +34,8 @@ import org.springframework.dao.CannotAcquireLockException; import org.springframework.orm.hibernate5.HibernateOptimisticLockingFailureException; -import com.rreganjr.requel.EntityLockException; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityLockException; +import com.rreganjr.EntityValidationException; /** * A command handler that wraps another command handler and traps exceptions diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/AbstractJpaRepository.java b/repository/src/main/java/com/rreganjr/repository/jpa/AbstractJpaRepository.java similarity index 98% rename from requel/src/main/java/com/rreganjr/repository/jpa/AbstractJpaRepository.java rename to repository/src/main/java/com/rreganjr/repository/jpa/AbstractJpaRepository.java index e6b62c1..607a8b4 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/AbstractJpaRepository.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/AbstractJpaRepository.java @@ -34,8 +34,8 @@ import org.springframework.transaction.annotation.Transactional; import com.rreganjr.repository.AbstractRepository; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/ConstraintViolationExceptionAdapter.java b/repository/src/main/java/com/rreganjr/repository/jpa/ConstraintViolationExceptionAdapter.java similarity index 90% rename from requel/src/main/java/com/rreganjr/repository/jpa/ConstraintViolationExceptionAdapter.java rename to repository/src/main/java/com/rreganjr/repository/jpa/ConstraintViolationExceptionAdapter.java index 9d7d420..ed73c00 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/ConstraintViolationExceptionAdapter.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/ConstraintViolationExceptionAdapter.java @@ -24,8 +24,8 @@ import com.mysql.jdbc.exceptions.MySQLIntegrityConstraintViolationException; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.EntityExceptionAdapter; /** @@ -44,9 +44,7 @@ public ConstraintViolationExceptionAdapter(String propertyName) { } /** - * @see com.rreganjr.repository.EntityExceptionAdapter#convert(java.lang.Throwable, - * java.lang.Object, - * com.rreganjr.repository.EntityExceptionActionType) + * @see com.rreganjr.repository.EntityExceptionAdapter#convert(Throwable, Class, Object, EntityExceptionActionType) */ @Override public EntityException convert(Throwable original, Class entityType, Object entity, diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrapper.java b/repository/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrapper.java similarity index 92% rename from requel/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrapper.java rename to repository/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrapper.java index f85895f..9549edc 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrapper.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrapper.java @@ -43,9 +43,6 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.requel.user.UserSet; -import com.rreganjr.requel.user.impl.UserSetImpl; - /** * A component that takes an object and if it is a persistent entity or * collection of persistent entities, it wraps all the entities in a proxy using @@ -98,9 +95,7 @@ public void setStaleTimeoutMap(Map, Integer> staleTimeoutMap) { public Object wrapPersistentEntities(Object object, long timeStamp) { if (object instanceof Collection) { Collection collection = (Collection) object; - if (collection instanceof UserSet) { - object = wrapUserSetEntries((UserSet) collection, timeStamp); - } else if (collection instanceof SortedSet) { + if (collection instanceof SortedSet) { object = wrapCollectionEntries(new TreeSet(((SortedSet) collection) .comparator()), collection, timeStamp); } else if (collection instanceof Set) { @@ -120,13 +115,13 @@ public Object wrapPersistentEntities(Object object, long timeStamp) { } // TODO: the UserSet may not be needed - protected UserSet wrapUserSetEntries(UserSet collection, long timeStamp) { - Set set = new HashSet(collection.size()); - for (Object entity : collection) { - set.add(wrapEntity(entity, timeStamp)); - } - return new UserSetImpl(set); - } +// protected UserSet wrapUserSetEntries(UserSet collection, long timeStamp) { +// Set set = new HashSet(collection.size()); +// for (Object entity : collection) { +// set.add(wrapEntity(entity, timeStamp)); +// } +// return new UserSetImpl(set); +// } protected Object wrapCollectionEntries(Collection newCollection, Collection origCollection, long timeStamp) { diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdvice.java b/repository/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdvice.java similarity index 96% rename from requel/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdvice.java rename to repository/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdvice.java index 1e0caa4..857ddb5 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdvice.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdvice.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.SystemInitializer; +import com.rreganjr.initializer.SystemInitializer; import com.rreganjr.command.Command; /** @@ -70,7 +70,7 @@ public DomainObjectWrappingAdvice(DomainObjectWrapper domainObjectWrapper) { * wrapped in a proxy. * @throws Throwable */ - @Around(value = "execution(* com.rreganjr.repository.jpa.AbstractJpaRepository+.*(..)) || execution(* com.rreganjr.command.Command+.get*(..))") + @Around(value = "execution(* AbstractJpaRepository+.*(..)) || execution(* com.rreganjr.command.Command+.get*(..))") public Object wrapReturnedObject(ProceedingJoinPoint pjp) throws Throwable { // unwrap EntityProxies before passing into repository methods Object[] args = pjp.getArgs(); diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/EntityExistsExceptionAdapter.java b/repository/src/main/java/com/rreganjr/repository/jpa/EntityExistsExceptionAdapter.java similarity index 87% rename from requel/src/main/java/com/rreganjr/repository/jpa/EntityExistsExceptionAdapter.java rename to repository/src/main/java/com/rreganjr/repository/jpa/EntityExistsExceptionAdapter.java index f6ab08b..eb5adb8 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/EntityExistsExceptionAdapter.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/EntityExistsExceptionAdapter.java @@ -24,8 +24,8 @@ import com.mysql.jdbc.exceptions.MySQLIntegrityConstraintViolationException; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.EntityExceptionAdapter; /** @@ -34,16 +34,12 @@ public class EntityExistsExceptionAdapter implements EntityExceptionAdapter { /** - * @param propertyName - - * name of the property that must be unique. */ public EntityExistsExceptionAdapter() { } /** - * @see com.rreganjr.repository.EntityExceptionAdapter#convert(java.lang.Throwable, - * java.lang.Object, - * com.rreganjr.repository.EntityExceptionActionType) + * @see com.rreganjr.repository.EntityExceptionAdapter#convert(Throwable, Class, Object, EntityExceptionActionType) */ @Override public EntityException convert(Throwable original, Class entityType, Object entity, diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/EntityProxyInterceptor.java b/repository/src/main/java/com/rreganjr/repository/jpa/EntityProxyInterceptor.java similarity index 100% rename from requel/src/main/java/com/rreganjr/repository/jpa/EntityProxyInterceptor.java rename to repository/src/main/java/com/rreganjr/repository/jpa/EntityProxyInterceptor.java diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/GenericPropertyValueExceptionAdapter.java b/repository/src/main/java/com/rreganjr/repository/jpa/GenericPropertyValueExceptionAdapter.java similarity index 86% rename from requel/src/main/java/com/rreganjr/repository/jpa/GenericPropertyValueExceptionAdapter.java rename to repository/src/main/java/com/rreganjr/repository/jpa/GenericPropertyValueExceptionAdapter.java index de11ccd..f381374 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/GenericPropertyValueExceptionAdapter.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/GenericPropertyValueExceptionAdapter.java @@ -22,10 +22,10 @@ import org.hibernate.PropertyValueException; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.EntityExceptionAdapter; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityValidationException; /** * @author ron @@ -33,9 +33,7 @@ public class GenericPropertyValueExceptionAdapter implements EntityExceptionAdapter { /** - * @see com.rreganjr.repository.EntityExceptionAdapter#convert(java.lang.Throwable, - * java.lang.Object, - * com.rreganjr.repository.EntityExceptionActionType) + * @see com.rreganjr.repository.EntityExceptionAdapter#convert(Throwable, Class, Object, EntityExceptionActionType) */ @Override public EntityException convert(Throwable original, Class entityType, Object entity, diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/InvalidStateExceptionAdapter.java b/repository/src/main/java/com/rreganjr/repository/jpa/InvalidStateExceptionAdapter.java similarity index 83% rename from requel/src/main/java/com/rreganjr/repository/jpa/InvalidStateExceptionAdapter.java rename to repository/src/main/java/com/rreganjr/repository/jpa/InvalidStateExceptionAdapter.java index 33b559b..0ff476d 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/InvalidStateExceptionAdapter.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/InvalidStateExceptionAdapter.java @@ -22,10 +22,10 @@ import org.hibernate.validator.InvalidStateException; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.EntityExceptionAdapter; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityValidationException; /** * @author ron @@ -33,9 +33,7 @@ public class InvalidStateExceptionAdapter implements EntityExceptionAdapter { /** - * @see com.rreganjr.repository.EntityExceptionAdapter#convert(java.lang.Throwable, - * java.lang.Object, - * com.rreganjr.repository.EntityExceptionActionType) + * @see com.rreganjr.repository.EntityExceptionAdapter#convert(Throwable, Class, Object, EntityExceptionActionType) */ @Override public EntityException convert(Throwable original, Class entityType, Object entity, diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/LockAcquisitionExceptionAdapter.java b/repository/src/main/java/com/rreganjr/repository/jpa/LockAcquisitionExceptionAdapter.java similarity index 93% rename from requel/src/main/java/com/rreganjr/repository/jpa/LockAcquisitionExceptionAdapter.java rename to repository/src/main/java/com/rreganjr/repository/jpa/LockAcquisitionExceptionAdapter.java index 308f5ee..ea8abf3 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/LockAcquisitionExceptionAdapter.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/LockAcquisitionExceptionAdapter.java @@ -20,9 +20,9 @@ */ package com.rreganjr.repository.jpa; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.EntityExceptionAdapter; -import com.rreganjr.requel.EntityLockException; +import com.rreganjr.EntityLockException; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/OptimisticLockExceptionAdapter.java b/repository/src/main/java/com/rreganjr/repository/jpa/OptimisticLockExceptionAdapter.java similarity index 93% rename from requel/src/main/java/com/rreganjr/repository/jpa/OptimisticLockExceptionAdapter.java rename to repository/src/main/java/com/rreganjr/repository/jpa/OptimisticLockExceptionAdapter.java index 1d2c13d..fe8f1f5 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/OptimisticLockExceptionAdapter.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/OptimisticLockExceptionAdapter.java @@ -20,9 +20,9 @@ */ package com.rreganjr.repository.jpa; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.EntityExceptionAdapter; -import com.rreganjr.requel.EntityLockException; +import com.rreganjr.EntityLockException; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/PersistenceContextHelper.java b/repository/src/main/java/com/rreganjr/repository/jpa/PersistenceContextHelper.java similarity index 99% rename from requel/src/main/java/com/rreganjr/repository/jpa/PersistenceContextHelper.java rename to repository/src/main/java/com/rreganjr/repository/jpa/PersistenceContextHelper.java index cab3288..dc7c45e 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/PersistenceContextHelper.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/PersistenceContextHelper.java @@ -50,6 +50,7 @@ public PersistenceContextHelper() { } /** + * * @param entityHolder * @param domainObjectWrapper * @param method diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/StaleObjectStateExceptionAdapter.java b/repository/src/main/java/com/rreganjr/repository/jpa/StaleObjectStateExceptionAdapter.java similarity index 93% rename from requel/src/main/java/com/rreganjr/repository/jpa/StaleObjectStateExceptionAdapter.java rename to repository/src/main/java/com/rreganjr/repository/jpa/StaleObjectStateExceptionAdapter.java index bac032c..65a59c0 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/StaleObjectStateExceptionAdapter.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/StaleObjectStateExceptionAdapter.java @@ -20,9 +20,9 @@ */ package com.rreganjr.repository.jpa; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.EntityExceptionAdapter; -import com.rreganjr.requel.EntityLockException; +import com.rreganjr.EntityLockException; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/repository/jpa/UserPropertyValueExceptionAdapter.java b/repository/src/main/java/com/rreganjr/repository/jpa/UserPropertyValueExceptionAdapter.java similarity index 87% rename from requel/src/main/java/com/rreganjr/repository/jpa/UserPropertyValueExceptionAdapter.java rename to repository/src/main/java/com/rreganjr/repository/jpa/UserPropertyValueExceptionAdapter.java index 9b4bce1..b1c3a93 100644 --- a/requel/src/main/java/com/rreganjr/repository/jpa/UserPropertyValueExceptionAdapter.java +++ b/repository/src/main/java/com/rreganjr/repository/jpa/UserPropertyValueExceptionAdapter.java @@ -22,10 +22,10 @@ import org.hibernate.PropertyValueException; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.EntityExceptionAdapter; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityValidationException; /** * @author ron @@ -33,9 +33,7 @@ public class UserPropertyValueExceptionAdapter implements EntityExceptionAdapter { /** - * @see com.rreganjr.repository.EntityExceptionAdapter#convert(java.lang.Throwable, - * java.lang.Object, - * com.rreganjr.repository.EntityExceptionActionType) + * @see com.rreganjr.repository.EntityExceptionAdapter#convert(Throwable, Class, Object, EntityExceptionActionType) */ @Override public EntityException convert(Throwable original, Class entityType, Object entity, diff --git a/requel/pom.xml b/requel/pom.xml index 6ce0c89..f991e0b 100644 --- a/requel/pom.xml +++ b/requel/pom.xml @@ -4,7 +4,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 requel - 1.0.3 com.rreganjr.requel @@ -17,16 +16,25 @@ - + + com.rreganjr.requel + exception + + + com.rreganjr.requel + initializer + com.rreganjr.requel command - - - cglib - cglib-nodep + com.rreganjr.requel + nlp + + + com.rreganjr.requel + repository @@ -138,42 +146,6 @@ commons-digester commons-digester - - - opennlp - tools - - - - opennlp - maxent - - - - com.fifesoft - spellchecker - - - - - - edu.stanford.nlp - stanford-corenlp - 3.8.0 - - - edu.stanford.nlp - stanford-corenlp - 3.8.0 - models - - org.springframework.boot spring-boot-starter-web diff --git a/requel/requel.iml b/requel/requel.iml index 57af66f..5d13b35 100644 --- a/requel/requel.iml +++ b/requel/requel.iml @@ -11,12 +11,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41,27 +78,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -80,8 +96,6 @@ - - @@ -89,18 +103,9 @@ - - - - - - - - - @@ -108,6 +113,7 @@ + diff --git a/requel/src/main/java/com/rreganjr/requel/Application.java b/requel/src/main/java/com/rreganjr/requel/Application.java index 63f61f7..33a1d59 100644 --- a/requel/src/main/java/com/rreganjr/requel/Application.java +++ b/requel/src/main/java/com/rreganjr/requel/Application.java @@ -22,7 +22,6 @@ */ package com.rreganjr.requel; -import com.rreganjr.requel.service.ProjectXmlController; import net.sf.echopm.EchoPMLogoutServlet; import net.sf.echopm.EchoPMServlet; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +38,6 @@ import org.springframework.context.annotation.ImportResource; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; @SpringBootApplication diff --git a/requel/src/main/java/com/rreganjr/requel/DefaultCommandHandler.java b/requel/src/main/java/com/rreganjr/requel/DefaultCommandHandler.java index 7021923..40554f7 100644 --- a/requel/src/main/java/com/rreganjr/requel/DefaultCommandHandler.java +++ b/requel/src/main/java/com/rreganjr/requel/DefaultCommandHandler.java @@ -20,6 +20,7 @@ */ package com.rreganjr.requel; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.command.Command; import com.rreganjr.command.CommandHandler; import org.springframework.transaction.annotation.Propagation; diff --git a/requel/src/main/java/com/rreganjr/requel/RequelException.java b/requel/src/main/java/com/rreganjr/requel/RequelException.java deleted file mode 100644 index 635d605..0000000 --- a/requel/src/main/java/com/rreganjr/requel/RequelException.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * $Id$ - * Copyright 2008, 2009 Ron Regan Jr. All Rights Reserved. - * This file is part of Requel - the Collaborative Requirements - * Elicitation System. - * - * Requel is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Requel is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Requel. If not, see . - * - */ -package com.rreganjr.requel; - -import com.rreganjr.ApplicationException; - -/** - * @author ron - */ -public class RequelException extends ApplicationException { - static final long serialVersionUID = 0; - - /** - * @param format - * @param args - */ - protected RequelException(String format, Object... args) { - super(format, args); - } - - /** - * @param cause - * @param format - * @param args - */ - protected RequelException(Throwable cause, String format, Object... args) { - super(cause, format, args); - } -} diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/AnnotationExistsException.java b/requel/src/main/java/com/rreganjr/requel/annotation/AnnotationExistsException.java index 1702743..b25a378 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/AnnotationExistsException.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/AnnotationExistsException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.annotation; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/NoSuchAnnotationException.java b/requel/src/main/java/com/rreganjr/requel/annotation/NoSuchAnnotationException.java index 64ebffd..3ea54a0 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/NoSuchAnnotationException.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/NoSuchAnnotationException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.annotation; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; /** * @author ron diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/NoSuchPositionException.java b/requel/src/main/java/com/rreganjr/requel/annotation/NoSuchPositionException.java index ad118ea..2bf6ba1 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/NoSuchPositionException.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/NoSuchPositionException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.annotation; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.impl.LexicalIssue; import com.rreganjr.requel.project.ProjectOrDomain; diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/impl/JpaAnnotationRepository.java b/requel/src/main/java/com/rreganjr/requel/annotation/impl/JpaAnnotationRepository.java index dc60694..4603e7a 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/impl/JpaAnnotationRepository.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/impl/JpaAnnotationRepository.java @@ -36,8 +36,8 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.jpa.AbstractJpaRepository; import com.rreganjr.repository.ExceptionMapper; import com.rreganjr.repository.jpa.GenericPropertyValueExceptionAdapter; diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditArgumentCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditArgumentCommandImpl.java index d554797..85e5e15 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditArgumentCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditArgumentCommandImpl.java @@ -25,8 +25,8 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.EntityValidationException; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.Argument; import com.rreganjr.requel.annotation.ArgumentPositionSupportLevel; diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditIssueCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditIssueCommandImpl.java index 3880f16..4d38a7f 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditIssueCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditIssueCommandImpl.java @@ -25,8 +25,8 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.EntityValidationException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.Issue; diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditNoteCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditNoteCommandImpl.java index 3f86e78..0aa5f08 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditNoteCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditNoteCommandImpl.java @@ -25,8 +25,8 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.EntityValidationException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.NoSuchAnnotationException; diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditPositionCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditPositionCommandImpl.java index 8405a60..b9abda9 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditPositionCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/EditPositionCommandImpl.java @@ -25,9 +25,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.EntityValidationException; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.EntityValidationException; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.Issue; import com.rreganjr.requel.annotation.Position; diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueCommandImpl.java index 2744df4..867fe2f 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueCommandImpl.java @@ -25,8 +25,8 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.EntityValidationException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.Issue; diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueWithAddWordToDictionaryPositionCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueWithAddWordToDictionaryPositionCommandImpl.java index 376383c..86aedda 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueWithAddWordToDictionaryPositionCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueWithAddWordToDictionaryPositionCommandImpl.java @@ -27,8 +27,8 @@ import com.rreganjr.command.CommandHandler; import com.rreganjr.nlp.dictionary.command.DictionaryCommandFactory; import com.rreganjr.nlp.dictionary.command.EditDictionaryWordCommand; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.EntityValidationException; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.annotation.impl.AddWordToDictionaryPosition; diff --git a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueWithChangeSpellingPositionCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueWithChangeSpellingPositionCommandImpl.java index d61bdcc..2ecb716 100644 --- a/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueWithChangeSpellingPositionCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/annotation/impl/command/ResolveIssueWithChangeSpellingPositionCommandImpl.java @@ -30,8 +30,8 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.EntityValidationException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; diff --git a/requel/src/main/java/com/rreganjr/requel/project/ProjectRepository.java b/requel/src/main/java/com/rreganjr/requel/project/ProjectRepository.java index b6c4b05..794ac0a 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/ProjectRepository.java +++ b/requel/src/main/java/com/rreganjr/requel/project/ProjectRepository.java @@ -22,9 +22,9 @@ import java.util.Set; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.repository.Repository; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.project.exception.NoSuchProjectException; import com.rreganjr.requel.project.impl.AddActorPosition; import com.rreganjr.requel.project.impl.AddGlossaryTermPosition; diff --git a/requel/src/main/java/com/rreganjr/requel/project/exception/GoalNameInUseException.java b/requel/src/main/java/com/rreganjr/requel/project/exception/GoalNameInUseException.java index 3b90690..9bbd77b 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/exception/GoalNameInUseException.java +++ b/requel/src/main/java/com/rreganjr/requel/project/exception/GoalNameInUseException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.project.exception; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.requel.project.Goal; import com.rreganjr.requel.project.Project; diff --git a/requel/src/main/java/com/rreganjr/requel/project/exception/GoalSelfRelationException.java b/requel/src/main/java/com/rreganjr/requel/project/exception/GoalSelfRelationException.java index 5548f83..04915e4 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/exception/GoalSelfRelationException.java +++ b/requel/src/main/java/com/rreganjr/requel/project/exception/GoalSelfRelationException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.project.exception; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.requel.project.Goal; import com.rreganjr.requel.project.GoalRelation; diff --git a/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchActorException.java b/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchActorException.java index 5e0a778..8be6e91 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchActorException.java +++ b/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchActorException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.project.exception; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.project.Actor; import com.rreganjr.requel.project.ProjectOrDomain; diff --git a/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchGlossaryTermException.java b/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchGlossaryTermException.java index 2dc1ab0..5730c63 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchGlossaryTermException.java +++ b/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchGlossaryTermException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.project.exception; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.project.GlossaryTerm; import com.rreganjr.requel.project.ProjectOrDomain; diff --git a/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchProjectException.java b/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchProjectException.java index 0b08d55..342b31a 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchProjectException.java +++ b/requel/src/main/java/com/rreganjr/requel/project/exception/NoSuchProjectException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.project.exception; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.project.Project; /** diff --git a/requel/src/main/java/com/rreganjr/requel/project/exception/ProjectNameInUseException.java b/requel/src/main/java/com/rreganjr/requel/project/exception/ProjectNameInUseException.java index 46dcdbb..d9559fb 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/exception/ProjectNameInUseException.java +++ b/requel/src/main/java/com/rreganjr/requel/project/exception/ProjectNameInUseException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.project.exception; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.requel.project.Project; /** diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyActorCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyActorCommandImpl.java index 5ae9b51..04081e7 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyActorCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyActorCommandImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.Actor; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyGoalCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyGoalCommandImpl.java index ae65b02..fcca33e 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyGoalCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyGoalCommandImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.GlossaryTerm; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyScenarioCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyScenarioCommandImpl.java index b01ce3e..313d65b 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyScenarioCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyScenarioCommandImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.GlossaryTerm; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyScenarioStepCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyScenarioStepCommandImpl.java index 417631b..fe1a340 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyScenarioStepCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyScenarioStepCommandImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.GlossaryTerm; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyStoryCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyStoryCommandImpl.java index 4c3f686..ed84553 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyStoryCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyStoryCommandImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.Actor; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyUseCaseCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyUseCaseCommandImpl.java index bfbc929..f926f79 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyUseCaseCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/CopyUseCaseCommandImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.Actor; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/DeleteGlossaryTermCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/DeleteGlossaryTermCommandImpl.java index 1b70943..dab5437 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/DeleteGlossaryTermCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/DeleteGlossaryTermCommandImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.annotation.command.DeletePositionCommand; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditActorCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditActorCommandImpl.java index f0526e3..35442df 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditActorCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditActorCommandImpl.java @@ -28,9 +28,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.Actor; import com.rreganjr.requel.project.ActorContainer; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGlossaryTermCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGlossaryTermCommandImpl.java index 817a52d..6a80b61 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGlossaryTermCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGlossaryTermCommandImpl.java @@ -27,10 +27,10 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.EntityValidationException; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.EntityValidationException; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.GlossaryTerm; import com.rreganjr.requel.project.ProjectOrDomain; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGoalCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGoalCommandImpl.java index 85105c1..d9f2e5c 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGoalCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGoalCommandImpl.java @@ -25,9 +25,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.Goal; import com.rreganjr.requel.project.GoalContainer; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGoalRelationCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGoalRelationCommandImpl.java index 4e9a970..8278f6c 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGoalRelationCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditGoalRelationCommandImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityValidationException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.Goal; import com.rreganjr.requel.project.GoalRelation; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditNonUserStakeholderCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditNonUserStakeholderCommandImpl.java index 01c8a3a..bf9e81e 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditNonUserStakeholderCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditNonUserStakeholderCommandImpl.java @@ -25,9 +25,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.NonUserStakeholder; import com.rreganjr.requel.project.ProjectOrDomain; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditProjectCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditProjectCommandImpl.java index 5014f4c..9ba121c 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditProjectCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditProjectCommandImpl.java @@ -29,9 +29,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.Project; import com.rreganjr.requel.project.ProjectRepository; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditReportGeneratorCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditReportGeneratorCommandImpl.java index 416591c..c4e7fb1 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditReportGeneratorCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditReportGeneratorCommandImpl.java @@ -25,9 +25,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.ProjectOrDomain; import com.rreganjr.requel.project.ProjectRepository; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditScenarioCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditScenarioCommandImpl.java index d2b128f..80c10b9 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditScenarioCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditScenarioCommandImpl.java @@ -28,9 +28,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.ProjectOrDomain; import com.rreganjr.requel.project.ProjectRepository; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditStoryCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditStoryCommandImpl.java index 0f7a610..49a4fc6 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditStoryCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditStoryCommandImpl.java @@ -25,9 +25,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.ProjectOrDomain; import com.rreganjr.requel.project.ProjectOrDomainEntity; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditUseCaseCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditUseCaseCommandImpl.java index 7e7b098..41f3745 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditUseCaseCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditUseCaseCommandImpl.java @@ -27,9 +27,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.Actor; import com.rreganjr.requel.project.ProjectOrDomain; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditUserStakeholderCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditUserStakeholderCommandImpl.java index b0e2c5c..79f2f74 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditUserStakeholderCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/command/EditUserStakeholderCommandImpl.java @@ -27,9 +27,9 @@ import org.springframework.stereotype.Controller; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.Project; import com.rreganjr.requel.project.ProjectOrDomain; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/repository/init/StakeholderPermissionsInitializer.java b/requel/src/main/java/com/rreganjr/requel/project/impl/repository/init/StakeholderPermissionsInitializer.java index b307e57..2d37491 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/repository/init/StakeholderPermissionsInitializer.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/repository/init/StakeholderPermissionsInitializer.java @@ -30,8 +30,8 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.rreganjr.AbstractSystemInitializer; -import com.rreganjr.repository.EntityException; +import com.rreganjr.initializer.AbstractSystemInitializer; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Actor; import com.rreganjr.requel.project.GlossaryTerm; diff --git a/requel/src/main/java/com/rreganjr/requel/project/impl/repository/jpa/JpaProjectRepository.java b/requel/src/main/java/com/rreganjr/requel/project/impl/repository/jpa/JpaProjectRepository.java index 5e2065c..3781576 100644 --- a/requel/src/main/java/com/rreganjr/requel/project/impl/repository/jpa/JpaProjectRepository.java +++ b/requel/src/main/java/com/rreganjr/requel/project/impl/repository/jpa/JpaProjectRepository.java @@ -42,15 +42,15 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.jpa.AbstractJpaRepository; import com.rreganjr.repository.jpa.ConstraintViolationExceptionAdapter; import com.rreganjr.repository.ExceptionMapper; import com.rreganjr.repository.jpa.GenericPropertyValueExceptionAdapter; import com.rreganjr.repository.jpa.InvalidStateExceptionAdapter; import com.rreganjr.repository.jpa.OptimisticLockExceptionAdapter; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.annotation.NoSuchPositionException; import com.rreganjr.requel.project.Actor; import com.rreganjr.requel.project.GlossaryTerm; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/annotation/ArgumentEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/annotation/ArgumentEditorPanel.java index b63b9cb..58425ab 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/annotation/ArgumentEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/annotation/ArgumentEditorPanel.java @@ -36,7 +36,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.annotation.Argument; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/annotation/IssueEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/annotation/IssueEditorPanel.java index 59c9ea3..4db76c2 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/annotation/IssueEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/annotation/IssueEditorPanel.java @@ -46,7 +46,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.Issue; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/annotation/NoteEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/annotation/NoteEditorPanel.java index 568defe..adb5122 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/annotation/NoteEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/annotation/NoteEditorPanel.java @@ -33,7 +33,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.Note; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/annotation/PositionEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/annotation/PositionEditorPanel.java index fd97e3e..daf34b8 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/annotation/PositionEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/annotation/PositionEditorPanel.java @@ -43,7 +43,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.Argument; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/ActorEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/ActorEditorPanel.java index 1bad7b8..48ac852 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/ActorEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/ActorEditorPanel.java @@ -35,7 +35,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Goal; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/GlossaryTermEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/GlossaryTermEditorPanel.java index 512cb71..7a3e09b 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/GlossaryTermEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/GlossaryTermEditorPanel.java @@ -37,7 +37,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.GlossaryTerm; import com.rreganjr.requel.project.Project; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/GoalEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/GoalEditorPanel.java index 3190dc3..d436f69 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/GoalEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/GoalEditorPanel.java @@ -44,7 +44,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Goal; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/GoalRelationEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/GoalRelationEditorPanel.java index 8750728..94311f0 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/GoalRelationEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/GoalRelationEditorPanel.java @@ -36,7 +36,7 @@ import org.hibernate.validator.InvalidValue; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Goal; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/NonUserStakeholderEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/NonUserStakeholderEditorPanel.java index da3e1b3..dd02e4a 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/NonUserStakeholderEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/NonUserStakeholderEditorPanel.java @@ -35,7 +35,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Goal; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/ProjectImportPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/ProjectImportPanel.java index 742f695..7ede66f 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/ProjectImportPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/ProjectImportPanel.java @@ -42,7 +42,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.project.Project; import com.rreganjr.requel.project.ProjectRepository; import com.rreganjr.requel.project.ProjectUserRole; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/ProjectOverviewPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/ProjectOverviewPanel.java index 850d33a..0d13b7b 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/ProjectOverviewPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/ProjectOverviewPanel.java @@ -40,7 +40,7 @@ import echopointng.ComboBox; import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Project; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/ReportGeneratorEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/ReportGeneratorEditorPanel.java index 647c075..2ccc542 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/ReportGeneratorEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/ReportGeneratorEditorPanel.java @@ -39,7 +39,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.ReportGenerator; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/ScenarioEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/ScenarioEditorPanel.java index d893491..ccf1e12 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/ScenarioEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/ScenarioEditorPanel.java @@ -40,7 +40,7 @@ import echopointng.tree.DefaultTreeModel; import echopointng.tree.MutableTreeNode; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Actor; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/StoryEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/StoryEditorPanel.java index 7722722..d0d1f5d 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/StoryEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/StoryEditorPanel.java @@ -38,7 +38,7 @@ import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Actor; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/UseCaseEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/UseCaseEditorPanel.java index 6b2df47..3819261 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/UseCaseEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/UseCaseEditorPanel.java @@ -40,7 +40,7 @@ import echopointng.tree.DefaultTreeModel; import echopointng.tree.MutableTreeNode; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Actor; diff --git a/requel/src/main/java/com/rreganjr/requel/ui/project/UserStakeholderEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/project/UserStakeholderEditorPanel.java index 85faa86..aa5808a 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/project/UserStakeholderEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/project/UserStakeholderEditorPanel.java @@ -36,7 +36,7 @@ import echopointng.ComboBox; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.annotation.Annotatable; import com.rreganjr.requel.annotation.Annotation; import com.rreganjr.requel.project.Goal; @@ -56,7 +56,6 @@ import com.rreganjr.requel.ui.annotation.AnnotationsTable; import com.rreganjr.requel.user.User; import com.rreganjr.requel.user.UserRepository; -import com.rreganjr.requel.user.UserSet; import net.sf.echopm.navigation.event.DeletedEntityEvent; import net.sf.echopm.navigation.event.UpdateEntityEvent; import net.sf.echopm.panel.editor.CheckBoxTreeSet; @@ -319,7 +318,7 @@ private Set getProjectTeamNames() { private Set getProjectUsersUsernames() { Set usernames = new TreeSet(); usernames.add(""); - UserSet projectUsers = getUserRepository().findUsersForRole(ProjectUserRole.class); + Set projectUsers = getUserRepository().findUsersForRole(ProjectUserRole.class); for (User user : projectUsers) { usernames.add(user.getUsername()); } diff --git a/requel/src/main/java/com/rreganjr/requel/ui/user/UserCollectionNavigatorTreeNodeFactory.java b/requel/src/main/java/com/rreganjr/requel/ui/user/UserCollectionNavigatorTreeNodeFactory.java index c3e7010..b7978e4 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/user/UserCollectionNavigatorTreeNodeFactory.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/user/UserCollectionNavigatorTreeNodeFactory.java @@ -21,6 +21,7 @@ package com.rreganjr.requel.ui.user; import java.util.Enumeration; +import java.util.Set; import nextapp.echo2.app.Label; import nextapp.echo2.app.event.ActionEvent; @@ -30,7 +31,6 @@ import echopointng.tree.MutableTreeNode; import com.rreganjr.requel.user.User; -import com.rreganjr.requel.user.UserSet; import net.sf.echopm.navigation.WorkflowDisposition; import net.sf.echopm.navigation.event.EventDispatcher; import net.sf.echopm.navigation.event.NavigationEvent; @@ -57,19 +57,17 @@ public class UserCollectionNavigatorTreeNodeFactory extends AbstractNavigatorTre public final static String PROP_USERS_NODE_LABEL = "UsersNodeLabel"; /** - * @param eventDispatcher */ public UserCollectionNavigatorTreeNodeFactory() { - super(UserCollectionNavigatorTreeNodeFactory.class.getName(), UserSet.class); + super(UserCollectionNavigatorTreeNodeFactory.class.getName(), Set.class); } /** - * @see net.sf.echopm.navigation.tree.NavigatorTreeNodeFactory#createTreeNode(net.sf.echopm.navigation.tree.NavigatorTree, - * java.lang.Object) + * @see net.sf.echopm.navigation.tree.NavigatorTreeNodeFactory#createTreeNode(EventDispatcher, NavigatorTree, Object) */ public MutableTreeNode createTreeNode(EventDispatcher eventDispatcher, NavigatorTree tree, Object object) { - UserSet users = (UserSet) object; + Set users = (Set) object; String usersNodeLabel = getResourceBundleHelper(tree.getLocale()).getString( PROP_USERS_NODE_LABEL, "Users"); @@ -78,7 +76,7 @@ public MutableTreeNode createTreeNode(EventDispatcher eventDispatcher, Navigator // NavigatorTreeNodeUpdateListener reset the event when // users are updated NavigationEvent openUserList = new OpenPanelEvent(tree, PanelActionType.Navigator, users, - UserSet.class, null, WorkflowDisposition.NewFlow); + Set.class, null, WorkflowDisposition.NewFlow); NavigatorTreeNode usersTreeNode = new NavigatorTreeNode(eventDispatcher, users, new Label( usersNodeLabel), openUserList); @@ -111,7 +109,7 @@ public void actionPerformed(ActionEvent event) { if ((uee.getObject() != null) && (uee.getObject() instanceof User)) { User user = (User) uee.getObject(); NavigatorTreeNode thisNode = getNavigatorTreeNode(); - UserSet users = (UserSet) thisNode.getTargetObject(); + Set users = (Set) thisNode.getTargetObject(); if (!users.contains(user)) { addUserNode(thisNode, user); } else { diff --git a/requel/src/main/java/com/rreganjr/requel/ui/user/UserEditorPanel.java b/requel/src/main/java/com/rreganjr/requel/ui/user/UserEditorPanel.java index 139c2b8..8a01223 100644 --- a/requel/src/main/java/com/rreganjr/requel/ui/user/UserEditorPanel.java +++ b/requel/src/main/java/com/rreganjr/requel/ui/user/UserEditorPanel.java @@ -40,7 +40,7 @@ import echopointng.ComboBox; import echopointng.text.StringDocumentEx; import com.rreganjr.command.CommandHandler; -import com.rreganjr.repository.EntityException; +import com.rreganjr.EntityException; import com.rreganjr.requel.user.AbstractUserRole; import com.rreganjr.requel.user.Organization; import com.rreganjr.requel.user.SystemAdminUserRole; diff --git a/requel/src/main/java/com/rreganjr/requel/user/PasswordException.java b/requel/src/main/java/com/rreganjr/requel/user/PasswordException.java index 6231e5e..329c362 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/PasswordException.java +++ b/requel/src/main/java/com/rreganjr/requel/user/PasswordException.java @@ -1,8 +1,8 @@ package com.rreganjr.requel.user; -import com.rreganjr.requel.RequelException; +import com.rreganjr.ApplicationException; -public class PasswordException extends RequelException { +public class PasswordException extends ApplicationException { public static final String MSG_PROBLEM_ENCRYPTING_PASSWORD = "There was a problem encrypting the user's password."; public static final String MSG_PROBLEM_ENCRYPTING_PASSWORD_WITH_MESSAGE = "There was a problem encrypting the user's password: %s"; diff --git a/requel/src/main/java/com/rreganjr/requel/user/User.java b/requel/src/main/java/com/rreganjr/requel/user/User.java index ceca5c0..7dc2756 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/User.java +++ b/requel/src/main/java/com/rreganjr/requel/user/User.java @@ -23,7 +23,7 @@ import java.util.Comparator; import java.util.Set; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityValidationException; import com.rreganjr.requel.OrganizedEntity; import com.rreganjr.requel.user.exception.NoSuchRoleForUserException; diff --git a/requel/src/main/java/com/rreganjr/requel/user/UserRepository.java b/requel/src/main/java/com/rreganjr/requel/user/UserRepository.java index 4bd2316..a597657 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/UserRepository.java +++ b/requel/src/main/java/com/rreganjr/requel/user/UserRepository.java @@ -66,13 +66,13 @@ public interface UserRepository extends Repository { /** * @return all the users of the system in the repository. */ - public UserSet findUsers(); + public Set findUsers(); /** * @param roleType * @return a set of users that have the supplied role type. */ - public UserSet findUsersForRole(Class roleType); + public Set findUsersForRole(Class roleType); /** * @return the available types of user roles diff --git a/requel/src/main/java/com/rreganjr/requel/user/UserSet.java b/requel/src/main/java/com/rreganjr/requel/user/UserSet.java deleted file mode 100644 index ed7e91a..0000000 --- a/requel/src/main/java/com/rreganjr/requel/user/UserSet.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * $Id$ - * Copyright 2008, 2009 Ron Regan Jr. All Rights Reserved. - * This file is part of Requel - the Collaborative Requirements - * Elicitation System. - * - * Requel is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Requel is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Requel. If not, see . - * - */ -package com.rreganjr.requel.user; - -import java.util.Set; - -/** - * A set of users that recognizes a user even if the username changes. - * - * @author ron - */ -public interface UserSet extends Set { - -} \ No newline at end of file diff --git a/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchOrganizationException.java b/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchOrganizationException.java index 72af63a..9eac320 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchOrganizationException.java +++ b/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchOrganizationException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.user.exception; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.user.Organization; /** diff --git a/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchRoleForUserException.java b/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchRoleForUserException.java index 5d44219..a2f779c 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchRoleForUserException.java +++ b/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchRoleForUserException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.user.exception; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.user.User; import com.rreganjr.requel.user.UserRole; diff --git a/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchUserException.java b/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchUserException.java index 043c051..0f8728c 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchUserException.java +++ b/requel/src/main/java/com/rreganjr/requel/user/exception/NoSuchUserException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.user.exception; -import com.rreganjr.repository.EntityExceptionActionType; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.EntityExceptionActionType; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.user.User; /** diff --git a/requel/src/main/java/com/rreganjr/requel/user/exception/UserEntityException.java b/requel/src/main/java/com/rreganjr/requel/user/exception/UserEntityException.java index de1fd64..c3e1565 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/exception/UserEntityException.java +++ b/requel/src/main/java/com/rreganjr/requel/user/exception/UserEntityException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.user.exception; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.requel.user.User; import com.rreganjr.requel.user.UserRole; diff --git a/requel/src/main/java/com/rreganjr/requel/user/exception/UserRoleExistsException.java b/requel/src/main/java/com/rreganjr/requel/user/exception/UserRoleExistsException.java index fc3cdec..34b313e 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/exception/UserRoleExistsException.java +++ b/requel/src/main/java/com/rreganjr/requel/user/exception/UserRoleExistsException.java @@ -20,8 +20,8 @@ */ package com.rreganjr.requel.user.exception; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.requel.user.User; import com.rreganjr.requel.user.UserRole; diff --git a/requel/src/main/java/com/rreganjr/requel/user/exception/UsernameInUseException.java b/requel/src/main/java/com/rreganjr/requel/user/exception/UsernameInUseException.java index a21be43..9c6f5a7 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/exception/UsernameInUseException.java +++ b/requel/src/main/java/com/rreganjr/requel/user/exception/UsernameInUseException.java @@ -20,7 +20,7 @@ */ package com.rreganjr.requel.user.exception; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.requel.user.User; /** diff --git a/requel/src/main/java/com/rreganjr/requel/user/impl/UserSetImpl.java b/requel/src/main/java/com/rreganjr/requel/user/impl/UserSetImpl.java deleted file mode 100644 index 27727b4..0000000 --- a/requel/src/main/java/com/rreganjr/requel/user/impl/UserSetImpl.java +++ /dev/null @@ -1,200 +0,0 @@ -/* - * $Id$ - * Copyright 2008, 2009 Ron Regan Jr. All Rights Reserved. - * This file is part of Requel - the Collaborative Requirements - * Elicitation System. - * - * Requel is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Requel is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Requel. If not, see . - * - */ -package com.rreganjr.requel.user.impl; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import com.rreganjr.requel.user.User; -import com.rreganjr.requel.user.UserSet; - -/** - * A set of users that recognizes a user even if the username changes. TODO: - * this may not be needed because of considering the id in equals, compareTo and - * hashCode methods. - * - * @author ron - */ -public class UserSetImpl implements UserSet { - - Set usersByName = new TreeSet(User.UserComparator); - Map usersById = new HashMap(); - - /** - * create a new empty UserSet - */ - public UserSetImpl() { - } - - /** - * Create a new UserSet with the given collection of users. - * - * @param users - */ - public UserSetImpl(Collection users) { - for (Object o : users) { - UserImpl user = (UserImpl) o; - User originalUser = usersById.get(user.getId()); - if ((originalUser == null) && usersByName.contains(user)) { - throw new IllegalArgumentException("user " + user - + " conflicts with an existing user " + originalUser); - } - usersById.put(user.getId(), user); - usersByName.add(user); - } - } - - /** - * @see java.util.Collection#add(java.lang.Object) - * @return true if the user was not in the collection or the user is not - * equal to the copy that was in the collection. - */ - public boolean add(User u) { - UserImpl user = (UserImpl) u; - User originalUser = usersById.get(user.getId()); - if ((originalUser == null) && usersByName.contains(user)) { - throw new IllegalArgumentException("user " + user + " conflicts with an existing user " - + originalUser); - } - usersById.put(user.getId(), user); - usersByName.add(user); - return !user.equals(originalUser); - } - - /** - * @see java.util.Collection#addAll(java.util.Collection) - */ - public boolean addAll(Collection c) { - boolean rval = false; - for (User u : c) { - rval = (rval || add(u)); - } - return rval; - } - - /** - * @see java.util.Collection#clear() - */ - public void clear() { - usersByName.clear(); - usersById.clear(); - } - - /** - * @see java.util.Collection#contains(java.lang.Object) - */ - public boolean contains(Object o) { - if (o instanceof User) { - UserImpl user = (UserImpl) o; - return usersById.containsKey(user.getId()); - } - return false; - } - - /** - * @see java.util.Collection#containsAll(java.util.Collection) - */ - public boolean containsAll(Collection c) { - for (Object o : c) { - if (!contains(o)) { - return false; - } - } - return true; - } - - /** - * @see java.util.Collection#isEmpty() - */ - public boolean isEmpty() { - return usersById.isEmpty(); - } - - /** - * @see java.util.Collection#iterator() - */ - public Iterator iterator() { - return usersByName.iterator(); - } - - /** - * @see java.util.Collection#remove(java.lang.Object) - */ - public boolean remove(Object o) { - if (o instanceof User) { - UserImpl u = (UserImpl) o; - User originalUser = usersById.remove(u.getId()); - if (originalUser != null) { - usersByName.remove(originalUser); - } - return (originalUser != null); - } - return false; - } - - /** - * @see java.util.Collection#removeAll(java.util.Collection) - */ - public boolean removeAll(Collection c) { - boolean rval = false; - for (Object o : c) { - rval = (rval || remove(o)); - } - return rval; - } - - /** - * @see java.util.Collection#retainAll(java.util.Collection) - */ - public boolean retainAll(Collection c) { - boolean rval = usersByName.retainAll(c); - usersById.clear(); - for (User u : usersByName) { - usersById.put(((UserImpl) u).getId(), u); - } - return rval; - } - - /** - * @see java.util.Collection#size() - */ - public int size() { - return usersById.size(); - } - - /** - * @see java.util.Collection#toArray() - */ - public Object[] toArray() { - return usersByName.toArray(); - } - - /** - * @see java.util.Collection#toArray(T[]) - */ - public T[] toArray(T[] a) { - return usersByName.toArray(a); - } -} diff --git a/requel/src/main/java/com/rreganjr/requel/user/impl/command/EditUserCommandImpl.java b/requel/src/main/java/com/rreganjr/requel/user/impl/command/EditUserCommandImpl.java index 887a617..a4a51b7 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/impl/command/EditUserCommandImpl.java +++ b/requel/src/main/java/com/rreganjr/requel/user/impl/command/EditUserCommandImpl.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.requel.EntityValidationException; +import com.rreganjr.EntityValidationException; import com.rreganjr.requel.user.AbstractUserRole; import com.rreganjr.requel.user.Organization; import com.rreganjr.requel.user.SystemAdminUserRole; diff --git a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/AdminUserInitializer.java b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/AdminUserInitializer.java index 141eff6..d638bea 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/AdminUserInitializer.java +++ b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/AdminUserInitializer.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import com.rreganjr.command.CommandHandler; import com.rreganjr.requel.user.SystemAdminUserRole; import com.rreganjr.requel.user.UserRepository; diff --git a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/AssistantUserInitializer.java b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/AssistantUserInitializer.java index 099761a..d59c34d 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/AssistantUserInitializer.java +++ b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/AssistantUserInitializer.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import com.rreganjr.command.CommandHandler; import com.rreganjr.requel.project.ProjectUserRole; import com.rreganjr.requel.user.SystemAdminUserRole; diff --git a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/DomainUserInitializer.java b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/DomainUserInitializer.java index 2eef53d..0af28ce 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/DomainUserInitializer.java +++ b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/DomainUserInitializer.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import com.rreganjr.command.CommandHandler; import com.rreganjr.requel.project.DomainAdminUserRole; import com.rreganjr.requel.user.UserRepository; diff --git a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/ProjectUserInitializer.java b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/ProjectUserInitializer.java index dee603c..d052c4d 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/ProjectUserInitializer.java +++ b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/ProjectUserInitializer.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import com.rreganjr.AbstractSystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; import com.rreganjr.command.CommandHandler; import com.rreganjr.requel.project.ProjectUserRole; import com.rreganjr.requel.user.UserRepository; diff --git a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/UserRolePermissionsInitializer.java b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/UserRolePermissionsInitializer.java index c88f775..89c1dd0 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/UserRolePermissionsInitializer.java +++ b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/init/UserRolePermissionsInitializer.java @@ -29,8 +29,8 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.rreganjr.AbstractSystemInitializer; -import com.rreganjr.repository.EntityException; +import com.rreganjr.initializer.AbstractSystemInitializer; +import com.rreganjr.EntityException; import com.rreganjr.requel.user.AbstractUserRole; import com.rreganjr.requel.user.UserRepository; import com.rreganjr.requel.user.UserRole; diff --git a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/jpa/JpaUserRepository.java b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/jpa/JpaUserRepository.java index 90fb3bc..503beeb 100644 --- a/requel/src/main/java/com/rreganjr/requel/user/impl/repository/jpa/JpaUserRepository.java +++ b/requel/src/main/java/com/rreganjr/requel/user/impl/repository/jpa/JpaUserRepository.java @@ -22,10 +22,12 @@ import java.util.HashSet; import java.util.Set; +import java.util.TreeSet; import javax.persistence.NoResultException; import javax.persistence.OptimisticLockException; import javax.persistence.Query; +import javax.persistence.TypedQuery; import org.hibernate.PropertyValueException; import org.hibernate.StaleObjectStateException; @@ -40,8 +42,8 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.rreganjr.repository.EntityException; -import com.rreganjr.repository.EntityExceptionActionType; +import com.rreganjr.EntityException; +import com.rreganjr.EntityExceptionActionType; import com.rreganjr.repository.jpa.AbstractJpaRepository; import com.rreganjr.repository.jpa.ConstraintViolationExceptionAdapter; import com.rreganjr.repository.ExceptionMapper; @@ -49,17 +51,15 @@ import com.rreganjr.repository.jpa.InvalidStateExceptionAdapter; import com.rreganjr.repository.jpa.OptimisticLockExceptionAdapter; import com.rreganjr.repository.jpa.UserPropertyValueExceptionAdapter; -import com.rreganjr.requel.NoSuchEntityException; +import com.rreganjr.NoSuchEntityException; import com.rreganjr.requel.user.AbstractUserRole; import com.rreganjr.requel.user.Organization; import com.rreganjr.requel.user.User; import com.rreganjr.requel.user.UserRepository; import com.rreganjr.requel.user.UserRole; import com.rreganjr.requel.user.UserRolePermission; -import com.rreganjr.requel.user.UserSet; import com.rreganjr.requel.user.exception.NoSuchOrganizationException; import com.rreganjr.requel.user.exception.NoSuchUserException; -import com.rreganjr.requel.user.impl.UserSetImpl; /** * @author ron @@ -120,31 +120,30 @@ public User findUserByUsername(String username) throws NoSuchUserException { } } - public UserSet findUsers() { + public Set findUsers() { try { // TODO: use named query so it can be configured externally - Query query = getEntityManager().createQuery( - "select object(user) from UserImpl as user"); - return new UserSetImpl(query.getResultList()); + TypedQuery query = getEntityManager().createQuery( + "select object(user) from UserImpl as user", User.class); + return new TreeSet(query.getResultList()); } catch (NoResultException e) { - return (UserSet) new HashSet(); + return new HashSet(); } catch (Exception e) { - throw convertException(e, UserSet.class, null, EntityExceptionActionType.Reading); + throw convertException(e, Set.class, null, EntityExceptionActionType.Reading); } } - public UserSet findUsersForRole(Class roleType) { + public Set findUsersForRole(Class roleType) { try { // TODO: use named query so it can be configured externally - Query query = getEntityManager() - .createQuery( - "select object(user) from UserImpl as user inner join user.userRoles as roles, AbstractUserRole role where role.roleType like :roleType and role in roles"); + TypedQuery query = getEntityManager().createQuery( + "select object(user) from UserImpl as user inner join user.userRoles as roles, AbstractUserRole role where role.roleType like :roleType and role in roles", User.class); query.setParameter("roleType", roleType.getName()); - return new UserSetImpl(query.getResultList()); + return new TreeSet<>(query.getResultList()); } catch (NoResultException e) { - return (UserSet) new HashSet(); + return new HashSet(); } catch (Exception e) { - throw convertException(e, UserSet.class, null, EntityExceptionActionType.Reading); + throw convertException(e, Set.class, null, EntityExceptionActionType.Reading); } } diff --git a/requel/src/test/java/com/rreganjr/AbstractIntegrationTestCase.java b/requel/src/test/java/com/rreganjr/AbstractIntegrationTestCase.java index 2b806bf..2dbd91e 100644 --- a/requel/src/test/java/com/rreganjr/AbstractIntegrationTestCase.java +++ b/requel/src/test/java/com/rreganjr/AbstractIntegrationTestCase.java @@ -32,8 +32,6 @@ import com.rreganjr.nlp.NLPProcessorFactory; import com.rreganjr.nlp.dictionary.DictionaryRepository; import com.rreganjr.nlp.dictionary.command.DictionaryCommandFactory; -import com.rreganjr.repository.DatabaseInitializer; -import com.rreganjr.repository.EntityException; import com.rreganjr.requel.annotation.AnnotationRepository; import com.rreganjr.requel.annotation.command.AnnotationCommandFactory; import com.rreganjr.requel.project.DomainAdminUserRole; diff --git a/requel/src/test/java/com/rreganjr/nlp/SemanticRoleLabelerTests.java b/requel/src/test/java/com/rreganjr/nlp/SemanticRoleLabelerTests.java index 2075a60..58f1f70 100644 --- a/requel/src/test/java/com/rreganjr/nlp/SemanticRoleLabelerTests.java +++ b/requel/src/test/java/com/rreganjr/nlp/SemanticRoleLabelerTests.java @@ -10,12 +10,8 @@ import com.rreganjr.AbstractIntegrationTestCase; import com.rreganjr.nlp.dictionary.Sense; import com.rreganjr.nlp.dictionary.VerbNetFrameRef; -import com.rreganjr.nlp.impl.ConstituentTreePrinter; -import com.rreganjr.nlp.impl.DependencyPrinter; -import com.rreganjr.nlp.impl.StringNLPTextWalker; import com.rreganjr.nlp.impl.srl.SemanticRoleCollector; import com.rreganjr.nlp.impl.srl.SemanticRoleCollectorFunction; -import com.rreganjr.nlp.impl.srl.SemanticRolePrinter; import org.junit.Assert; /** diff --git a/requel/src/test/java/com/rreganjr/nlp/VerbNetImporterTests.java b/requel/src/test/java/com/rreganjr/nlp/VerbNetImporterTests.java index 13a89b9..25f52ed 100644 --- a/requel/src/test/java/com/rreganjr/nlp/VerbNetImporterTests.java +++ b/requel/src/test/java/com/rreganjr/nlp/VerbNetImporterTests.java @@ -8,8 +8,6 @@ import java.io.File; import java.io.FileFilter; -import javax.xml.bind.JAXBElement; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/requel/src/test/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdviceTest.java b/requel/src/test/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdviceTest.java index 02cd9c7..031121f 100644 --- a/requel/src/test/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdviceTest.java +++ b/requel/src/test/java/com/rreganjr/repository/jpa/DomainObjectWrappingAdviceTest.java @@ -29,8 +29,8 @@ import org.springframework.aop.support.AopUtils; import com.rreganjr.AbstractIntegrationTestCase; -import com.rreganjr.AbstractSystemInitializer; -import com.rreganjr.SystemInitializer; +import com.rreganjr.initializer.AbstractSystemInitializer; +import com.rreganjr.initializer.SystemInitializer; import com.rreganjr.command.Command; import com.rreganjr.nlp.dictionary.impl.command.EditDictionaryWordCommandImpl; import com.rreganjr.nlp.dictionary.impl.command.ImportDictionaryCommandImpl; diff --git a/requel/src/test/java/com/rreganjr/requel/user/impl/UserCollectionImplTest.java b/requel/src/test/java/com/rreganjr/requel/user/impl/UserCollectionImplTest.java deleted file mode 100644 index 0c724f3..0000000 --- a/requel/src/test/java/com/rreganjr/requel/user/impl/UserCollectionImplTest.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.rreganjr.requel.user.impl; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - -import com.rreganjr.TestCase; -import com.rreganjr.requel.user.User; -import com.rreganjr.requel.user.UserSet; - -/** - * @author ron - */ -public class UserCollectionImplTest extends TestCase { - - /** - * - */ - public void testConstruction() { - Collection init = new ArrayList(5); - - init.add(new TestUserImpl(1L, "aaaaa")); - init.add(new TestUserImpl(2L, "bbbbb")); - init.add(new TestUserImpl(3L, "ccccc")); - init.add(new TestUserImpl(4L, "ddddd")); - init.add(new TestUserImpl(5L, "eeeee")); - UserSet users = new UserSetImpl(init); - assertEquals(init, users); - assertTrue(users.contains(new TestUserImpl(1L, "aaaaa"))); - assertTrue(users.contains(new TestUserImpl(2L, "bbbbb"))); - assertTrue(users.contains(new TestUserImpl(3L, "ccccc"))); - assertTrue(users.contains(new TestUserImpl(4L, "ddddd"))); - assertTrue(users.contains(new TestUserImpl(5L, "eeeee"))); - } - - /** - * - */ - public void testInvalidConstruction() { - try { - Collection init = new ArrayList(5); - - init.add(new TestUserImpl(1L, "aaaaa")); - init.add(new TestUserImpl(2L, "bbbbb")); - init.add(new TestUserImpl(3L, "ccccc")); - init.add(new TestUserImpl(4L, "ddddd")); - init.add(new TestUserImpl(5L, "eeeee")); - init.add(new TestUserImpl(6L, "aaaaa")); - UserSet users = new UserSetImpl(init); - fail("expected an exception because a user with the same user name but different id was detected."); - } catch (Exception e) { - - } - } - - /** - * - */ - public void testEditedUsers() { - Collection init = new ArrayList(5); - - init.add(new TestUserImpl(1L, "aaaaa")); - init.add(new TestUserImpl(2L, "bbbbb")); - init.add(new TestUserImpl(3L, "ccccc")); - init.add(new TestUserImpl(4L, "ddddd")); - init.add(new TestUserImpl(5L, "eeeee")); - UserSet users = new UserSetImpl(init); - assertEquals(init, users); - - // simulate detecting user with changed username - assertTrue(users.contains(new TestUserImpl(1L, "xxxxx"))); - - // this should replace the old entry with username "aaaaa" - users.add(new TestUserImpl(1L, "xxxxx")); - assertFalse(users.contains(new TestUserImpl(99L, "aaaaa"))); - } - - /** - * the iterator should return users in order by username. - */ - public void testIterator() { - Collection init = new ArrayList(5); - - init.add(new TestUserImpl(4L, "ddddd")); - init.add(new TestUserImpl(2L, "bbbbb")); - init.add(new TestUserImpl(5L, "eeeee")); - init.add(new TestUserImpl(3L, "ccccc")); - init.add(new TestUserImpl(1L, "aaaaa")); - UserSet users = new UserSetImpl(init); - Iterator iter = users.iterator(); - assertEquals(new TestUserImpl(1L, "aaaaa"), iter.next()); - assertEquals(new TestUserImpl(2L, "bbbbb"), iter.next()); - assertEquals(new TestUserImpl(3L, "ccccc"), iter.next()); - assertEquals(new TestUserImpl(4L, "ddddd"), iter.next()); - assertEquals(new TestUserImpl(5L, "eeeee"), iter.next()); - } - - private static class TestUserImpl extends UserImpl { - protected TestUserImpl(Long id, String username) { - super(); - setUsername(username); - setId(id); - } - - @Override - public String toString() { - return "User[" + getId() + "]: " + getUsername(); - } - } -}