added juser-activity to persistence unit and both projects (core/lib)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/lib/juser-activity-core.jar b/lib/juser-activity-core.jar
new file mode 100644 (file)
index 0000000..cace3fd
Binary files /dev/null and b/lib/juser-activity-core.jar differ

diff --git a/lib/juser-activity-lib.jar b/lib/juser-activity-lib.jar
new file mode 100644 (file)
index 0000000..4926acd
Binary files /dev/null and b/lib/juser-activity-lib.jar differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 1517d28fb3d1fed6e662fbb32f4c1ff88abb68a7..b2a6c9d0b88018183b651713e6ba7066db26236b 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -25,8 +25,8 @@ is divided into following sections:
         </condition>
     </fail>
     <target depends="dist,javadoc" description="Build whole project." name="default"/>
-    <!-- 
-                INITIALIZATION SECTION 
+    <!--
+                INITIALIZATION SECTION
             -->
     <target name="-pre-init">
         <!-- Empty placeholder for easier customization. -->
@@ -749,9 +749,9 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     <target name="-init-taskdefs">
         <fail unless="libs.CopyLibs.classpath">
 The libs.CopyLibs.classpath property is not set up.
-This property must point to 
+This property must point to
 org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at 
+of NetBeans IDE installation and is usually located at
 &lt;netbeans_installation&gt;/java&lt;version&gt;/ant/extra folder.
 Either open the project in the IDE and make sure CopyLibs library
 exists or setup the property manually. For example like this:
@@ -840,18 +840,16 @@ exists or setup the property manually. For example like this:
     <target if="is.jars.in.ejbjar" name="-library-inclusion-in-archive-by-user">
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcore-logger-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.jcountry-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.classes.dir}"/>
         <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.juser-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.jletter-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.juser-activity-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.juser-activity-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jjobs-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.jjobs-lib.jar}" todir="${build.classes.dir}"/>
@@ -861,61 +859,55 @@ exists or setup the property manually. For example like this:
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
         <basename file="${file.reference.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
         <basename file="${file.reference.jcore-logger-lib.jar}" property="manifest.file.reference.jcore-logger-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.jcountry-core.jar}" property="manifest.file.reference.jcountry-core.jar"/>
         <basename file="${file.reference.jcountry-lib.jar}" property="manifest.file.reference.jcountry-lib.jar"/>
         <basename file="${file.reference.jphone-core.jar}" property="manifest.file.reference.jphone-core.jar"/>
         <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.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.jletter-lib.jar}" property="manifest.file.reference.jletter-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.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.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
         <basename file="${file.reference.jjobs-core.jar}" property="manifest.file.reference.jjobs-core.jar"/>
         <basename file="${reference.jjobs-lib.jar}" property="manifest.reference.jjobs-lib.jar"/>
         <basename file="${reference.jjobs-mailer.jar}" property="manifest.reference.jjobs-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 "/>
+            <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.jcontacts-core.jar}"/>
-            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/>
-            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jcontacts-business-core.jar}"/>
-            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
-            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
-            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
-            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.jphone-lib.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.jletter-lib.jar}"/>
-            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jaddressbook-core.jar}"/>
-            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jaddressbook-lib.jar}"/>
-            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.jjobs-core.jar}"/>
-            <attribute name="jar-17-Extension-Name" value="${manifest.reference.jjobs-lib.jar}"/>
-            <attribute name="jar-18-Extension-Name" value="${manifest.reference.jjobs-mailer.jar}"/>
-            <attribute name="jar-19-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
+            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
+            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
+            <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.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.jjobs-core.jar}"/>
+            <attribute name="jar-15-Extension-Name" value="${manifest.reference.jjobs-lib.jar}"/>
+            <attribute name="jar-16-Extension-Name" value="${manifest.reference.jjobs-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">
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcore-logger-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.jcountry-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${dist.ear.dir}/lib"/>
         <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.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jletter-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.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.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jjobs-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.jjobs-lib.jar}" todir="${dist.ear.dir}/lib"/>

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 9014f651713d6ceb1af25b0ac6daf832d481c97d..50b4fc2dacb2b8b7c291c36f7c57c5d580810692 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -7,18 +7,16 @@
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <included-library dirs="200">file.reference.jcoreee.jar</included-library>
             <included-library dirs="200">file.reference.jcore-logger-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.jcountry-core.jar</included-library>
             <included-library dirs="200">file.reference.jcountry-lib.jar</included-library>
             <included-library dirs="200">file.reference.jphone-core.jar</included-library>
             <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.juser-core.jar</included-library>
             <included-library dirs="200">file.reference.juser-lib.jar</included-library>
-            <included-library dirs="200">file.reference.jletter-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.juser-activity-core.jar</included-library>
+            <included-library dirs="200">file.reference.juser-activity-lib.jar</included-library>
             <included-library dirs="200">file.reference.jmailer-ee.jar</included-library>
             <included-library dirs="200">file.reference.jjobs-core.jar</included-library>
             <included-library dirs="200">reference.jjobs-lib.jar</included-library>

diff --git a/src/conf/persistence.xml b/src/conf/persistence.xml
index 6daaf1a6c3454b1db78d30f4a22cd9c51a9c3932..de61b0f8b203c47ee0baca2fe1d20c659b5f1ca6 100644 (file)
--- 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"/>