868d6abb7 2025 -> 2026
63081666f Source file headers: 2024-> 2025.
5bafe7941 @Repository -> @Service. @Transactional-Annotations removed.
b1560ca43 Migration stuff in progress...
e33c8b9c2 Migration stuff in progress...
868d6abb7
2025 -> 2026868d6abb75cd191a892911ac8e45058932cf9074
diff --git a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
index ccb894672..e56666ea3 100644
--- a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
+++ b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2026 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//
63081666f
Source file headers: 2024-> 2025.63081666f620fb87315f01b817e560e0b2f6a33a
diff --git a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
index 4331a81da..ccb894672 100644
--- a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
+++ b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//
5bafe7941
@Repository -> @Service. @Transactional-Annotations removed.5bafe7941698989d3f2bd6d3df8065708b1f8941
diff --git a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
index d3948c6f4..4331a81da 100644
--- a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
+++ b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
@@ -24,12 +24,12 @@
package org.projectforge.plugins.marketing;
import org.projectforge.framework.persistence.api.BaseDao;
-import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
/**
* @author Kai Reinhard (k.reinhard@micromata.de)
*/
-@Repository
+@Service
public class AddressCampaignDao extends BaseDao<AddressCampaignDO> {
public AddressCampaignDao() { b1560ca43
Migration stuff in progress...b1560ca43fb013bd67533c390e674f647ec34627
diff --git a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
index 97c582004..d3948c6f4 100644
--- a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
+++ b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
@@ -24,7 +24,6 @@
package org.projectforge.plugins.marketing;
import org.projectforge.framework.persistence.api.BaseDao;
-import org.projectforge.framework.persistence.jpa.PfEmgrFactory;
import org.springframework.stereotype.Repository;
/**
@@ -42,8 +41,4 @@ public class AddressCampaignDao extends BaseDao<AddressCampaignDO> {
public AddressCampaignDO newInstance() {
return new AddressCampaignDO();
}
-
- PfEmgrFactory getEmgrFactory() {
- return persistenceService;
- }
} e33c8b9c2
Migration stuff in progress...e33c8b9c2038eb279e10b807ac6e52e41466b680
diff --git a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
index a7ac230c0..97c582004 100644
--- a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
+++ b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignDao.java
@@ -44,6 +44,6 @@ public class AddressCampaignDao extends BaseDao<AddressCampaignDO> {
}
PfEmgrFactory getEmgrFactory() {
- return emgrFactory;
+ return persistenceService;
}
}