To protect your data, the CISO officer has suggested users to enable GitLab 2FA as soon as possible.

Commit f501704d authored by Rui Chen's avatar Rui Chen
Browse files

[daytrader]To install daytrader and other dependencies into geronimo, java 7 is still required

parent 52308949
Pipeline #2004 canceled with stage
in 25 seconds
......@@ -112,7 +112,7 @@
<untar src="${lib-downloads}/${ger-bin}" dest="${lib-build-dir}" compression="gzip"/>
<untar src="${lib-downloads}/${ger-plugins-bin}" dest="${lib-build-dir}/plugins" compression="gzip"/>
<patch patchfile="libs/${lib-name}/geronimo-quiet-log.patch" dir="${lib-build-dir}" strip="0" ignorewhitespace="yes" failonerror="yes"/>
<patch patchfile="${lib-base}/${lib-name}/geronimo-quiet-log.patch" dir="${lib-build-dir}" ignorewhitespace="yes" strip="0" failonerror="yes"/>
<chmod dir="${ger-home}/bin" includes="**" perm="u+x"/>
<mkdir dir="${dt-build}"/>
......@@ -133,7 +133,7 @@
<fileset dir="libs/${lib-name}/plugins" />
</copy>
<patch patchfile="libs/${lib-name}/${lib-name}.patch" dir="${lib-build-dir}" strip="0" ignorewhitespace="yes" failonerror="yes"/>
<patch patchfile="${lib-base}/${lib-name}/${lib-name}.patch" dir="${lib-build-dir}" ignorewhitespace="yes" strip="0" failonerror="yes"/>
</target>
......@@ -158,7 +158,6 @@
<target name="data" depends="build.init">
<!-- build required plugins -->
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/j2ee" failonerror="yes" failifexecutionfails="yes"/>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/client" failonerror="yes" failifexecutionfails="yes"/>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/cxf" failonerror="yes" failifexecutionfails="yes"/>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/axis" failonerror="yes" failifexecutionfails="yes"/>
......@@ -175,9 +174,6 @@
<!-- deploy daytrader to geronimo -->
<antcall target="start-geronimo"/>
<antcall target="deploy">
<param name="deploy-subject" value="${plugins-build}/j2ee/jsr88-jar-configurer/target/jsr88-jar-configurer-${ger-version}.car"/>
</antcall>
<antcall target="deploy">
<param name="deploy-subject" value="${plugins-build}/client/client/target/client-${ger-version}.car"/>
</antcall>
......@@ -236,7 +232,7 @@
<echo message="${ger-home}/bin/${geronimo-exe}"/>
<exec executable="${ger-home}/bin/${geronimo-exe}" dir="${ger-home}" spawn="true">
<env key="GERONIMO_HOME" path="${ger-home}"/>
<env key="JAVA_HOME" path="${jdk16home}"/>
<env key="JAVA_HOME" path="${jdk17home}"/>
<arg value="start"/>
<arg value="--clean"/>
</exec>
......@@ -250,6 +246,7 @@
<target name="stop-geronimo">
<exec executable="${ger-home}/bin/${geronimo-exe}" dir="${ger-home}" spawn="false">
<env key="GERONIMO_HOME" path="${ger-home}"/>
<env key="JAVA_HOME" path="${jdk17home}"/>
<arg value="stop"/>
<arg value="-u"/>
<arg value="system"/>
......@@ -267,7 +264,7 @@
<target name="deploy">
<exec executable="${ger-home}/bin/${deploy-exe}">
<env key="GERONIMO_HOME" path="${ger-home}"/>
<env key="JAVA_HOME" path="${jdk16home}"/>
<env key="JAVA_HOME" path="${jdk17home}"/>
<arg value="-u"/>
<arg value="system"/>
<arg value="-p"/>
......
diff -urNw daytrader/javaee6/assemblies/daytrader-ear/pom.xml ../daytrader-new/javaee6/assemblies/daytrader-ear/pom.xml
--- daytrader/javaee6/assemblies/daytrader-ear/pom.xml 2018-03-12 16:45:38.000000000 +1100
+++ ../daytrader-new/javaee6/assemblies/daytrader-ear/pom.xml 2018-03-12 17:50:21.885173631 +1100
+++ ../daytrader-new/javaee6/assemblies/daytrader-ear/pom.xml 2018-03-13 21:44:56.126427948 +1100
@@ -20,7 +20,6 @@
<groupId>org.apache.geronimo.daytrader.javaee6</groupId>
<artifactId>utils</artifactId>
......@@ -77,7 +77,7 @@ diff -urNw daytrader/javaee6/assemblies/daytrader-ear/src/main/resources/META-IN
\ No newline at end of file
diff -urNw daytrader/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml ../daytrader-new/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml
--- daytrader/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml 2018-03-12 16:45:42.000000000 +1100
+++ ../daytrader-new/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml 2018-03-12 17:46:16.734487837 +1100
+++ ../daytrader-new/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml 2018-03-13 21:44:56.574420943 +1100
@@ -30,7 +30,7 @@
<exclude-unlisted-classes>true</exclude-unlisted-classes>
......@@ -89,7 +89,7 @@ diff -urNw daytrader/javaee6/modules/entities/src/main/resources/META-INF/persis
<!-- <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> -->
diff -urNw daytrader/javaee6/modules/pom.xml ../daytrader-new/javaee6/modules/pom.xml
--- daytrader/javaee6/modules/pom.xml 2018-03-12 16:45:38.000000000 +1100
+++ ../daytrader-new/javaee6/modules/pom.xml 2018-03-12 17:04:56.082488471 +1100
+++ ../daytrader-new/javaee6/modules/pom.xml 2018-03-13 21:44:56.702418942 +1100
@@ -19,5 +19,7 @@
<module>entities</module>
<module>utils</module>
......@@ -101,7 +101,7 @@ diff -urNw daytrader/javaee6/modules/pom.xml ../daytrader-new/javaee6/modules/po
\ No newline at end of file
diff -urNw daytrader/javaee6/modules/web/pom.xml ../daytrader-new/javaee6/modules/web/pom.xml
--- daytrader/javaee6/modules/web/pom.xml 2018-03-12 16:45:41.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/pom.xml 2018-03-12 17:23:53.712399247 +1100
+++ ../daytrader-new/javaee6/modules/web/pom.xml 2018-03-13 21:44:57.566405432 +1100
@@ -28,6 +28,12 @@
</dependency>
<dependency>
......@@ -125,7 +125,7 @@ diff -urNw daytrader/javaee6/modules/web/pom.xml ../daytrader-new/javaee6/module
</plugins>
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/api/TradeServices.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/api/TradeServices.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/api/TradeServices.java 2018-03-12 16:45:45.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/api/TradeServices.java 2018-03-12 17:07:46.771646293 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/api/TradeServices.java 2018-03-13 21:44:56.914415628 +1100
@@ -281,5 +281,11 @@
*/
public RunStatsDataBean resetTrade(boolean deleteAll) throws Exception, RemoteException;
......@@ -140,7 +140,7 @@ diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytr
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java 2018-03-12 16:45:40.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java 2018-03-12 17:07:46.651648286 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java 2018-03-13 21:44:56.950415065 +1100
@@ -1930,4 +1930,26 @@
return TradeConfig.JDBC;
}
......@@ -170,7 +170,7 @@ diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytr
}
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java 2018-03-12 16:45:40.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java 2018-03-12 17:10:23.789043888 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java 2018-03-13 21:44:56.994414376 +1100
@@ -1932,7 +1932,7 @@
private final static String updateAccountProfileSQL =
......@@ -235,7 +235,7 @@ diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytr
}
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJPADirect.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJPADirect.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJPADirect.java 2018-03-12 16:45:46.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJPADirect.java 2018-03-12 17:07:46.827645363 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJPADirect.java 2018-03-13 21:44:56.962414876 +1100
@@ -1038,4 +1038,26 @@
return TradeConfig.JPA;
}
......@@ -265,7 +265,7 @@ diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytr
}
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java 2018-03-12 16:45:40.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java 2018-03-12 17:11:19.312125803 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java 2018-03-13 21:44:57.042413625 +1100
@@ -125,4 +125,16 @@
public RunStatsDataBean resetTrade(boolean deleteAll) throws Exception {
return (new TradeJEEDirect(false)).resetTrade(deleteAll);
......@@ -285,7 +285,7 @@ diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytr
}
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java 2018-03-12 16:45:40.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java 2018-03-12 17:12:04.363381573 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java 2018-03-13 21:44:57.050413501 +1100
@@ -750,4 +750,17 @@
Log.trace("updateQuotePrices: " + TradeConfig.getUpdateQuotePrices());
Log.trace("publishQuotePriceChange: " + TradeConfig.getPublishQuotePriceChange());
......@@ -306,7 +306,7 @@ diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytr
}
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeAction.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeAction.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeAction.java 2018-03-12 16:45:40.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeAction.java 2018-03-12 17:13:21.994100446 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeAction.java 2018-03-13 21:44:57.074413124 +1100
@@ -570,4 +570,39 @@
return runStatsData;
}
......@@ -349,7 +349,7 @@ diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytr
}
diff -urNw daytrader/javaee6/modules/web/src/main/resources/dbscripts/derby/Table.ddl ../daytrader-new/javaee6/modules/web/src/main/resources/dbscripts/derby/Table.ddl
--- daytrader/javaee6/modules/web/src/main/resources/dbscripts/derby/Table.ddl 2018-03-12 16:45:46.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/resources/dbscripts/derby/Table.ddl 2018-03-12 17:53:10.625555198 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/resources/dbscripts/derby/Table.ddl 2018-03-13 21:44:57.346408872 +1100
@@ -15,13 +15,13 @@
-- Each SQL statement in this file should terminate with a semicolon (;)
......@@ -373,7 +373,7 @@ diff -urNw daytrader/javaee6/modules/web/src/main/resources/dbscripts/derby/Tabl
(ID SMALLINT NOT NULL PRIMARY KEY,
diff -urNw daytrader/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml ../daytrader-new/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml
--- daytrader/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml 2018-03-12 16:45:42.000000000 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml 2018-03-12 17:49:22.850446217 +1100
+++ ../daytrader-new/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml 2018-03-13 21:44:57.390408184 +1100
@@ -58,10 +58,19 @@
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
......@@ -396,7 +396,7 @@ diff -urNw daytrader/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml ../dayt
<session-timeout>30</session-timeout>
diff -urNw daytrader/plugins/daytrader-tomcat/pom.xml ../daytrader-new/plugins/daytrader-tomcat/pom.xml
--- daytrader/plugins/daytrader-tomcat/pom.xml 2018-03-12 16:45:42.000000000 +1100
+++ ../daytrader-new/plugins/daytrader-tomcat/pom.xml 2018-03-12 17:28:09.332605514 +1100
+++ ../daytrader-new/plugins/daytrader-tomcat/pom.xml 2018-03-13 21:52:10.011646339 +1100
@@ -40,7 +40,7 @@
</dependency>
<dependency>
......@@ -452,7 +452,7 @@ diff -urNw daytrader/plugins/daytrader-tomcat/pom.xml ../daytrader-new/plugins/d
<groupId>org.apache.maven.plugins</groupId>
diff -urNw daytrader/plugins/daytrader-tomcat/src/main/history/dependencies.xml ../daytrader-new/plugins/daytrader-tomcat/src/main/history/dependencies.xml
--- daytrader/plugins/daytrader-tomcat/src/main/history/dependencies.xml 2018-03-12 16:45:49.000000000 +1100
+++ ../daytrader-new/plugins/daytrader-tomcat/src/main/history/dependencies.xml 2018-03-12 17:14:56.559150783 +1100
+++ ../daytrader-new/plugins/daytrader-tomcat/src/main/history/dependencies.xml 2018-03-13 21:44:59.950368158 +1100
@@ -38,7 +38,7 @@
</dependency>-->
<dependency>
......@@ -464,7 +464,7 @@ diff -urNw daytrader/plugins/daytrader-tomcat/src/main/history/dependencies.xml
<dependency>
diff -urNw daytrader/plugins/daytrader-tomcat/src/main/plan/plan.xml ../daytrader-new/plugins/daytrader-tomcat/src/main/plan/plan.xml
--- daytrader/plugins/daytrader-tomcat/src/main/plan/plan.xml 2018-03-12 16:45:42.000000000 +1100
+++ ../daytrader-new/plugins/daytrader-tomcat/src/main/plan/plan.xml 2018-03-12 16:58:09.533349056 +1100
+++ ../daytrader-new/plugins/daytrader-tomcat/src/main/plan/plan.xml 2018-03-13 21:44:59.954368095 +1100
@@ -179,4 +179,26 @@
</application-client>
</module>-->
......@@ -494,7 +494,7 @@ diff -urNw daytrader/plugins/daytrader-tomcat/src/main/plan/plan.xml ../daytrade
</application>
diff -urNw daytrader/plugins/pom.xml ../daytrader-new/plugins/pom.xml
--- daytrader/plugins/pom.xml 2018-03-12 16:45:42.000000000 +1100
+++ ../daytrader-new/plugins/pom.xml 2018-03-12 17:14:40.852031058 +1100
+++ ../daytrader-new/plugins/pom.xml 2018-03-13 21:54:00.037927038 +1100
@@ -40,10 +40,11 @@
</property>
</activation>
......@@ -510,9 +510,18 @@ diff -urNw daytrader/plugins/pom.xml ../daytrader-new/plugins/pom.xml
</modules>
</profile>
<!--
@@ -125,6 +126,8 @@
<geronimo-version>2.2.1-SNAPSHOT</geronimo-version>-->
<jvm-version>1.5</jvm-version>
<jvm-version>1.6</jvm-version>
+ <jvm-version>1.7</jvm-version>
+ <jvm-version>1.8</jvm-version>
<source-repository>~/.m2/repository/</source-repository>
<source-repository>http://repository.apache.org/snapshots/</source-repository>
<source-repository>http://repo1.maven.org/maven2/</source-repository>
diff -urNw daytrader/pom.xml ../daytrader-new/pom.xml
--- daytrader/pom.xml 2018-03-12 16:45:38.000000000 +1100
+++ ../daytrader-new/pom.xml 2018-03-12 17:03:01.308409878 +1100
+++ ../daytrader-new/pom.xml 2018-03-13 21:44:56.094428449 +1100
@@ -39,7 +39,7 @@
</scm>
......
diff -urNw geronimo-tomcat7-minimal-3.0.1/etc/config.properties geronimo-tomcat7-minimal-3.0.1-new/etc/config.properties
diff -urNw geronimo-tomcat7-minimal-3.0.1/etc/config.properties ../geronimo-new/etc/config.properties
--- geronimo-tomcat7-minimal-3.0.1/etc/config.properties 2013-05-23 13:54:41.000000000 +1000
+++ geronimo-tomcat7-minimal-3.0.1-new/etc/config.properties 2018-03-04 21:43:49.190137595 +1100
@@ -260,7 +260,7 @@
+++ ../geronimo-new/etc/config.properties 2018-03-13 21:40:37.246477817 +1100
@@ -90,7 +90,7 @@
# Standard package set. Note that:
# - javax.transaction* is exported with a mandatory attribute
-jre-1.7=, \
-jre-1.6=, \
+jre-1.8=, \
javax.accessibility, \
javax.activity, \
javax.annotation.processing, \
diff -urNw geronimo-tomcat7-minimal-3.0.1/var/log/client-log4j.properties geronimo-tomcat7-minimal-3.0.1-new/var/log/client-log4j.properties
diff -urNw geronimo-tomcat7-minimal-3.0.1/var/log/client-log4j.properties ../geronimo-new/var/log/client-log4j.properties
--- geronimo-tomcat7-minimal-3.0.1/var/log/client-log4j.properties 2013-05-23 13:54:41.000000000 +1000
+++ geronimo-tomcat7-minimal-3.0.1-new/var/log/client-log4j.properties 2018-03-04 21:44:13.117695904 +1100
+++ ../geronimo-new/var/log/client-log4j.properties 2018-03-13 21:40:20.798735326 +1100
@@ -20,7 +20,7 @@
log4j.rootLogger=INFO, CONSOLE, FILE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
+log4j.appender.CONSOLE.Threshold=OFF
log4j.appender.CONSOLE.Target=System.out
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n
diff -urNw geronimo-tomcat7-minimal-3.0.1/var/log/server-log4j.properties geronimo-tomcat7-minimal-3.0.1-new/var/log/server-log4j.properties
diff -urNw geronimo-tomcat7-minimal-3.0.1/var/log/server-log4j.properties ../geronimo-new/var/log/server-log4j.properties
--- geronimo-tomcat7-minimal-3.0.1/var/log/server-log4j.properties 2013-05-23 13:54:41.000000000 +1000
+++ geronimo-tomcat7-minimal-3.0.1-new/var/log/server-log4j.properties 2018-03-04 21:44:55.172919801 +1100
+++ ../geronimo-new/var/log/server-log4j.properties 2018-03-13 21:40:28.722611266 +1100
@@ -20,7 +20,7 @@
log4j.rootLogger=INFO, CONSOLE, FILE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
+log4j.appender.CONSOLE.Threshold=OFF
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment