diff --git a/gemp-lotr/lotro-cards/pom.xml b/gemp-lotr/gemp-lotr-cards/pom.xml similarity index 84% rename from gemp-lotr/lotro-cards/pom.xml rename to gemp-lotr/gemp-lotr-cards/pom.xml index ae2920702..14cb55671 100644 --- a/gemp-lotr/lotro-cards/pom.xml +++ b/gemp-lotr/gemp-lotr-cards/pom.xml @@ -8,18 +8,18 @@ 4.0.0 com.gempukku.lotro - lotro-cards + gemp-lotr-cards 1.0-SNAPSHOT ${project.groupId} - lotro-common + gemp-lotr-common ${project.version} ${project.groupId} - lotro-logic + gemp-lotr-logic ${project.version} diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractSite.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractSite.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/AbstractSite.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractSite.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/LotroCardBlueprintLibrary.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/LotroCardBlueprintLibrary.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/LotroCardBlueprintLibrary.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/LotroCardBlueprintLibrary.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentFromHandAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentFromHandAction.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentFromHandAction.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentFromHandAction.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventFromHandAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventFromHandAction.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventFromHandAction.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventFromHandAction.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromDeckAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromDeckAction.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromDeckAction.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromDeckAction.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromHandAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromHandAction.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromHandAction.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromHandAction.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/TransferPermanentAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/TransferPermanentAction.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/actions/TransferPermanentAction.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/TransferPermanentAction.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/decisions/ForEachYouSpotDecision.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/decisions/ForEachYouSpotDecision.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/decisions/ForEachYouSpotDecision.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/decisions/ForEachYouSpotDecision.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddBurdenEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddBurdenEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddBurdenEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddBurdenEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddTwilightEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddTwilightEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddTwilightEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddTwilightEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfPhaseActionProxyEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfPhaseActionProxyEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfPhaseActionProxyEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfPhaseActionProxyEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfPhaseModifierEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfPhaseModifierEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfPhaseModifierEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfPhaseModifierEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfTurnModifierEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfTurnModifierEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfTurnModifierEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilEndOfTurnModifierEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilStartOfPhaseActionProxyEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilStartOfPhaseActionProxyEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilStartOfPhaseActionProxyEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilStartOfPhaseActionProxyEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilStartOfPhaseModifierEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilStartOfPhaseModifierEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilStartOfPhaseModifierEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddUntilStartOfPhaseModifierEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AttachCardFromHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AttachCardFromHandEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/AttachCardFromHandEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AttachCardFromHandEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/CancelEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/CancelEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/CancelEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/CancelEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/CardAffectingGameEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/CardAffectingGameEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/CardAffectingGameEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/CardAffectingGameEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/ChoiceEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChoiceEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/ChoiceEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChoiceEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/ChooseAndDiscardCardFromHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChooseAndDiscardCardFromHandEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/ChooseAndDiscardCardFromHandEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChooseAndDiscardCardFromHandEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/DiscardCardAtRandomFromHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/DiscardCardAtRandomFromHandEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/DiscardCardAtRandomFromHandEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/DiscardCardAtRandomFromHandEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/DiscardTopCardFromDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/DiscardTopCardFromDeckEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/DiscardTopCardFromDeckEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/DiscardTopCardFromDeckEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharacterEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharacterEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharacterEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharacterEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/HealCardEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/HealCardEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/HealCardEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/HealCardEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PayPlayOnTwilightCostEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PayPlayOnTwilightCostEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PayPlayOnTwilightCostEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PayPlayOnTwilightCostEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PayTwilightCostEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PayTwilightCostEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PayTwilightCostEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PayTwilightCostEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromDiscardOnBottomOfDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromDiscardOnBottomOfDeckEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromDiscardOnBottomOfDeckEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromDiscardOnBottomOfDeckEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromHandOnBottomOfDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromHandOnBottomOfDeckEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromHandOnBottomOfDeckEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromHandOnBottomOfDeckEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardIntoDiscardEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardIntoDiscardEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardIntoDiscardEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardIntoDiscardEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardIntoPlayEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardIntoPlayEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardIntoPlayEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardIntoPlayEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurderEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurderEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurderEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurderEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromDeckEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromDeckEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromDeckEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromHandEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromHandEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromHandEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveTwilightEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveTwilightEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveTwilightEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveTwilightEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/ShuffleDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ShuffleDeckEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/ShuffleDeckEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ShuffleDeckEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/SpotEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/SpotEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/SpotEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/SpotEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/TransferPermanentEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/TransferPermanentEffect.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/effects/TransferPermanentEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/TransferPermanentEffect.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/AllyOnCurrentSiteModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/AllyOnCurrentSiteModifier.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/AllyOnCurrentSiteModifier.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/AllyOnCurrentSiteModifier.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/ArcheryTotalModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/ArcheryTotalModifier.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/ArcheryTotalModifier.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/ArcheryTotalModifier.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeWoundsModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeWoundsModifier.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeWoundsModifier.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeWoundsModifier.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/DoesNotAddToArcheryTotalModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/DoesNotAddToArcheryTotalModifier.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/DoesNotAddToArcheryTotalModifier.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/DoesNotAddToArcheryTotalModifier.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/MoveLimitModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/MoveLimitModifier.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/MoveLimitModifier.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/MoveLimitModifier.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/OverwhelmedByMultiplierModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/OverwhelmedByMultiplierModifier.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/OverwhelmedByMultiplierModifier.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/OverwhelmedByMultiplierModifier.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/StrengthModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/StrengthModifier.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/StrengthModifier.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/StrengthModifier.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/VitalityModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/VitalityModifier.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/VitalityModifier.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/VitalityModifier.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_003.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_003.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_003.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_006.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_006.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_006.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_006.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_007.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_007.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_007.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_007.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_011.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_011.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_011.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_011.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_012.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_012.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_012.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_012.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_013.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_013.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_013.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_013.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_017.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_017.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_017.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_017.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_018.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_018.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_018.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_019.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_019.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_019.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_019.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_022.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_022.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_022.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_022.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_023.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_023.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_023.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_028.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_028.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_028.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_028.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_034.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_034.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_034.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_034.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_035.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_035.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_035.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_035.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_036.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_036.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_036.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_036.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_037.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_037.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_037.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_037.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_042.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_042.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_042.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_042.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_044.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_044.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_044.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_048.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_048.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_048.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_048.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_051.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_051.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_051.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_051.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_053.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_053.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_053.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_053.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_056.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_056.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_056.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_056.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_058.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_058.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_058.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_058.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_148.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_148.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_148.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_148.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_149.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_149.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_149.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_149.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_319.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_319.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_319.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_319.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_326.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_326.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_326.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_326.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_337.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_337.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_337.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_337.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_346.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_346.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_346.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_346.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_349.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_349.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_349.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_349.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_354.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_354.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_354.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_354.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_356.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_356.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_356.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_356.java diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_362.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_362.java similarity index 100% rename from gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_362.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_362.java diff --git a/gemp-lotr/lotro-common/pom.xml b/gemp-lotr/gemp-lotr-common/pom.xml similarity index 92% rename from gemp-lotr/lotro-common/pom.xml rename to gemp-lotr/gemp-lotr-common/pom.xml index e32411249..3e5b414ea 100644 --- a/gemp-lotr/lotro-common/pom.xml +++ b/gemp-lotr/gemp-lotr-common/pom.xml @@ -8,6 +8,6 @@ 4.0.0 com.gempukku.lotro - lotro-common + gemp-lotr-common 1.0-SNAPSHOT \ No newline at end of file diff --git a/gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/CardType.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/CardType.java similarity index 100% rename from gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/CardType.java rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/CardType.java diff --git a/gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Culture.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Culture.java similarity index 100% rename from gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Culture.java rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Culture.java diff --git a/gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Duration.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Duration.java similarity index 100% rename from gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Duration.java rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Duration.java diff --git a/gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Keyword.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java similarity index 100% rename from gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Keyword.java rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java diff --git a/gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Phase.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java similarity index 100% rename from gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Phase.java rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java diff --git a/gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Side.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Side.java similarity index 100% rename from gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Side.java rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Side.java diff --git a/gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Signet.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Signet.java similarity index 100% rename from gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Signet.java rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Signet.java diff --git a/gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Token.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Token.java similarity index 100% rename from gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Token.java rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Token.java diff --git a/gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Zone.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Zone.java similarity index 100% rename from gemp-lotr/lotro-common/src/main/java/com/gempukku/lotro/common/Zone.java rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Zone.java diff --git a/gemp-lotr/lotro-logic/pom.xml b/gemp-lotr/gemp-lotr-logic/pom.xml similarity index 87% rename from gemp-lotr/lotro-logic/pom.xml rename to gemp-lotr/gemp-lotr-logic/pom.xml index 7f57f15d1..d5e788c30 100644 --- a/gemp-lotr/lotro-logic/pom.xml +++ b/gemp-lotr/gemp-lotr-logic/pom.xml @@ -8,13 +8,13 @@ 4.0.0 com.gempukku.lotro - lotro-logic + gemp-lotr-logic 1.0-SNAPSHOT ${project.groupId} - lotro-common + gemp-lotr-common ${project.version} diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/GameStateListener.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/GameStateListener.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/GameStateListener.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/GameStateListener.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/PlayerCommunication.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/PlayerCommunication.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/PlayerCommunication.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/PlayerCommunication.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/PlayerPrivateChannel.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/PlayerPrivateChannel.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/PlayerPrivateChannel.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/PlayerPrivateChannel.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/PlayerPublicChannel.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/PlayerPublicChannel.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/PlayerPublicChannel.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/PlayerPublicChannel.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/UserFeedback.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/UserFeedback.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/communication/UserFeedback.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/UserFeedback.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/filters/Filter.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filter.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/filters/Filter.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filter.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/filters/Filters.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/AbstractActionProxy.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/AbstractActionProxy.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/AbstractActionProxy.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/AbstractActionProxy.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/ActionProxy.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/ActionProxy.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/ActionProxy.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/ActionProxy.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/ActionsEnvironment.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/ActionsEnvironment.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/ActionsEnvironment.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/ActionsEnvironment.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/CompletePhysicalCardVisitor.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CompletePhysicalCardVisitor.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/CompletePhysicalCardVisitor.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CompletePhysicalCardVisitor.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/PhysicalCard.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCard.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/PhysicalCard.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCard.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardImpl.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardImpl.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardImpl.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardImpl.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardVisitor.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardVisitor.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardVisitor.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardVisitor.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/state/LotroGame.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/LotroGame.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/state/LotroGame.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/LotroGame.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/state/Skirmish.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/Skirmish.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/state/Skirmish.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/Skirmish.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/state/actions/DefaultActionsEnvironment.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/actions/DefaultActionsEnvironment.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/game/state/actions/DefaultActionsEnvironment.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/actions/DefaultActionsEnvironment.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/PlayOrder.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/PlayOrder.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/PlayOrder.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/PlayOrder.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/PlayerOrder.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/PlayerOrder.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/PlayerOrder.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/PlayerOrder.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/actions/CostToEffectAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/CostToEffectAction.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/actions/CostToEffectAction.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/CostToEffectAction.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/actions/KillAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/KillAction.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/actions/KillAction.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/KillAction.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/actions/WoundAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/WoundAction.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/actions/WoundAction.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/WoundAction.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/AbstractAwaitingDecision.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/AbstractAwaitingDecision.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/AbstractAwaitingDecision.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/AbstractAwaitingDecision.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/ActionsSelectionDecision.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/ActionsSelectionDecision.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/ActionsSelectionDecision.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/ActionsSelectionDecision.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/ArbitraryCardsSelectionDecision.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/ArbitraryCardsSelectionDecision.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/ArbitraryCardsSelectionDecision.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/ArbitraryCardsSelectionDecision.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/AwaitingDecision.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/AwaitingDecision.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/AwaitingDecision.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/AwaitingDecision.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/AwaitingDecisionType.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/AwaitingDecisionType.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/AwaitingDecisionType.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/AwaitingDecisionType.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/CardsSelectionDecision.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/CardsSelectionDecision.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/CardsSelectionDecision.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/CardsSelectionDecision.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/DecisionResultInvalidException.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/DecisionResultInvalidException.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/DecisionResultInvalidException.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/DecisionResultInvalidException.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/IntegerAwaitingDecision.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/IntegerAwaitingDecision.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/IntegerAwaitingDecision.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/IntegerAwaitingDecision.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/MultipleChoiceAwaitingDecision.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/MultipleChoiceAwaitingDecision.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/MultipleChoiceAwaitingDecision.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/MultipleChoiceAwaitingDecision.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/PlayerAssignMinionsDecision.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/PlayerAssignMinionsDecision.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/decisions/PlayerAssignMinionsDecision.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/PlayerAssignMinionsDecision.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardsEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardsEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardsEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardsEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAnyCardEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAnyCardEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAnyCardEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAnyCardEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardFromHandEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardFromHandEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardFromHandEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardFromHandEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardFromPlayEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardFromPlayEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardFromPlayEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardFromPlayEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/DrawCardEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DrawCardEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/DrawCardEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DrawCardEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/OverwhelmedEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/OverwhelmedEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/OverwhelmedEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/OverwhelmedEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/PlayoutDecisionEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/PlayoutDecisionEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/PlayoutDecisionEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/PlayoutDecisionEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/SkirmishResolvedEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/SkirmishResolvedEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/SkirmishResolvedEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/SkirmishResolvedEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/TriggeringEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/TriggeringEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/TriggeringEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/TriggeringEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/WoundEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/WoundEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/effects/WoundEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/WoundEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/CompositeModifier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/CompositeModifier.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/CompositeModifier.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/CompositeModifier.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/KeywordModifier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/KeywordModifier.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/KeywordModifier.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/KeywordModifier.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifierHook.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifierHook.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifierHook.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifierHook.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersEnvironment.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersEnvironment.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersEnvironment.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersEnvironment.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersQuerying.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersQuerying.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersQuerying.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersQuerying.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/TwilightCostModifier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/TwilightCostModifier.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/modifiers/TwilightCostModifier.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/TwilightCostModifier.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractAction.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractAction.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractAction.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/Action.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Action.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/Action.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Action.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/ActionStack.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/ActionStack.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/ActionStack.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/ActionStack.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/Cost.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Cost.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/Cost.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Cost.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/PlayerOrderFeedback.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/PlayerOrderFeedback.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/PlayerOrderFeedback.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/PlayerOrderFeedback.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleSet.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleSet.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleSet.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleSet.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/TurnProcedure.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TurnProcedure.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/TurnProcedure.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TurnProcedure.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/UnrespondableEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/UnrespondableEffect.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/UnrespondableEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/UnrespondableEffect.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/PlayerReconcilesAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/PlayerReconcilesAction.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/PlayerReconcilesAction.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/PlayerReconcilesAction.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/ResolveSkirmishAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/ResolveSkirmishAction.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/ResolveSkirmishAction.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/ResolveSkirmishAction.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SimpleEffectAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SimpleEffectAction.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SimpleEffectAction.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SimpleEffectAction.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SystemAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SystemAction.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SystemAction.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SystemAction.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GatherPlayableActionsVisitor.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GatherPlayableActionsVisitor.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GatherPlayableActionsVisitor.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GatherPlayableActionsVisitor.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/BiddingGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/BiddingGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/BiddingGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/BiddingGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/ChooseSeatingOrderGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/ChooseSeatingOrderGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/ChooseSeatingOrderGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/ChooseSeatingOrderGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/FirstPlayerPlaysSiteGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/FirstPlayerPlaysSiteGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/FirstPlayerPlaysSiteGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/FirstPlayerPlaysSiteGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayRingBearerRingAndAddBurdersGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayRingBearerRingAndAddBurdersGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayRingBearerRingAndAddBurdersGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayRingBearerRingAndAddBurdersGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayStartingFellowshipGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayStartingFellowshipGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayStartingFellowshipGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayStartingFellowshipGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayersDrawEightCardsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayersDrawEightCardsGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayersDrawEightCardsGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayersDrawEightCardsGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ArcheryGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ArcheryGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ArcheryGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ArcheryGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/AssignmentGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/AssignmentGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/AssignmentGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/AssignmentGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/FellowshipGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/FellowshipGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/FellowshipGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/FellowshipGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ManeuverGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ManeuverGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ManeuverGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ManeuverGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/RegroupGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/RegroupGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/RegroupGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/RegroupGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ShadowPhaseOfPlayerGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ShadowPhaseOfPlayerGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ShadowPhaseOfPlayerGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ShadowPhaseOfPlayerGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ShadowPhasesGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ShadowPhasesGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ShadowPhasesGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ShadowPhasesGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/SkirmishGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/SkirmishGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/SkirmishGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/SkirmishGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ArcheryFireGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ArcheryFireGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ArcheryFireGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ArcheryFireGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerAssignsArcheryDamageGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerAssignsArcheryDamageGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerAssignsArcheryDamageGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerAssignsArcheryDamageGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerChoosesShadowPlayerToAssignDamageToGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerChoosesShadowPlayerToAssignDamageToGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerChoosesShadowPlayerToAssignDamageToGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerChoosesShadowPlayerToAssignDamageToGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ShadowPlayerAssignsArcheryDamageGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ShadowPlayerAssignsArcheryDamageGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ShadowPlayerAssignsArcheryDamageGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ShadowPlayerAssignsArcheryDamageGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayersAssignTheirMinionsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayersAssignTheirMinionsGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayersAssignTheirMinionsGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayersAssignTheirMinionsGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/CanSpotGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/CanSpotGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/CanSpotGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/CanSpotGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayerPlaysPhaseActionsUntilPassesGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayerPlaysPhaseActionsUntilPassesGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayerPlaysPhaseActionsUntilPassesGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayerPlaysPhaseActionsUntilPassesGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/SimpleTriggeringGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/SimpleTriggeringGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/SimpleTriggeringGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/SimpleTriggeringGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/MovePlayerTokenToNextSiteGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/MovePlayerTokenToNextSiteGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/MovePlayerTokenToNextSiteGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/MovePlayerTokenToNextSiteGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/MovementGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/MovementGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/MovementGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/MovementGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/DiscardAllMinionsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/DiscardAllMinionsGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/DiscardAllMinionsGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/DiscardAllMinionsGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/FellowshipPlayerChoosesToMoveOrStayGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/FellowshipPlayerChoosesToMoveOrStayGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/FellowshipPlayerChoosesToMoveOrStayGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/FellowshipPlayerChoosesToMoveOrStayGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/PlayerReconcilesGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/PlayerReconcilesGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/PlayerReconcilesGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/PlayerReconcilesGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/ShadowPlayersReconcileGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/ShadowPlayersReconcileGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/ShadowPlayersReconcileGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/regroup/ShadowPlayersReconcileGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/AfterSkirmishesGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/AfterSkirmishesGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/AfterSkirmishesGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/AfterSkirmishesGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/ResolveSkirmishGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/ResolveSkirmishGameProcess.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/ResolveSkirmishGameProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/ResolveSkirmishGameProcess.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/EndOfPhaseResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/EndOfPhaseResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/EndOfPhaseResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/EndOfPhaseResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/EndOfTurnResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/EndOfTurnResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/EndOfTurnResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/EndOfTurnResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/KillResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/KillResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/KillResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/KillResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/NormalSkirmishResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/NormalSkirmishResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/NormalSkirmishResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/NormalSkirmishResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/OverwhelmSkirmishResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/OverwhelmSkirmishResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/OverwhelmSkirmishResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/OverwhelmSkirmishResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/PlayCardResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/PlayCardResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/PlayCardResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/PlayCardResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/SkirmishResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/SkirmishResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/SkirmishResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/SkirmishResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/StartOfPhaseResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/StartOfPhaseResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/StartOfPhaseResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/StartOfPhaseResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/StartOfTurnResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/StartOfTurnResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/StartOfTurnResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/StartOfTurnResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMoveFromResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMoveFromResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMoveFromResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMoveFromResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMoveToResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMoveToResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMoveToResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMoveToResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMovesResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMovesResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMovesResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WhenMovesResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WoundResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WoundResult.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WoundResult.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WoundResult.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/EndEffectsAndActionsRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/EndEffectsAndActionsRule.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/EndEffectsAndActionsRule.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/EndEffectsAndActionsRule.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ResolveSkirmishRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ResolveSkirmishRule.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ResolveSkirmishRule.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ResolveSkirmishRule.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/RoamingRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/RoamingRule.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/RoamingRule.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/RoamingRule.java diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/vo/LotroDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/vo/LotroDeck.java similarity index 100% rename from gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/vo/LotroDeck.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/vo/LotroDeck.java diff --git a/gemp-lotr/lotro-server/pom.xml b/gemp-lotr/gemp-lotr-server/pom.xml similarity index 92% rename from gemp-lotr/lotro-server/pom.xml rename to gemp-lotr/gemp-lotr-server/pom.xml index 06e13e412..90b0b1b79 100644 --- a/gemp-lotr/lotro-server/pom.xml +++ b/gemp-lotr/gemp-lotr-server/pom.xml @@ -7,12 +7,12 @@ 1.0-SNAPSHOT 4.0.0 - lotro-server + gemp-lotr-server jar ${project.groupId} - lotro-cards + gemp-lotr-cards ${project.version} diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/DefaultUserFeedback.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/DefaultUserFeedback.java similarity index 100% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/DefaultUserFeedback.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/DefaultUserFeedback.java diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/GameEvent.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/GameEvent.java similarity index 100% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/GameEvent.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/GameEvent.java diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/GatheringParticipantCommunicationChannel.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/GatheringParticipantCommunicationChannel.java similarity index 97% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/GatheringParticipantCommunicationChannel.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/GatheringParticipantCommunicationChannel.java index 193eb55d0..d6449899e 100644 --- a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/GatheringParticipantCommunicationChannel.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/GatheringParticipantCommunicationChannel.java @@ -1,5 +1,6 @@ package com.gempukku.lotro; +import static com.gempukku.lotro.GameEvent.Type.*; import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Token; import com.gempukku.lotro.communication.GameStateListener; @@ -8,8 +9,6 @@ import com.gempukku.lotro.game.PhysicalCard; import java.util.LinkedList; import java.util.List; -import static com.gempukku.lotro.GameEvent.Type.*; - public class GatheringParticipantCommunicationChannel implements GameStateListener { private List _events = new LinkedList(); private String _self; diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/LotroGameMediator.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroGameMediator.java similarity index 100% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/LotroGameMediator.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroGameMediator.java diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/LotroGameParticipant.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroGameParticipant.java similarity index 100% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/LotroGameParticipant.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroGameParticipant.java diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroServer.java similarity index 100% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/LotroServer.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroServer.java diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/game/DefaultLotroFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultLotroFormat.java similarity index 100% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/game/DefaultLotroFormat.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultLotroFormat.java diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/game/LotroFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroFormat.java similarity index 100% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/game/LotroFormat.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroFormat.java diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/game/ParticipantCommunicationVisitor.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/ParticipantCommunicationVisitor.java similarity index 100% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/game/ParticipantCommunicationVisitor.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/ParticipantCommunicationVisitor.java diff --git a/gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/game/ParticipantTurnOrder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/ParticipantTurnOrder.java similarity index 100% rename from gemp-lotr/lotro-server/src/main/java/com/gempukku/lotro/game/ParticipantTurnOrder.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/ParticipantTurnOrder.java diff --git a/gemp-lotr/lotro-web/pom.xml b/gemp-lotr/gemp-lotr-web/pom.xml similarity index 92% rename from gemp-lotr/lotro-web/pom.xml rename to gemp-lotr/gemp-lotr-web/pom.xml index 8f5e60005..1ee810150 100644 --- a/gemp-lotr/lotro-web/pom.xml +++ b/gemp-lotr/gemp-lotr-web/pom.xml @@ -8,13 +8,13 @@ 4.0.0 com.gempukku.lotro - lotro-web + gemp-lotr-web 1.0-SNAPSHOT war ${project.groupId} - lotro-server + gemp-lotr-server ${project.version} diff --git a/gemp-lotr/lotro-web/src/main/java/com/gempukku/lotro/server/ServerResource.java b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java similarity index 100% rename from gemp-lotr/lotro-web/src/main/java/com/gempukku/lotro/server/ServerResource.java rename to gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java diff --git a/gemp-lotr/lotro-web/src/main/resources/log4j.xml b/gemp-lotr/gemp-lotr-web/src/main/resources/log4j.xml similarity index 100% rename from gemp-lotr/lotro-web/src/main/resources/log4j.xml rename to gemp-lotr/gemp-lotr-web/src/main/resources/log4j.xml diff --git a/gemp-lotr/lotro-web/src/main/webapp/WEB-INF/web.xml b/gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml similarity index 77% rename from gemp-lotr/lotro-web/src/main/webapp/WEB-INF/web.xml rename to gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml index 216cd1ba4..960b29e76 100644 --- a/gemp-lotr/lotro-web/src/main/webapp/WEB-INF/web.xml +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,6 @@ - + lotro jersey diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_flat_30_cccccc_40x100.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_flat_30_cccccc_40x100.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_flat_30_cccccc_40x100.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_flat_30_cccccc_40x100.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_flat_50_5c5c5c_40x100.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_flat_50_5c5c5c_40x100.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_flat_50_5c5c5c_40x100.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_flat_50_5c5c5c_40x100.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_glass_40_ffc73d_1x400.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_glass_40_ffc73d_1x400.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_glass_40_ffc73d_1x400.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_glass_40_ffc73d_1x400.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-hard_20_0972a5_1x100.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-hard_20_0972a5_1x100.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-hard_20_0972a5_1x100.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-hard_20_0972a5_1x100.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_33_003147_1x100.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_33_003147_1x100.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_33_003147_1x100.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_33_003147_1x100.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_35_222222_1x100.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_35_222222_1x100.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_35_222222_1x100.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_35_222222_1x100.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_44_444444_1x100.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_44_444444_1x100.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_44_444444_1x100.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_44_444444_1x100.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_80_eeeeee_1x100.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_80_eeeeee_1x100.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_80_eeeeee_1x100.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_highlight-soft_80_eeeeee_1x100.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_loop_25_000000_21x21.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_loop_25_000000_21x21.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-bg_loop_25_000000_21x21.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-bg_loop_25_000000_21x21.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_222222_256x240.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_222222_256x240.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_222222_256x240.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_222222_256x240.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_4b8e0b_256x240.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_4b8e0b_256x240.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_4b8e0b_256x240.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_4b8e0b_256x240.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_a83300_256x240.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_a83300_256x240.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_a83300_256x240.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_a83300_256x240.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_cccccc_256x240.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_cccccc_256x240.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_cccccc_256x240.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_cccccc_256x240.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_ffffff_256x240.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_ffffff_256x240.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/images/ui-icons_ffffff_256x240.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/images/ui-icons_ffffff_256x240.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/jquery-ui-1.8.16.custom.css b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/jquery-ui-1.8.16.custom.css similarity index 99% rename from gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/jquery-ui-1.8.16.custom.css rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/jquery-ui-1.8.16.custom.css index eaf69dc07..3cdda7cbf 100644 --- a/gemp-lotr/lotro-web/src/main/webapp/css/dark-hive/jquery-ui-1.8.16.custom.css +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/dark-hive/jquery-ui-1.8.16.custom.css @@ -1237,7 +1237,7 @@ } .ui-menu .ui-menu-item a.ui-state-hover, -.ui-menu .ui-menu-item a.ui-state-active { + .ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; } @@ -1650,7 +1650,7 @@ button.ui-button::-moz-focus-inner { } .ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { + .ui-datepicker select.ui-datepicker-year { width: 49%; } diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/proto.menu.css b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/proto.menu.css similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/proto.menu.css rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/proto.menu.css diff --git a/gemp-lotr/lotro-web/src/main/webapp/css/spinnerControl.css b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/spinnerControl.css similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/css/spinnerControl.css rename to gemp-lotr/gemp-lotr-web/src/main/webapp/css/spinnerControl.css diff --git a/gemp-lotr/lotro-web/src/main/webapp/images/burden.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/burden.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/images/burden.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/images/burden.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/images/vista-dn-hover.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/vista-dn-hover.gif similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/images/vista-dn-hover.gif rename to gemp-lotr/gemp-lotr-web/src/main/webapp/images/vista-dn-hover.gif diff --git a/gemp-lotr/lotro-web/src/main/webapp/images/vista-dn.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/vista-dn.gif similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/images/vista-dn.gif rename to gemp-lotr/gemp-lotr-web/src/main/webapp/images/vista-dn.gif diff --git a/gemp-lotr/lotro-web/src/main/webapp/images/vista-up-hover.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/vista-up-hover.gif similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/images/vista-up-hover.gif rename to gemp-lotr/gemp-lotr-web/src/main/webapp/images/vista-up-hover.gif diff --git a/gemp-lotr/lotro-web/src/main/webapp/images/vista-up.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/vista-up.gif similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/images/vista-up.gif rename to gemp-lotr/gemp-lotr-web/src/main/webapp/images/vista-up.gif diff --git a/gemp-lotr/lotro-web/src/main/webapp/images/wound.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/wound.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/images/wound.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/images/wound.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/index.jsp b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.jsp similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/index.jsp rename to gemp-lotr/gemp-lotr-web/src/main/webapp/index.jsp diff --git a/gemp-lotr/lotro-web/src/main/webapp/jGaming.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/jGaming.html similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/jGaming.html rename to gemp-lotr/gemp-lotr-web/src/main/webapp/jGaming.html diff --git a/gemp-lotr/lotro-web/src/main/webapp/js/communication.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/communication.js similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/js/communication.js rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/communication.js diff --git a/gemp-lotr/lotro-web/src/main/webapp/js/inheritance.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/inheritance.js similarity index 58% rename from gemp-lotr/lotro-web/src/main/webapp/js/inheritance.js rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/inheritance.js index 2dad8e8c8..8d681cca3 100644 --- a/gemp-lotr/lotro-web/src/main/webapp/js/inheritance.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/inheritance.js @@ -25,24 +25,24 @@ for (var name in prop) { // Check if we're overwriting an existing function prototype[name] = typeof prop[name] == "function" && - typeof _super[name] == "function" && fnTest.test(prop[name]) ? - (function(name, fn) { - return function() { - var tmp = this._super; + typeof _super[name] == "function" && fnTest.test(prop[name]) ? + (function(name, fn) { + return function() { + var tmp = this._super; - // Add a new ._super() method that is the same method - // but on the super-class - this._super = _super[name]; + // Add a new ._super() method that is the same method + // but on the super-class + this._super = _super[name]; - // The method only need to be bound temporarily, so we - // remove it when we're done executing - var ret = fn.apply(this, arguments); - this._super = tmp; + // The method only need to be bound temporarily, so we + // remove it when we're done executing + var ret = fn.apply(this, arguments); + this._super = tmp; - return ret; - }; - })(name, prop[name]) : - prop[name]; + return ret; + }; + })(name, prop[name]) : + prop[name]; } // The dummy class constructor diff --git a/gemp-lotr/lotro-web/src/main/webapp/js/jCardGroup.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/js/jCardGroup.js rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js diff --git a/gemp-lotr/lotro-web/src/main/webapp/js/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/js/jCards.js rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js diff --git a/gemp-lotr/lotro-web/src/main/webapp/js/jquery/images/spinnerbuttons.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jquery/images/spinnerbuttons.png similarity index 100% rename from gemp-lotr/lotro-web/src/main/webapp/js/jquery/images/spinnerbuttons.png rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/jquery/images/spinnerbuttons.png diff --git a/gemp-lotr/lotro-web/src/main/webapp/js/jquery/jquery-1.6.2.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jquery/jquery-1.6.2.js similarity index 91% rename from gemp-lotr/lotro-web/src/main/webapp/js/jquery/jquery-1.6.2.js rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/jquery/jquery-1.6.2.js index b48444d7d..d1af39b26 100644 --- a/gemp-lotr/lotro-web/src/main/webapp/js/jquery/jquery-1.6.2.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jquery/jquery-1.6.2.js @@ -15,13 +15,13 @@ */ (function(window, undefined) { -// Use the correct document accordingly with window argument (sandbox) + // Use the correct document accordingly with window argument (sandbox) var document = window.document, navigator = window.navigator, location = window.location; var jQuery = (function() { -// Define a local copy of jQuery + // Define a local copy of jQuery var jQuery = function(selector, context) { // The jQuery object is actually just the init constructor 'enhanced' return new jQuery.fn.init(selector, context, rootjQuery); @@ -232,10 +232,10 @@ return num == null ? // Return a 'clean' array - this.toArray() : + this.toArray() : // Return just the object - ( num < 0 ? this[ this.length + num ] : this[ num ] ); + ( num < 0 ? this[ this.length + num ] : this[ num ] ); }, // Take an array of elements and push it onto the stack @@ -285,8 +285,8 @@ eq: function(i) { return i === -1 ? - this.slice(i) : - this.slice(i, +i + 1); + this.slice(i) : + this.slice(i, +i + 1); }, first: function() { @@ -319,7 +319,7 @@ splice: [].splice }; -// Give the init function the jQuery prototype for later instantiation + // Give the init function the jQuery prototype for later instantiation jQuery.fn.init.prototype = jQuery.fn; jQuery.extend = jQuery.fn.extend = function() { @@ -510,8 +510,8 @@ type: function(obj) { return obj == null ? - String(obj) : - class2type[ toString.call(obj) ] || "object"; + String(obj) : + class2type[ toString.call(obj) ] || "object"; }, isPlainObject: function(obj) { @@ -524,8 +524,8 @@ // Not own constructor property must be Object if (obj.constructor && - !hasOwn.call(obj, "constructor") && - !hasOwn.call(obj.constructor.prototype, "isPrototypeOf")) { + !hasOwn.call(obj, "constructor") && + !hasOwn.call(obj.constructor.prototype, "isPrototypeOf")) { return false; } @@ -667,18 +667,18 @@ // Use native String.trim function wherever possible trim: trim ? - function(text) { - return text == null ? - "" : - trim.call(text); - } : + function(text) { + return text == null ? + "" : + trim.call(text); + } : // Otherwise use our own trimming functionality - function(text) { - return text == null ? - "" : - text.toString().replace(trimLeft, "").replace(trimRight, ""); - }, + function(text) { + return text == null ? + "" : + text.toString().replace(trimLeft, "").replace(trimRight, ""); + }, // results is for internal usage only makeArray: function(array, results) { @@ -854,10 +854,10 @@ ua = ua.toLowerCase(); var match = rwebkit.exec(ua) || - ropera.exec(ua) || - rmsie.exec(ua) || - ua.indexOf("compatible") < 0 && rmozilla.exec(ua) || - []; + ropera.exec(ua) || + rmsie.exec(ua) || + ua.indexOf("compatible") < 0 && rmozilla.exec(ua) || + []; return { browser: match[1] || "", version: match[2] || "0" }; }, @@ -887,7 +887,7 @@ browser: {} }); -// Populate the class2type map + // Populate the class2type map jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { class2type[ "[object " + name + "]" ] = name.toLowerCase(); }); @@ -898,21 +898,21 @@ jQuery.browser.version = browserMatch.version; } -// Deprecated, use jQuery.browser.webkit instead + // Deprecated, use jQuery.browser.webkit instead if (jQuery.browser.webkit) { jQuery.browser.safari = true; } -// IE doesn't match non-breaking spaces with \s + // IE doesn't match non-breaking spaces with \s if (rnotwhite.test("\xA0")) { trimLeft = /^[\s\xA0]+/; trimRight = /[\s\xA0]+$/; } -// All jQuery objects should point back to these + // All jQuery objects should point back to these rootjQuery = jQuery(document); -// Cleanup functions for the document ready method + // Cleanup functions for the document ready method if (document.addEventListener) { DOMContentLoaded = function() { document.removeEventListener("DOMContentLoaded", DOMContentLoaded, false); @@ -929,7 +929,7 @@ }; } -// The DOM ready check for Internet Explorer + // The DOM ready check for Internet Explorer function doScrollCheck() { if (jQuery.isReady) { return; @@ -1119,8 +1119,8 @@ length = args.length, count = length, deferred = length <= 1 && firstParam && jQuery.isFunction(firstParam.promise) ? - firstParam : - jQuery.Deferred(); + firstParam : + jQuery.Deferred(); function resolveFunc(i) { return function(value) { @@ -1368,7 +1368,7 @@ marginDiv.style.marginRight = "0"; div.appendChild(marginDiv); support.reliableMarginRight = - ( parseInt(( document.defaultView.getComputedStyle(marginDiv, null) || { marginRight: 0 } ).marginRight, 10) || 0 ) === 0; + ( parseInt(( document.defaultView.getComputedStyle(marginDiv, null) || { marginRight: 0 } ).marginRight, 10) || 0 ) === 0; } // Remove the body element we added @@ -1403,7 +1403,7 @@ return support; })(); -// Keep track of boxModel + // Keep track of boxModel jQuery.boxModel = jQuery.support.boxModel; @@ -1517,8 +1517,8 @@ return getByName ? // Check for both converted-to-camel and non-converted data property names - thisCache[ jQuery.camelCase(name) ] || thisCache[ name ] : - thisCache; + thisCache[ jQuery.camelCase(name) ] || thisCache[ name ] : + thisCache; }, removeData: function(elem, name, pvt /* Internal Use Only */) { @@ -1668,8 +1668,8 @@ } return data === undefined && parts[1] ? - this.data(parts[0]) : - data; + this.data(parts[0]) : + data; } else { return this.each(function() { @@ -1701,11 +1701,11 @@ if (typeof data === "string") { try { data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - !jQuery.isNaN(data) ? parseFloat(data) : - rbrace.test(data) ? jQuery.parseJSON(data) : - data; + data === "false" ? false : + data === "null" ? null : + !jQuery.isNaN(data) ? parseFloat(data) : + rbrace.test(data) ? jQuery.parseJSON(data) : + data; } catch(e) { } @@ -1720,9 +1720,9 @@ return data; } -// TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON -// property to be considered empty objects; this property always exists in -// order to make sure JSON.stringify does not expose internal metadata + // TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON + // property to be considered empty objects; this property always exists in + // order to make sure JSON.stringify does not expose internal metadata function isEmptyDataObject(obj) { for (var name in obj) { if (name !== "toJSON") { @@ -1740,13 +1740,13 @@ markDataKey = type + "mark", defer = jQuery.data(elem, deferDataKey, undefined, true); if (defer && - ( src === "queue" || !jQuery.data(elem, queueDataKey, undefined, true) ) && - ( src === "mark" || !jQuery.data(elem, markDataKey, undefined, true) )) { + ( src === "queue" || !jQuery.data(elem, queueDataKey, undefined, true) ) && + ( src === "mark" || !jQuery.data(elem, markDataKey, undefined, true) )) { // Give room for hard-coded callbacks to fire first // and eventually mark/queue something else on the element setTimeout(function() { if (!jQuery.data(elem, queueDataKey, undefined, true) && - !jQuery.data(elem, markDataKey, undefined, true)) { + !jQuery.data(elem, markDataKey, undefined, true)) { jQuery.removeData(elem, deferDataKey, true); defer.resolve(); } @@ -1893,9 +1893,9 @@ while (i--) { if (( tmp = jQuery.data(elements[ i ], deferDataKey, undefined, true) || - ( jQuery.data(elements[ i ], queueDataKey, undefined, true) || - jQuery.data(elements[ i ], markDataKey, undefined, true) ) && - jQuery.data(elements[ i ], deferDataKey, jQuery._Deferred(), true) )) { + ( jQuery.data(elements[ i ], queueDataKey, undefined, true) || + jQuery.data(elements[ i ], markDataKey, undefined, true) ) && + jQuery.data(elements[ i ], deferDataKey, jQuery._Deferred(), true) )) { count++; tmp.done(resolve); } @@ -2077,9 +2077,9 @@ return typeof ret === "string" ? // handle most common string cases - ret.replace(rreturn, "") : + ret.replace(rreturn, "") : // handle cases where value is null/undef or number - ret == null ? "" : ret; + ret == null ? "" : ret; } return undefined; @@ -2150,7 +2150,7 @@ // Don't return options that are disabled or in a disabled optgroup if (option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && - (!option.parentNode.disabled || !jQuery.nodeName(option.parentNode, "optgroup"))) { + (!option.parentNode.disabled || !jQuery.nodeName(option.parentNode, "optgroup"))) { // Get the specific value for the option value = jQuery(option).val(); @@ -2238,7 +2238,7 @@ // Use formHook for forms and if the name contains certain characters } else if (formHook && name !== "className" && - (jQuery.nodeName(elem, "form") || rinvalidChar.test(name))) { + (jQuery.nodeName(elem, "form") || rinvalidChar.test(name))) { hooks = formHook; } @@ -2268,8 +2268,8 @@ // Non-existent attributes return null, we normalize to undefined return ret === null ? - undefined : - ret; + undefined : + ret; } }, @@ -2319,10 +2319,10 @@ var attributeNode = elem.getAttributeNode("tabIndex"); return attributeNode && attributeNode.specified ? - parseInt(attributeNode.value, 10) : - rfocusable.test(elem.nodeName) || rclickable.test(elem.nodeName) && elem.href ? - 0 : - undefined; + parseInt(attributeNode.value, 10) : + rfocusable.test(elem.nodeName) || rclickable.test(elem.nodeName) && elem.href ? + 0 : + undefined; } }, // Use the value property for back compat @@ -2333,8 +2333,8 @@ return formHook.get(elem, name); } return name in elem ? - elem.value : - null; + elem.value : + null; }, set: function(elem, value, name) { if (formHook && jQuery.nodeName(elem, "button")) { @@ -2399,13 +2399,13 @@ propHooks: {} }); -// Hook for boolean attributes + // Hook for boolean attributes boolHook = { get: function(elem, name) { // Align boolean attributes with corresponding properties return jQuery.prop(elem, name) ? - name.toLowerCase() : - undefined; + name.toLowerCase() : + undefined; }, set: function(elem, value, name) { var propName; @@ -2427,7 +2427,7 @@ } }; -// IE6/7 do not support getting/setting some attributes with get/setAttribute + // IE6/7 do not support getting/setting some attributes with get/setAttribute if (!jQuery.support.getSetAttribute) { // propFix is more comprehensive and contains all fixes @@ -2440,8 +2440,8 @@ ret = elem.getAttributeNode(name); // Return undefined if nodeValue is empty string return ret && ret.nodeValue !== "" ? - ret.nodeValue : - undefined; + ret.nodeValue : + undefined; }, set: function(elem, value, name) { // Check form objects in IE (multiple bugs related) @@ -2469,7 +2469,7 @@ } -// Some attributes require a special call on IE + // Some attributes require a special call on IE if (!jQuery.support.hrefNormalized) { jQuery.each([ "href", "src", "width", "height" ], function(i, name) { jQuery.attrHooks[ name ] = jQuery.extend(jQuery.attrHooks[ name ], { @@ -2494,8 +2494,8 @@ }; } -// Safari mis-reports the default selected property of an option -// Accessing the parent's selectedIndex property fixes it + // Safari mis-reports the default selected property of an option + // Accessing the parent's selectedIndex property fixes it if (!jQuery.support.optSelected) { jQuery.propHooks.selected = jQuery.extend(jQuery.propHooks.selected, { get: function(elem) { @@ -2513,7 +2513,7 @@ }); } -// Radios and checkboxes getter/setter + // Radios and checkboxes getter/setter if (!jQuery.support.checkOn) { jQuery.each([ "radio", "checkbox" ], function() { jQuery.valHooks[ this ] = { @@ -2598,8 +2598,8 @@ // Discard the second event of a jQuery.event.trigger() and // when an event is called after a page has unloaded return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ? - jQuery.event.handle.apply(eventHandle.elem, arguments) : - undefined; + jQuery.event.handle.apply(eventHandle.elem, arguments) : + undefined; }; } @@ -2615,8 +2615,8 @@ while ((type = types[ i++ ])) { handleObj = handleObjIn ? - jQuery.extend({}, handleObjIn) : - { handler: handler, data: data }; + jQuery.extend({}, handleObjIn) : + { handler: handler, data: data }; // Namespaced event handlers if (type.indexOf(".") > -1) { @@ -2729,7 +2729,7 @@ type = namespaces.shift(); namespace = new RegExp("(^|\\.)" + - jQuery.map(namespaces.slice(0).sort(), fcleanup).join("\\.(?:.*\\.)?") + "(\\.|$)"); + jQuery.map(namespaces.slice(0).sort(), fcleanup).join("\\.(?:.*\\.)?") + "(\\.|$)"); } eventType = events[ type ]; @@ -2838,7 +2838,7 @@ // jQuery.Event object event[ jQuery.expando ] ? event : // Object literal - new jQuery.Event(type, event) : + new jQuery.Event(type, event) : // Just the event type (string) new jQuery.Event(type); @@ -2911,7 +2911,7 @@ special = jQuery.event.special[ type ] || {}; if ((!special._default || special._default.call(elem.ownerDocument, event) === false) && - !(type === "click" && jQuery.nodeName(elem, "a")) && jQuery.acceptData(elem)) { + !(type === "click" && jQuery.nodeName(elem, "a")) && jQuery.acceptData(elem)) { // Call a native DOM method on the target with the same name name as the event. // Can't use an .isFunction)() check here because IE6/7 fails that test. @@ -3088,16 +3088,16 @@ }; jQuery.removeEvent = document.removeEventListener ? - function(elem, type, handle) { - if (elem.removeEventListener) { - elem.removeEventListener(type, handle, false); - } - } : - function(elem, type, handle) { - if (elem.detachEvent) { - elem.detachEvent("on" + type, handle); - } - }; + function(elem, type, handle) { + if (elem.removeEventListener) { + elem.removeEventListener(type, handle, false); + } + } : + function(elem, type, handle) { + if (elem.detachEvent) { + elem.detachEvent("on" + type, handle); + } + }; jQuery.Event = function(src, props) { // Allow instantiation without the 'new' keyword @@ -3113,7 +3113,7 @@ // Events bubbling up the document may have been marked as prevented // by a handler lower down the tree; reflect the correct value. this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false || - src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse; + src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse; // Event type } else { @@ -3141,8 +3141,8 @@ return true; } -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html + // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding + // http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html jQuery.Event.prototype = { preventDefault: function() { this.isDefaultPrevented = returnTrue; @@ -3184,8 +3184,8 @@ isImmediatePropagationStopped: returnFalse }; -// Checks if an event happened on an element within another element -// Used in jQuery.event.special.mouseenter and mouseleave handlers + // Checks if an event happened on an element within another element + // Used in jQuery.event.special.mouseenter and mouseleave handlers var withinElement = function(event) { // Check if mouse(over|out) are still within the same parent element @@ -3210,14 +3210,14 @@ } }, -// In case of event delegation, we only need to rename the event.type, -// liveHandler will take care of the rest. + // In case of event delegation, we only need to rename the event.type, + // liveHandler will take care of the rest. delegate = function(event) { event.type = event.data; jQuery.event.handle.apply(this, arguments); }; -// Create mouseenter and mouseleave events + // Create mouseenter and mouseleave events jQuery.each({ mouseenter: "mouseover", mouseleave: "mouseout" @@ -3232,7 +3232,7 @@ }; }); -// submit delegation + // submit delegation if (!jQuery.support.submitBubbles) { jQuery.event.special.submit = { @@ -3268,7 +3268,7 @@ } -// change delegation, happens here so we have bind. + // change delegation, happens here so we have bind. if (!jQuery.support.changeBubbles) { var changeFilters, @@ -3281,11 +3281,11 @@ } else if (type === "select-multiple") { val = elem.selectedIndex > -1 ? - jQuery.map(elem.options, - function(elem) { - return elem.selected; - }).join("-") : - ""; + jQuery.map(elem.options, + function(elem) { + return elem.selected; + }).join("-") : + ""; } else if (jQuery.nodeName(elem, "select")) { val = elem.selectedIndex; @@ -3340,8 +3340,8 @@ var elem = e.target, type = jQuery.nodeName(elem, "input") ? elem.type : ""; if ((e.keyCode === 13 && !jQuery.nodeName(elem, "textarea") ) || - (e.keyCode === 32 && (type === "checkbox" || type === "radio")) || - type === "select-multiple") { + (e.keyCode === 32 && (type === "checkbox" || type === "radio")) || + type === "select-multiple") { testChange.call(this, e); } }, @@ -3395,7 +3395,7 @@ } } -// Create "bubbling" focus and blur events + // Create "bubbling" focus and blur events if (!jQuery.support.focusinBubbles) { jQuery.each({ focus: "focusin", blur: "focusout" }, function(orig, fix) { @@ -3564,7 +3564,7 @@ } if (name === "die" && !types && - origSelector && origSelector.charAt(0) === ".") { + origSelector && origSelector.charAt(0) === ".") { context.unbind(origSelector); @@ -3606,7 +3606,7 @@ // bind live handler for (var j = 0, l = context.length; j < l; j++) { jQuery.event.add(context[j], "live." + liveConvert(type, selector), - { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType }); + { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType }); } } else { @@ -3712,8 +3712,8 @@ } jQuery.each(("blur focus focusin focusout load resize scroll unload click dblclick " + - "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error").split(" "), function(i, name) { + "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + + "change select submit keydown keypress keyup error").split(" "), function(i, name) { // Handle event binding jQuery.fn[ name ] = function(data, fn) { @@ -3723,8 +3723,8 @@ } return arguments.length > 0 ? - this.bind(name, data, fn) : - this.trigger(name); + this.bind(name, data, fn) : + this.trigger(name); }; if (jQuery.attrFn) { @@ -3749,10 +3749,10 @@ rBackslash = /\\/g, rNonWord = /\W/; -// Here we check if the JavaScript engine is using some sort of -// optimization where it does not always call our comparision -// function. If that is the case, discard the hasDuplicate value. -// Thus far that includes Google Chrome. + // Here we check if the JavaScript engine is using some sort of + // optimization where it does not always call our comparision + // function. If that is the case, discard the hasDuplicate value. + // Thus far that includes Google Chrome. [0, 0].sort(function() { baseHasDuplicate = false; return 0; @@ -3802,8 +3802,8 @@ } else { set = Expr.relative[ parts[0] ] ? - [ context ] : - Sizzle(parts.shift(), context); + [ context ] : + Sizzle(parts.shift(), context); while (parts.length) { selector = parts.shift(); @@ -3820,22 +3820,22 @@ // Take a shortcut and set the context if the root selector is an ID // (but not if it'll be faster if the inner selector is an ID) if (!seed && parts.length > 1 && context.nodeType === 9 && !contextXML && - Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1])) { + Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1])) { ret = Sizzle.find(parts.shift(), context, contextXML); context = ret.expr ? - Sizzle.filter(ret.expr, ret.set)[0] : - ret.set[0]; + Sizzle.filter(ret.expr, ret.set)[0] : + ret.set[0]; } if (context) { ret = seed ? - { expr: parts.pop(), set: makeArray(seed) } : - Sizzle.find(parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML); + { expr: parts.pop(), set: makeArray(seed) } : + Sizzle.find(parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML); set = ret.expr ? - Sizzle.filter(ret.expr, ret.set) : - ret.set; + Sizzle.filter(ret.expr, ret.set) : + ret.set; if (parts.length > 0) { checkSet = makeArray(set); @@ -3959,8 +3959,8 @@ if (!set) { set = typeof context.getElementsByTagName !== "undefined" ? - context.getElementsByTagName("*") : - []; + context.getElementsByTagName("*") : + []; } return { set: set, expr: expr }; @@ -4107,8 +4107,8 @@ } checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? - elem || false : - elem === part; + elem || false : + elem === part; } } @@ -4141,8 +4141,8 @@ if (elem) { checkSet[i] = isPartStr ? - elem.parentNode : - elem.parentNode === part; + elem.parentNode : + elem.parentNode === part; } } @@ -4255,7 +4255,7 @@ // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec( match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || - !/\D/.test(match[2]) && "0n+" + match[2] || match[2]); + !/\D/.test(match[2]) && "0n+" + match[2] || match[2]); // calculate the numbers (first)n+(last) including if they are negative match[2] = (test[1] + (test[2] || 1)) - 0; @@ -4545,33 +4545,33 @@ ATTR: function(elem, match) { var name = match[1], result = Expr.attrHandle[ name ] ? - Expr.attrHandle[ name ](elem) : - elem[ name ] != null ? - elem[ name ] : - elem.getAttribute(name), + Expr.attrHandle[ name ](elem) : + elem[ name ] != null ? + elem[ name ] : + elem.getAttribute(name), value = result + "", type = match[2], check = match[4]; return result == null ? - type === "!=" : - type === "=" ? - value === check : - type === "*=" ? - value.indexOf(check) >= 0 : - type === "~=" ? - (" " + value + " ").indexOf(check) >= 0 : - !check ? - value && result !== false : - type === "!=" ? - value !== check : - type === "^=" ? - value.indexOf(check) === 0 : - type === "$=" ? - value.substr(value.length - check.length) === check : - type === "|=" ? - value === check || value.substr(0, check.length + 1) === check + "-" : - false; + type === "!=" : + type === "=" ? + value === check : + type === "*=" ? + value.indexOf(check) >= 0 : + type === "~=" ? + (" " + value + " ").indexOf(check) >= 0 : + !check ? + value && result !== false : + type === "!=" ? + value !== check : + type === "^=" ? + value.indexOf(check) === 0 : + type === "$=" ? + value.substr(value.length - check.length) === check : + type === "|=" ? + value === check || value.substr(0, check.length + 1) === check + "-" : + false; }, POS: function(elem, match, i, array) { @@ -4606,14 +4606,14 @@ return array; }; -// Perform a simple check to determine if the browser is capable of -// converting a NodeList to an array using builtin methods. -// Also verifies that the returned array holds DOM nodes -// (which is not the case in the Blackberry browser) + // Perform a simple check to determine if the browser is capable of + // converting a NodeList to an array using builtin methods. + // Also verifies that the returned array holds DOM nodes + // (which is not the case in the Blackberry browser) try { Array.prototype.slice.call(document.documentElement.childNodes, 0)[0].nodeType; -// Provide a fallback method if it does not work + // Provide a fallback method if it does not work } catch(e) { makeArray = function(array, results) { var i = 0, @@ -4712,8 +4712,8 @@ // We ended someplace up the tree so do a sibling check return i === al ? - siblingCheck(a, bp[i], -1) : - siblingCheck(ap[i], b, 1); + siblingCheck(a, bp[i], -1) : + siblingCheck(ap[i], b, 1); }; siblingCheck = function(a, b, ret) { @@ -4735,7 +4735,7 @@ }; } -// Utility function for retreiving the text value of an array of DOM nodes + // Utility function for retreiving the text value of an array of DOM nodes Sizzle.getText = function(elems) { var ret = "", elem; @@ -4755,8 +4755,8 @@ return ret; }; -// Check to see if the browser returns elements by name when -// querying by getElementById (and provide a workaround) + // Check to see if the browser returns elements by name when + // querying by getElementById (and provide a workaround) (function() { // We're going to inject a fake input element with a specified name var form = document.createElement("div"), @@ -4776,10 +4776,10 @@ var m = context.getElementById(match[1]); return m ? - m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? - [m] : - undefined : - []; + m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? + [m] : + undefined : + []; } }; @@ -4830,7 +4830,7 @@ div.innerHTML = ""; if (div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && - div.firstChild.getAttribute("href") !== "#") { + div.firstChild.getAttribute("href") !== "#") { Expr.attrHandle.href = function(elem) { return elem.getAttribute("href", 2); @@ -4982,7 +4982,7 @@ if (ret || !disconnectedMatch || // As well, disconnected nodes are said to be in a document // fragment in IE 9, so check for that - node.document && node.document.nodeType !== 11) { + node.document && node.document.nodeType !== 11) { return ret; } } @@ -5144,7 +5144,7 @@ return Sizzle.filter(later, tmpSet); }; -// EXPOSE + // EXPOSE jQuery.find = Sizzle; jQuery.expr = Sizzle.selectors; jQuery.expr[":"] = jQuery.expr.filters; @@ -5231,8 +5231,8 @@ is: function(selector) { return !!selector && ( typeof selector === "string" ? - jQuery.filter(selector, this).length > 0 : - this.filter(selector).length > 0 ); + jQuery.filter(selector, this).length > 0 : + this.filter(selector).length > 0 ); }, closest: function(selectors, context) { @@ -5250,8 +5250,8 @@ if (!matches[ selector ]) { matches[ selector ] = POS.test(selector) ? - jQuery(selector, context || this.context) : - selector; + jQuery(selector, context || this.context) : + selector; } } @@ -5274,8 +5274,8 @@ // String var pos = POS.test(selectors) || typeof selectors !== "string" ? - jQuery(selectors, context || this.context) : - 0; + jQuery(selectors, context || this.context) : + 0; for (i = 0,l = this.length; i < l; i++) { cur = this[i]; @@ -5304,25 +5304,25 @@ index: function(elem) { if (!elem || typeof elem === "string") { return jQuery.inArray(this[0], - // If it receives a string, the selector is used - // If it receives nothing, the siblings are used + // If it receives a string, the selector is used + // If it receives nothing, the siblings are used elem ? jQuery(elem) : this.parent().children()); } // Locate the position of the desired element return jQuery.inArray( - // If it receives a jQuery object, the first element is used + // If it receives a jQuery object, the first element is used elem.jquery ? elem[0] : elem, this); }, add: function(selector, context) { var set = typeof selector === "string" ? - jQuery(selector, context) : - jQuery.makeArray(selector && selector.nodeType ? [ selector ] : selector), + jQuery(selector, context) : + jQuery.makeArray(selector && selector.nodeType ? [ selector ] : selector), all = jQuery.merge(this.get(), set); return this.pushStack(isDisconnected(set[0]) || isDisconnected(all[0]) ? - all : - jQuery.unique(all)); + all : + jQuery.unique(all)); }, andSelf: function() { @@ -5330,8 +5330,8 @@ } }); -// A painfully simple check to see if an element is disconnected -// from a document (should be improved, where feasible). + // A painfully simple check to see if an element is disconnected + // from a document (should be improved, where feasible). function isDisconnected(node) { return !node || !node.parentNode || node.parentNode.nodeType === 11; } @@ -5373,8 +5373,8 @@ }, contents: function(elem) { return jQuery.nodeName(elem, "iframe") ? - elem.contentDocument || elem.contentWindow.document : - jQuery.makeArray(elem.childNodes); + elem.contentDocument || elem.contentWindow.document : + jQuery.makeArray(elem.childNodes); } }, function(name, fn) { jQuery.fn[ name ] = function(until, selector) { @@ -5410,8 +5410,8 @@ } return elems.length === 1 ? - jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : - jQuery.find.matches(expr, elems); + jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : + jQuery.find.matches(expr, elems); }, dir: function(elem, dir, until) { @@ -5453,7 +5453,7 @@ } }); -// Implement the identical functionality for filter and not + // Implement the identical functionality for filter and not function winnow(elements, qualifier, keep) { // Can't pass null or undefined to indexOf in Firefox 4 @@ -5515,7 +5515,7 @@ wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; wrapMap.th = wrapMap.td; -// IE can't serialize and