Refactoring

revert-70aa11f8
megala21 7 years ago
parent 270037a727
commit 635f40ce2f

@ -41,9 +41,11 @@
<certificate.mgt>certificate-mgt</certificate.mgt>
<certificate.mgt.api>${basedir}/../${certificate.mgt}/org.wso2.carbon.certificate.mgt.api</certificate.mgt.api>
<certificate.mgt.cert.admin>
${basedir}/../${certificate.mgt}/org.wso2.carbon.certificate.mgt.cert.admin.api</certificate.mgt.cert.admin>
${basedir}/../${certificate.mgt}/org.wso2.carbon.certificate.mgt.cert.admin.api
</certificate.mgt.cert.admin>
<certificate.mgt.core>
${basedir}/../${certificate.mgt}/org.wso2.carbon.certificate.mgt.core</certificate.mgt.core>
${basedir}/../${certificate.mgt}/org.wso2.carbon.certificate.mgt.core
</certificate.mgt.core>
<!-- Device mgt component related properties -->
<device.mgt>device-mgt</device.mgt>
@ -98,7 +100,7 @@
</device.extensions.xmpp>
<!-- Email Sender component related properties -->
<email.sender.core> ${basedir}/../email-sender/org.wso2.carbon.email.sender.core</email.sender.core>
<email.sender.core>${basedir}/../email-sender/org.wso2.carbon.email.sender.core</email.sender.core>
<!-- identity extensions component related properties -->
<identity.extensions>identity-extensions</identity.extensions>
@ -115,15 +117,16 @@
<!-- Policy Management component related properties -->
<policy.mgt>policy-mgt</policy.mgt>
<policy.mgt.complex.point>
${basedir}/../${policy.mgt}/org.wso2.carbon.complex.policy.decision.point</policy.mgt.complex.point>
${basedir}/../${policy.mgt}/org.wso2.carbon.complex.policy.decision.point
</policy.mgt.complex.point>
<policy.mgt.decision.point>
${basedir}/../${policy.mgt}/org.wso2.carbon.policy.decision.point
</policy.mgt.decision.point>
<policy.mgt.information.point>
${basedir}/../${policy.mgt}/org.wso2.carbon.policy.information.point
</policy.mgt.information.point>
<policy.mgt.common> ${basedir}/../${policy.mgt}/org.wso2.carbon.policy.mgt.common</policy.mgt.common>
<policy.mgt.core> ${basedir}/../${policy.mgt}/org.wso2.carbon.policy.mgt.core</policy.mgt.core>
<policy.mgt.common>${basedir}/../${policy.mgt}/org.wso2.carbon.policy.mgt.common</policy.mgt.common>
<policy.mgt.core>${basedir}/../${policy.mgt}/org.wso2.carbon.policy.mgt.core</policy.mgt.core>
<!-- Webapp authenticator framework component related properties -->
<webapp.authenticatore.frmework>
@ -146,22 +149,27 @@
<configuration>
<target name="mergeReports">
<taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.plugin.classpath" />
classpathref="maven.plugin.classpath"/>
<if>
<and>
<available file="${certificate.mgt.core}/${target}/${coverge-report}/${individual.test.report.name}" />
<available file="${device.mgt.core}/${target}/${coverge-report}/${individual.test.report.name}" />
<available file ="${email.sender.core}/${target}/${coverge-report}/${individual.test.report.name}" />
<available file="${policy.mgt.core}/${target}/${coverge-report}/${individual.test.report.name}" />
<available file="${webapp.authenticatore.frmework}/${target}/${coverge-report}/${individual.test.report.name}" />
<available
file="${certificate.mgt.core}/${target}/${coverge-report}/${individual.test.report.name}"/>
<available
file="${device.mgt.core}/${target}/${coverge-report}/${individual.test.report.name}"/>
<available
file="${email.sender.core}/${target}/${coverge-report}/${individual.test.report.name}"/>
<available
file="${policy.mgt.core}/${target}/${coverge-report}/${individual.test.report.name}"/>
<available
file="${webapp.authenticatore.frmework}/${target}/${coverge-report}/${individual.test.report.name}"/>
<!-- After adding the test cases need to list the exec files here-->
</and>
<then>
<taskdef name="report" classname="org.jacoco.ant.ReportTask">
<classpath path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar" />
<classpath path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar"/>
</taskdef>
<mkdir dir="${basedir}/target/coverage-report" />
<mkdir dir="${basedir}/target/coverage-report"/>
<report>
<executiondata>
<fileset dir="${certificate.mgt.core}/${target}/${coverge-report}">
@ -176,22 +184,24 @@
<fileset dir="${policy.mgt.core}/${target}/${coverge-report}">
<include name="${individual.test.report.name}"/>
</fileset>
<fileset dir="${webapp.authenticatore.frmework}/${target}/${coverge-report}">
<fileset
dir="${webapp.authenticatore.frmework}/${target}/${coverge-report}">
<include name="${individual.test.report.name}"/>
</fileset>
<!-- Need to list the newly added exec files here -->
</executiondata>
<structure name="Certificate Management Component Coverage Report">
<structure name="Carbon Device Management Component Coverage Report">
<group name="certificate-mgt">
<group name = "org.wso2.carbon.certificate.mgt.core">
<group name="org.wso2.carbon.certificate.mgt.core">
<classfiles>
<fileset dir="${certificate.mgt.core}/${target}/${classes}"/>
<fileset
dir="${certificate.mgt.core}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${certificate.mgt.core}/${source}"/>
</sourcefiles>
</group>
<group name = "org.wso2.carbon.certificate.mgt.api">
<group name="org.wso2.carbon.certificate.mgt.api">
<classfiles>
<fileset dir="${certificate.mgt.api}/${target}/${classes}"/>
</classfiles>
@ -199,48 +209,49 @@
<fileset dir="${certificate.mgt.api}/${source}"/>
</sourcefiles>
</group>
<group name = "org.wso2.carbon.certificate.mgt.cert.admin.api">
<group name="org.wso2.carbon.certificate.mgt.cert.admin.api">
<classfiles>
<fileset dir="${certificate.mgt.cert.admin}/${target}/${classes}"/>
<fileset
dir="${certificate.mgt.cert.admin}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${certificate.mgt.cert.admin}/${source}" />
<fileset dir="${certificate.mgt.cert.admin}/${source}"/>
</sourcefiles>
</group>
</group>
</structure>
<structure name="Device Management Component Coverage Report">
<group name="device-mgt">
<group name="org.wso2.carbon.device.mgt.analytics.dashboard">
<classfiles>
<fileset dir="${device.mgt.analytics.dashboard}/${target}/${classes}" />
<fileset
dir="${device.mgt.analytics.dashboard}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.mgt.analytics.dashboard}/${source}" />
<fileset dir="${device.mgt.analytics.dashboard}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.analytics.data.publisher">
<classfiles>
<fileset dir="${device.mgt.analytics.data}/${target}/${classes}"/>
<fileset
dir="${device.mgt.analytics.data}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.mgt.analytics.data}/${source}" />
<fileset dir="${device.mgt.analytics.data}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.api">
<classfiles>
<fileset dir="${device.mgt.api}/${target}/${classes}" />
<fileset dir="${device.mgt.api}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.mgt.api}/${source}" />
<fileset dir="${device.mgt.api}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.common">
<classfiles>
<fileset dir="${device.mgt.common}/${target}/${classes}" />
<fileset dir="${device.mgt.common}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.mgt.common}/${source}" />
<fileset dir="${device.mgt.common}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.core">
@ -248,218 +259,230 @@
<fileset dir="${device.mgt.core}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.mgt.core}/${source}" />
<fileset dir="${device.mgt.core}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.extensions">
<classfiles>
<fileset dir="${device.mgt.extensions}/${target}/${classes}" />
<fileset
dir="${device.mgt.extensions}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.mgt.extensions}/${source}" />
<fileset dir="${device.mgt.extensions}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.url.printer">
<classfiles>
<fileset dir="${device.mgt.url.printer}/${target}/${classes}" />
<fileset
dir="${device.mgt.url.printer}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.mgt.url.printer}/${source}" />
<fileset dir="${device.mgt.url.printer}/${source}"/>
</sourcefiles>
</group>
</group>
</structure>
<structure name="API Management Extensions Component Coverage Report">
<group name="apimgt-extensions">
<group name="org.wso2.carbon.apimgt.integration.client">
<classfiles>
<fileset dir="${api.extension.client}/${target}/${classes}" />
<fileset
dir="${api.extension.client}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${api.extension.client}/${source}" />
<fileset dir="${api.extension.client}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.apimgt.application.extension">
<classfiles>
<fileset dir="${api.extension.application}/${target}/${classes}" />
<fileset
dir="${api.extension.application}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${api.extension.application}/${source}" />
<fileset dir="${api.extension.application}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.apimgt.application.extension.api">
<classfiles>
<fileset dir="${api.extension.application.api}/${target}/${classes}" />
<fileset
dir="${api.extension.application.api}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${api.extension.application.api}/${source}" />
<fileset dir="${api.extension.application.api}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.apimgt.handlers">
<classfiles>
<fileset dir="${api.extension.handlers}/${target}/${classes}" />
<fileset
dir="${api.extension.handlers}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${api.extension.handlers}/${source}" />
<fileset dir="${api.extension.handlers}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.apimgt.webapp.publisher">
<classfiles>
<fileset dir="${api.extension.webapp}/${target}/${classes}" />
<fileset
dir="${api.extension.webapp}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${api.extension.webapp}/${source}" />
<fileset dir="${api.extension.webapp}/${source}"/>
</sourcefiles>
</group>
</group>
</structure>
<structure name="Device Management Extensions Component Coverage Report">
<group name="device-mgt-extensions">
<group name="org.wso2.carbon.device.mgt.extensions.device.type.deployer">
<classfiles>
<fileset dir="${device.extensions.deployer}/${target}/${classes}" />
<fileset
dir="${device.extensions.deployer}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.extensions.deployer}/${source}" />
<fileset dir="${device.extensions.deployer}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm">
<classfiles>
<fileset dir="${device.extensions.fcm}/${target}/${classes}" />
<fileset
dir="${device.extensions.fcm}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.extensions.fcm}/${source}" />
<fileset dir="${device.extensions.fcm}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.http">
<classfiles>
<fileset dir="${device.extensions.http}/${target}/${classes}" />
<fileset
dir="${device.extensions.http}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.extensions.http}/${source}" />
<fileset dir="${device.extensions.http}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt">
<classfiles>
<fileset dir="${device.extensions.mqtt}/${target}/${classes}" />
<fileset
dir="${device.extensions.mqtt}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.extensions.mqtt}/${source}" />
<fileset dir="${device.extensions.mqtt}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp">
<classfiles>
<fileset dir="${device.extensions.xmpp}/${target}/${classes}" />
<fileset
dir="${device.extensions.xmpp}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.extensions.xmpp}/${source}" />
<fileset dir="${device.extensions.xmpp}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.device.mgt.extensions.pull.notification">
<classfiles>
<fileset dir="${device.extensions.pull}/${target}/${classes}" />
<fileset
dir="${device.extensions.pull}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${device.extensions.pull}/${source}" />
<fileset dir="${device.extensions.pull}/${source}"/>
</sourcefiles>
</group>
</group>
</structure>
<structure name="Email Sender Component Coverage Report">
<group name="email-sender">
<classfiles>
<fileset dir="${email.sender.core}/${target}/${classes}" />
<fileset dir="${email.sender.core}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${email.sender.core}/${source}" />
<fileset dir="${email.sender.core}/${source}"/>
</sourcefiles>
</group>
</structure>
<structure name="Identity Extensions Component Coverage Report">
<group name="identity-extensions">
<group name ="org.wso2.carbon.device.mgt.oauth.extensions">
<group name="org.wso2.carbon.device.mgt.oauth.extensions">
<classfiles>
<fileset dir="${identity.oauth.extension}/${target}/${classes}" />
<fileset
dir="${identity.oauth.extension}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${identity.oauth.extension}/${source}" />
<fileset dir="${identity.oauth.extension}/${source}"/>
</sourcefiles>
</group>
<group name ="org.wso2.carbon.identity.authenticator.backend.oauth">
<group name="org.wso2.carbon.identity.authenticator.backend.oauth">
<classfiles>
<fileset dir="${identity.backend.extension}/${target}/${classes}" />
<fileset
dir="${identity.backend.extension}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${identity.backend.extension}/${source}" />
<fileset dir="${identity.backend.extension}/${source}"/>
</sourcefiles>
</group>
<group name ="org.wso2.carbon.identity.jwt.client.extension">
<group name="org.wso2.carbon.identity.jwt.client.extension">
<classfiles>
<fileset dir="${identity.jwt.extension}/${target}/${classes}" />
<fileset
dir="${identity.jwt.extension}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${identity.jwt.extension}/${source}" />
<fileset dir="${identity.jwt.extension}/${source}"/>
</sourcefiles>
</group>
</group>
</structure>
<structure name="Policy Management Component Coverage Report">
<group name="policy-mgt">
<group name="org.wso2.carbon.complex.policy.decision.point">
<classfiles>
<fileset dir="${policy.mgt.complex.point}/${target}/${classes}" />
<fileset
dir="${policy.mgt.complex.point}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${policy.mgt.complex.point}/${source}" />
<fileset dir="${policy.mgt.complex.point}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.policy.decision.point">
<classfiles>
<fileset dir="${policy.mgt.decision.point}/${target}/${classes}" />
<fileset
dir="${policy.mgt.decision.point}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${policy.mgt.decision.point}/${source}" />
<fileset dir="${policy.mgt.decision.point}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.policy.information.point">
<classfiles>
<fileset dir="${policy.mgt.information.point}/${target}/${classes}" />
<fileset
dir="${policy.mgt.information.point}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${policy.mgt.information.point}/${source}" />
<fileset dir="${policy.mgt.information.point}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.policy.mgt.common">
<classfiles>
<fileset dir="${policy.mgt.common}/${target}/${classes}" />
<fileset dir="${policy.mgt.common}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${policy.mgt.common}/${source}" />
<fileset dir="${policy.mgt.common}/${source}"/>
</sourcefiles>
</group>
<group name="org.wso2.carbon.policy.mgt.core">
<classfiles>
<fileset dir="${policy.mgt.core}/${target}/${classes}" />
<fileset dir="${policy.mgt.core}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${policy.mgt.core}/${source}" />
<fileset dir="${policy.mgt.core}/${source}"/>
</sourcefiles>
</group>
</group>
</structure>
<structure name="Web App Authenticator Framework Component Coverage Report">
<group name="webapp-authentictor-framework">
<classfiles>
<fileset dir="${webapp.authenticatore.frmework}/${target}/${classes}" />
<fileset
dir="${webapp.authenticatore.frmework}/${target}/${classes}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${webapp.authenticatore.frmework}/${source}" />
<fileset dir="${webapp.authenticatore.frmework}/${source}"/>
</sourcefiles>
</group>
</structure>
<html destdir="${basedir}/target/coverage-report/site" />
<html destdir="${basedir}/target/coverage-report/site"/>
</report>
</then>
</if>

Loading…
Cancel
Save