diff --git a/pom.xml b/pom.xml index c27989d8f775182f5606b3b5bfa09a6f2660d36c..bc5f03b488964829eedc2d07c9251673cb24f27b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,18 @@ <version>0.0.1</version> <packaging>war</packaging> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.hibernate.ogm</groupId> + <artifactId>hibernate-ogm-bom</artifactId> + <version>5.4.1.Final</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>jakarta.platform</groupId> @@ -27,9 +39,8 @@ <version>8.0</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>5.4.18.Final</version> + <groupId>org.hibernate.ogm</groupId> + <artifactId>hibernate-ogm-mongodb</artifactId> </dependency> </dependencies> @@ -43,7 +54,7 @@ </plugin> </plugins> </build> - + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>1.8</maven.compiler.source> diff --git a/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java b/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java index c17f355e171415b8c06e52739b9ee61a5e167dc8..430888ac30682e74c5c8bb3789fb086911d966c7 100644 --- a/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java +++ b/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java @@ -25,7 +25,7 @@ import de.dpunkt.myaktion.util.Log.TecLog; /** * @author Julian */ -@RolesAllowed("Organizer") +//@RolesAllowed("Organizer") @Stateless public class CampaignServiceBean implements CampaignService { // ---------------------------------------------------------------------------------------------- diff --git a/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java b/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java index 1a8e94a666797f351373f7104722459157a4f6e8..76b57201f2a68c1db9fd0cc79abda319f738552d 100644 --- a/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java +++ b/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java @@ -40,7 +40,7 @@ public class DonationServiceBean implements DonationService { //---------------------------------------------------------------------------------------------- - @RolesAllowed("Organizer") + //@RolesAllowed("Organizer") @Override public List<Donation> getDonationList(Long campaignId) { Campaign managedCampaign = entityManager.find(Campaign.class, campaignId); @@ -52,7 +52,7 @@ public class DonationServiceBean implements DonationService { } @Override - @PermitAll + //@PermitAll public void addDonation(Long campaignId, Donation donation) { Campaign managedCampaign = entityManager.find(Campaign.class, campaignId); donation.setCampaign(managedCampaign); @@ -61,7 +61,7 @@ public class DonationServiceBean implements DonationService { } @Override - @PermitAll + //@PermitAll public void transferDonations() { logger.log(Level.INFO, "log.transferDonation.start"); @@ -76,7 +76,7 @@ public class DonationServiceBean implements DonationService { } @Override - @PermitAll + //@PermitAll public List<Donation> getDonationListPublic(Long campaignId) throws ObjectNotFoundException { Campaign managedCampaign = entityManager.find(Campaign.class, campaignId); if (managedCampaign == null) { diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index e4bba0d4035149c92c79202a081f568e02a4e1e2..9cd3554862c95988f49b688f036cb27eeaf10d40 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -1,14 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence - http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd" - version="2.1"> - <persistence-unit name="primary"> - <jta-data-source>java:jboss/datasources/MyAktionDS</jta-data-source> - <properties> - <property name="hibernate.hbm2ddl.auto" value="update" /> - <property name="hibernate.show_sql" value="false" /> - </properties> - </persistence-unit> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + + <persistence-unit name="primary" transaction-type="JTA"> + <!-- Use the Hibernate OGM provider: configuration will be transparent --> + <provider>org.hibernate.ogm.jpa.HibernateOgmPersistence</provider> + <properties> + <!-- Here you will pick which NoSQL technology to use, and configure it; + in this example we start a local in-memory Infinispan node. --> + <property name="hibernate.ogm.datastore.provider" value="MONGODB"/> + <property name="hibernate.ogm.datastore.host" value="127.0.0.1"/> + <property name="hibernate.ogm.mongodb.port" value="27017"/> + <property name="hibernate.ogm.datastore.database" value="my-aktion"/> + </properties> + </persistence-unit> </persistence> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/myaktion-ds.xml b/src/main/webapp/WEB-INF/myaktion-ds.xml index 1e92c0b76174299fe2ec6856b710bf268525cfdc..b3ea79ca35246db726875d82222fa86e236dcf82 100644 --- a/src/main/webapp/WEB-INF/myaktion-ds.xml +++ b/src/main/webapp/WEB-INF/myaktion-ds.xml @@ -2,9 +2,9 @@ <datasources xmlns="http://www.jboss.org/ironjacamar/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema -http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd"> + http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd"> <datasource jndi-name="java:jboss/datasources/MyAktionDS" - pool-name="myaktion" enabled="true" use-java-context="true"> + pool-name="myaktion" enabled="true" use-java-context="true"> <connection-url>jdbc:h2:tcp://localhost/~/data/myaktion</connection-url> <driver>h2</driver> <security> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 40a01ac4199693028c20b5e6d241b028b3be9c22..33a4cb209d2c9cfd1e83c4dabd014714f680defd 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - <login-config> + <!-- <login-config> <auth-method>FORM</auth-method> <form-login-config> <form-login-page>/login.jsf</form-login-page> @@ -29,9 +29,9 @@ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" </security-constraint> <security-role> <role-name>Organizer</role-name> - </security-role> + </security-role> <servlet-mapping> <servlet-name>javax.ws.rs.core.Application</servlet-name> <url-pattern>/rest/*</url-pattern> - </servlet-mapping> + </servlet-mapping> --> </web-app> \ No newline at end of file