From 2fe179b58f6cc16a031293fd84d6a472ceab42f2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 24 Aug 2016 16:59:51 +0200
Subject: [PATCH] added juser-activity to persistence unit and both projects
(core/lib)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
nbproject/build-impl.xml | 53 ++++++++++------------------------------
nbproject/project.xml | 15 +-----------
src/conf/persistence.xml | 1 +
3 files changed, 15 insertions(+), 54 deletions(-)
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 9e26395..d79ebf8 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -806,9 +806,6 @@ exists or setup the property manually. For example like this:
COMPILATION SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps">
- <ant antfile="${project.addressbook-core}/build.xml" inheritall="false" target="jar">
- <property name="deploy.on.save" value="false"/>
- </ant>
<ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
@@ -820,9 +817,6 @@ exists or setup the property manually. For example like this:
</ant>
</target>
<target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps">
- <ant antfile="${project.addressbook-core}/build.xml" inheritall="false" target="jar">
- <property name="deploy.on.save" value="false"/>
- </ant>
<ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
@@ -852,17 +846,12 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.jphone-lib.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${build.classes.dir}"/>
- <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.juser-core.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.juser-lib.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.juser-activity-core.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.juser-activity-lib.jar}" todir="${build.classes.dir}"/>
- <copyfiles files="${file.reference.jaddressbook-core.jar}" todir="${build.classes.dir}"/>
- <copyfiles files="${file.reference.jaddressbook-lib.jar}" todir="${build.classes.dir}"/>
- <copyfiles files="${file.reference.jaddressbook-share-core.jar}" todir="${build.classes.dir}"/>
- <copyfiles files="${file.reference.jaddressbook-share-lib.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/>
- <copyfiles files="${reference.addressbook-core.jar}" todir="${build.classes.dir}"/>
+ <copyfiles files="${file.reference.addressbook-core.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${reference.addressbook-lib.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${reference.addressbook-mailer.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
@@ -876,22 +865,17 @@ exists or setup the property manually. For example like this:
<basename file="${file.reference.jphone-lib.jar}" property="manifest.file.reference.jphone-lib.jar"/>
<basename file="${file.reference.jcontacts-core.jar}" property="manifest.file.reference.jcontacts-core.jar"/>
<basename file="${file.reference.jcontacts-lib.jar}" property="manifest.file.reference.jcontacts-lib.jar"/>
- <basename file="${file.reference.jcontacts-business-core.jar}" property="manifest.file.reference.jcontacts-business-core.jar"/>
<basename file="${file.reference.juser-core.jar}" property="manifest.file.reference.juser-core.jar"/>
<basename file="${file.reference.juser-lib.jar}" property="manifest.file.reference.juser-lib.jar"/>
<basename file="${file.reference.juser-activity-core.jar}" property="manifest.file.reference.juser-activity-core.jar"/>
<basename file="${file.reference.juser-activity-lib.jar}" property="manifest.file.reference.juser-activity-lib.jar"/>
- <basename file="${file.reference.jaddressbook-core.jar}" property="manifest.file.reference.jaddressbook-core.jar"/>
- <basename file="${file.reference.jaddressbook-lib.jar}" property="manifest.file.reference.jaddressbook-lib.jar"/>
- <basename file="${file.reference.jaddressbook-share-core.jar}" property="manifest.file.reference.jaddressbook-share-core.jar"/>
- <basename file="${file.reference.jaddressbook-share-lib.jar}" property="manifest.file.reference.jaddressbook-share-lib.jar"/>
<basename file="${file.reference.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
- <basename file="${reference.addressbook-core.jar}" property="manifest.reference.addressbook-core.jar"/>
+ <basename file="${file.reference.addressbook-core.jar}" property="manifest.file.reference.addressbook-core.jar"/>
<basename file="${reference.addressbook-lib.jar}" property="manifest.reference.addressbook-lib.jar"/>
<basename file="${reference.addressbook-mailer.jar}" property="manifest.reference.addressbook-mailer.jar"/>
<basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
<manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
- <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 jar-18 jar-19 jar-20 jar-21 jar-22 "/>
+ <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 "/>
<attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
<attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
<attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
@@ -900,20 +884,15 @@ exists or setup the property manually. For example like this:
<attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
<attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
<attribute name="jar-8-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/>
- <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.jcontacts-business-core.jar}"/>
- <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
- <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
- <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.juser-activity-core.jar}"/>
- <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.juser-activity-lib.jar}"/>
- <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jaddressbook-core.jar}"/>
- <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jaddressbook-lib.jar}"/>
- <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.jaddressbook-share-core.jar}"/>
- <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.jaddressbook-share-lib.jar}"/>
- <attribute name="jar-18-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
- <attribute name="jar-19-Extension-Name" value="${manifest.reference.addressbook-core.jar}"/>
- <attribute name="jar-20-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
- <attribute name="jar-21-Extension-Name" value="${manifest.reference.addressbook-mailer.jar}"/>
- <attribute name="jar-22-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+ <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
+ <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
+ <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.juser-activity-core.jar}"/>
+ <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.juser-activity-lib.jar}"/>
+ <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
+ <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.addressbook-core.jar}"/>
+ <attribute name="jar-15-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
+ <attribute name="jar-16-Extension-Name" value="${manifest.reference.addressbook-mailer.jar}"/>
+ <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
</manifest>
</target>
<target depends="compile" name="library-inclusion-in-manifest">
@@ -925,17 +904,12 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.jphone-lib.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.jcontacts-core.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${dist.ear.dir}/lib"/>
- <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.juser-lib.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.juser-activity-core.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.juser-activity-lib.jar}" todir="${dist.ear.dir}/lib"/>
- <copyfiles files="${file.reference.jaddressbook-core.jar}" todir="${dist.ear.dir}/lib"/>
- <copyfiles files="${file.reference.jaddressbook-lib.jar}" todir="${dist.ear.dir}/lib"/>
- <copyfiles files="${file.reference.jaddressbook-share-core.jar}" todir="${dist.ear.dir}/lib"/>
- <copyfiles files="${file.reference.jaddressbook-share-lib.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
- <copyfiles files="${reference.addressbook-core.jar}" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.addressbook-core.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.addressbook-lib.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.addressbook-mailer.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
@@ -1322,7 +1296,6 @@ exists or setup the property manually. For example like this:
CLEANUP SECTION
-->
<target depends="init" name="deps-clean" unless="no.deps">
- <ant antfile="${project.addressbook-core}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.addressbook-mailer}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.juser-core}/build.xml" inheritall="false" target="clean"/>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 4db0574..acf8a96 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -13,17 +13,12 @@
<included-library dirs="200">file.reference.jphone-lib.jar</included-library>
<included-library dirs="200">file.reference.jcontacts-core.jar</included-library>
<included-library dirs="200">file.reference.jcontacts-lib.jar</included-library>
- <included-library dirs="200">file.reference.jcontacts-business-core.jar</included-library>
<included-library dirs="200">file.reference.juser-core.jar</included-library>
<included-library dirs="200">file.reference.juser-lib.jar</included-library>
<included-library dirs="200">file.reference.juser-activity-core.jar</included-library>
<included-library dirs="200">file.reference.juser-activity-lib.jar</included-library>
- <included-library dirs="200">file.reference.jaddressbook-core.jar</included-library>
- <included-library dirs="200">file.reference.jaddressbook-lib.jar</included-library>
- <included-library dirs="200">file.reference.jaddressbook-share-core.jar</included-library>
- <included-library dirs="200">file.reference.jaddressbook-share-lib.jar</included-library>
<included-library dirs="200">file.reference.jmailer-ee.jar</included-library>
- <included-library dirs="200">reference.addressbook-core.jar</included-library>
+ <included-library dirs="200">file.reference.addressbook-core.jar</included-library>
<included-library dirs="200">reference.addressbook-lib.jar</included-library>
<included-library dirs="200">reference.addressbook-mailer.jar</included-library>
<included-library dirs="200">file.reference.cdi-api.jar</included-library>
@@ -38,14 +33,6 @@
<definitions>./lib/nblibraries.properties</definitions>
</libraries>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
- <reference>
- <foreign-project>addressbook-core</foreign-project>
- <artifact-type>jar</artifact-type>
- <script>build.xml</script>
- <target>jar</target>
- <clean-target>clean</clean-target>
- <id>jar</id>
- </reference>
<reference>
<foreign-project>addressbook-lib</foreign-project>
<artifact-type>jar</artifact-type>
diff --git a/src/conf/persistence.xml b/src/conf/persistence.xml
index 2fa63d1..7cab285 100644
--- a/src/conf/persistence.xml
+++ b/src/conf/persistence.xml
@@ -23,6 +23,7 @@
<class>org.mxchange.jusercore.model.email_address.EmailAddressChange</class>
<class>org.mxchange.jusercore.model.user.LoginUser</class>
<class>org.mxchange.jusercore.model.user.password_history.UserPasswordHistory</class>
+ <class>org.mxchange.jusercore.model.user.activity.UserActivityLog</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
--
2.39.5