diff --git a/src/main/java/de/dpunkt/myaktion/controller/DonateMoneyController.java b/src/main/java/de/dpunkt/myaktion/controller/DonateMoneyController.java index 987337a541961d768f1e0a4efdbac75456187b67..6151b3524ce4675e2507fff26039a4d9ca566cb2 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/DonateMoneyController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/DonateMoneyController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/EditCampaignController.java b/src/main/java/de/dpunkt/myaktion/controller/EditCampaignController.java index e60ba8404f1162a64b68fcec16b24454a3aadf2f..84f09544a8ee70b7ccb6ec34fcd48cb3354819c7 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/EditCampaignController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/EditCampaignController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/EditDonationFormController.java b/src/main/java/de/dpunkt/myaktion/controller/EditDonationFormController.java index f5029b22d2e686e99c0ce0db62b6fb141db79d8b..ad4942527109803a828768f1fa5a7f549b4bdd9d 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/EditDonationFormController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/EditDonationFormController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/ListCampaignsController.java b/src/main/java/de/dpunkt/myaktion/controller/ListCampaignsController.java index 9f2ee3bd9bb520937010ca8194a15e6cb31d8808..b8c390c40303a2c31bd4b7eac073683c146aeccb 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/ListCampaignsController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/ListCampaignsController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/ListDonationsController.java b/src/main/java/de/dpunkt/myaktion/controller/ListDonationsController.java index b87559ddeb44d1bac4ee927b7355f4269a1d2bf6..da4c0a1465122e1775b48d800fb6fd095480717c 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/ListDonationsController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/ListDonationsController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/Pages.java b/src/main/java/de/dpunkt/myaktion/controller/Pages.java index c1cefa6ea789e9def68ecf4f382cd0f436fc0808..4ee13f283664dd6e6e13acf42473dc3f4f88b346 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/Pages.java +++ b/src/main/java/de/dpunkt/myaktion/controller/Pages.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; /** diff --git a/src/main/java/de/dpunkt/myaktion/data/CampaignListProducer.java b/src/main/java/de/dpunkt/myaktion/data/CampaignListProducer.java index 99d0f046694a942198aa25907df32f9373b4b7ac..362c05be3e822650aee7eeadd8bb032152002905 100644 --- a/src/main/java/de/dpunkt/myaktion/data/CampaignListProducer.java +++ b/src/main/java/de/dpunkt/myaktion/data/CampaignListProducer.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.data; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/data/CampaignProducer.java b/src/main/java/de/dpunkt/myaktion/data/CampaignProducer.java index 9465ccae886db99ddb3a42cb14bdcc15b15031ba..3e980ab5880764a1d0f0097db88af94e4141d58e 100644 --- a/src/main/java/de/dpunkt/myaktion/data/CampaignProducer.java +++ b/src/main/java/de/dpunkt/myaktion/data/CampaignProducer.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.data; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/model/Account.java b/src/main/java/de/dpunkt/myaktion/model/Account.java index 176bd5d88c0d6552a87dd6cd7995c23535b93c58..7f41d80139b0116953c59c3af88a57f24498ef9b 100644 --- a/src/main/java/de/dpunkt/myaktion/model/Account.java +++ b/src/main/java/de/dpunkt/myaktion/model/Account.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import javax.persistence.Embeddable; diff --git a/src/main/java/de/dpunkt/myaktion/model/Campaign.java b/src/main/java/de/dpunkt/myaktion/model/Campaign.java index 87786285b173a93fee89eec769c7dfce6838a5df..442777b7093fc68000e5de8085ba885938c7ad24 100644 --- a/src/main/java/de/dpunkt/myaktion/model/Campaign.java +++ b/src/main/java/de/dpunkt/myaktion/model/Campaign.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/model/DateEntity.java b/src/main/java/de/dpunkt/myaktion/model/DateEntity.java index b1753168efe587758d1452c1b514abdb72a1a02e..ee669af23f1b6700d97d3e2d118fb7ca68783f71 100644 --- a/src/main/java/de/dpunkt/myaktion/model/DateEntity.java +++ b/src/main/java/de/dpunkt/myaktion/model/DateEntity.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import java.util.Date; diff --git a/src/main/java/de/dpunkt/myaktion/model/Donation.java b/src/main/java/de/dpunkt/myaktion/model/Donation.java index 5f5a9ef1602cb59c9d9e4d1118fb55f365bd9f0e..7a719131856b4a207a6952298e39dd307b98d701 100644 --- a/src/main/java/de/dpunkt/myaktion/model/Donation.java +++ b/src/main/java/de/dpunkt/myaktion/model/Donation.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import javax.persistence.Embedded; diff --git a/src/main/java/de/dpunkt/myaktion/model/Organizer.java b/src/main/java/de/dpunkt/myaktion/model/Organizer.java index 6cb9286cbe15044e9222d66c609ab0678efc273e..c0cbbc664937d0b8abbb5dbb45e5014c38ff8dd2 100644 --- a/src/main/java/de/dpunkt/myaktion/model/Organizer.java +++ b/src/main/java/de/dpunkt/myaktion/model/Organizer.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import javax.persistence.Entity; diff --git a/src/main/java/de/dpunkt/myaktion/resources/CampaignResource.java b/src/main/java/de/dpunkt/myaktion/resources/CampaignResource.java index 25015bf803ac060be4201d50fa043278e0948280..e549dcc7e4089d34ffaab126be6e8eb6b5d8e105 100644 --- a/src/main/java/de/dpunkt/myaktion/resources/CampaignResource.java +++ b/src/main/java/de/dpunkt/myaktion/resources/CampaignResource.java @@ -18,9 +18,13 @@ import de.dpunkt.myaktion.services.CampaignService; @Path("/organizer/campaign") public class CampaignResource { + //---------------------------------------------------------------------------------------------- + @Inject private CampaignService campaignService; + //---------------------------------------------------------------------------------------------- + @GET @Path("/list") @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @@ -35,12 +39,16 @@ public class CampaignResource { return allCampaigns; } + //---------------------------------------------------------------------------------------------- + @DELETE @Path("/{campaignId}") public void deleteAktion(@PathParam(value = "campaignId") Long campaignId) { campaignService.deleteCampaign(campaignId); } + //---------------------------------------------------------------------------------------------- + @POST @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) @@ -48,6 +56,8 @@ public class CampaignResource { return campaignService.addCampaign(campaign); } + //---------------------------------------------------------------------------------------------- + @PUT @Path("/{campaignId}") @Consumes(MediaType.APPLICATION_JSON) @@ -65,4 +75,6 @@ public class CampaignResource { return newCampaign; } + + //---------------------------------------------------------------------------------------------- } \ No newline at end of file diff --git a/src/main/java/de/dpunkt/myaktion/resources/DonationResource.java b/src/main/java/de/dpunkt/myaktion/resources/DonationResource.java index 900ee19bc118141db76578e624313e569ae9e7c9..d54a3c724e55679d41ac2001614f3244493777e2 100644 --- a/src/main/java/de/dpunkt/myaktion/resources/DonationResource.java +++ b/src/main/java/de/dpunkt/myaktion/resources/DonationResource.java @@ -21,9 +21,13 @@ import de.dpunkt.myaktion.services.exceptions.ObjectNotFoundException; @Path("/") public class DonationResource { + //---------------------------------------------------------------------------------------------- + @Inject private DonationService donationService; + //---------------------------------------------------------------------------------------------- + @GET @Path("/organizer/donation/list/{campaignId}") @Produces(MediaType.APPLICATION_JSON) @@ -34,6 +38,8 @@ public class DonationResource { return donations; } + //---------------------------------------------------------------------------------------------- + @POST @Path("/donation/{campaignId}") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) @@ -58,6 +64,8 @@ public class DonationResource { donationService.addDonation(campaignId, donation); } + //---------------------------------------------------------------------------------------------- + @GET @Path("/donation/list/{campaignId}") @Produces(MediaType.APPLICATION_JSON) @@ -71,4 +79,6 @@ public class DonationResource { return Response.status(javax.ws.rs.core.Response.Status.NOT_FOUND).build(); } } + + //---------------------------------------------------------------------------------------------- } diff --git a/src/main/java/de/dpunkt/myaktion/scheduler/SchedulerBean.java b/src/main/java/de/dpunkt/myaktion/scheduler/SchedulerBean.java index 85d55717c867511aeab7125010d40378cb5f768e..b6bc8df234a44dd7a84e5c8df36df2597ab5aab7 100644 --- a/src/main/java/de/dpunkt/myaktion/scheduler/SchedulerBean.java +++ b/src/main/java/de/dpunkt/myaktion/scheduler/SchedulerBean.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.scheduler; import javax.ejb.Schedule; diff --git a/src/main/java/de/dpunkt/myaktion/services/CampaignService.java b/src/main/java/de/dpunkt/myaktion/services/CampaignService.java index 9d1f69678b875c26321a397dc476e2b69bb409b6..69b38e0c865c92afac3e64761ecd5f4ddb6af625 100644 --- a/src/main/java/de/dpunkt/myaktion/services/CampaignService.java +++ b/src/main/java/de/dpunkt/myaktion/services/CampaignService.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.services; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java b/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java index 1cd029cf3177054862fa6c6f8c44b3c7340c5d0b..d6ff8513df08b13c5944061a4ec684242418c240 100644 --- a/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java +++ b/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.services; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/services/DonationService.java b/src/main/java/de/dpunkt/myaktion/services/DonationService.java index c1a1157d9cc3c412c7859c64939de305f5348372..3bf753553a1086b39afd174729b72764eef770b0 100644 --- a/src/main/java/de/dpunkt/myaktion/services/DonationService.java +++ b/src/main/java/de/dpunkt/myaktion/services/DonationService.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.services; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java b/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java index 7804287510bc28b10f63b6d4b9fa81ddc5202e79..c86c0e0e5f40e5dcd4ef151f38996e808516b9cb 100644 --- a/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java +++ b/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.services; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/util/Events.java b/src/main/java/de/dpunkt/myaktion/util/Events.java index 2e200ec09ed33b2049e6c20e02e562b71a0d324b..3e3f2f44570ca24e76d4d4f54f183d6b35ec2021 100644 --- a/src/main/java/de/dpunkt/myaktion/util/Events.java +++ b/src/main/java/de/dpunkt/myaktion/util/Events.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.util; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/de/dpunkt/myaktion/util/Log.java b/src/main/java/de/dpunkt/myaktion/util/Log.java index 00814c61ab5dd8b2fa4d0402c7f61f06148833c2..4853c7089aa7a8a377a6eb469985e1b472b4c847 100644 --- a/src/main/java/de/dpunkt/myaktion/util/Log.java +++ b/src/main/java/de/dpunkt/myaktion/util/Log.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.util; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/de/dpunkt/myaktion/util/Resources.java b/src/main/java/de/dpunkt/myaktion/util/Resources.java index 5a21ca7d3496762a5fc5ac7987f06f27bd0316b8..bdd90ef498631219d01991c4604d541fa12a94d0 100644 --- a/src/main/java/de/dpunkt/myaktion/util/Resources.java +++ b/src/main/java/de/dpunkt/myaktion/util/Resources.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.util; import java.util.logging.Logger; diff --git a/src/main/java/de/dpunkt/myaktion/util/TransactionInterceptor.java b/src/main/java/de/dpunkt/myaktion/util/TransactionInterceptor.java index a925068dc77631e93a925d74f4e5db650489dea9..eb79c7a7490c7b989b1941b37813fc9ece158afc 100644 --- a/src/main/java/de/dpunkt/myaktion/util/TransactionInterceptor.java +++ b/src/main/java/de/dpunkt/myaktion/util/TransactionInterceptor.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.util; import javax.annotation.Resource;