refactor packaging of mobile puglins

fix-test-failure
Amalka Subasinghe 2 years ago
parent 798f9daa69
commit 68eb8a1644

@ -73,8 +73,8 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package> <Export-Package>
org.wso2.extension.siddhi.execution.json, io.entgra.device.mgt.plugins.extension.siddhi.execution.json,
org.wso2.extension.siddhi.execution.json.* io.entgra.device.mgt.plugins.extension.siddhi.execution.json.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.json;version="${orbit.version.json.range}", org.json;version="${orbit.version.json.range}",
@ -100,7 +100,7 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<configuration> <configuration>
<destFile>../org.wso2.extension.siddhi.execution.json/target/coverage-reports/jacoco-unit.exec</destFile> <destFile>../io.entgra.device.mgt.plugins.extension.siddhi.execution.json/target/coverage-reports/jacoco-unit.exec</destFile>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -116,8 +116,8 @@
<goal>report</goal> <goal>report</goal>
</goals> </goals>
<configuration> <configuration>
<dataFile>../org.wso2.extension.siddhi.execution.json/target/coverage-reports/jacoco-unit.exec</dataFile> <dataFile>../io.entgra.device.mgt.plugins.extension.siddhi.execution.json/target/coverage-reports/jacoco-unit.exec</dataFile>
<outputDirectory>../org.wso2.extension.siddhi.execution.json/target/coverage-reports/site</outputDirectory> <outputDirectory>../io.entgra.device.mgt.plugins.extension.siddhi.execution.json/target/coverage-reports/site</outputDirectory>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

@ -54,7 +54,7 @@
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${carbon.devicemgt.plugins.version}</Bundle-Version> <Bundle-Version>${carbon.devicemgt.plugins.version}</Bundle-Version>
<Bundle-Description>Device Management Mobile Android Impl Bundle</Bundle-Description> <Bundle-Description>Device Management Mobile Android Impl Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.device.mgt.mobile.android.internal</Private-Package> <Private-Package>io.entgra.device.mgt.plugins.mobile.android.internal</Private-Package>
<Import-Package> <Import-Package>
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
@ -79,8 +79,8 @@
com.google.gson.* com.google.gson.*
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
!org.wso2.carbon.device.mgt.mobile.android.internal, !io.entgra.device.mgt.plugins.mobile.android.internal,
org.wso2.carbon.device.mgt.mobile.android.* io.entgra.device.mgt.plugins.mobile.android.*
</Export-Package> </Export-Package>
</instructions> </instructions>
</configuration> </configuration>

@ -27,7 +27,7 @@ import org.wso2.carbon.ndatasource.core.DataSourceService;
import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.registry.core.service.RegistryService;
/** /**
* @scr.component name="org.wso2.carbon.device.mgt.mobile.android.impl.internal.AndroidDeviceManagementServiceComponent" * @scr.component name="io.entgra.device.mgt.plugins.mobile.android.internal.AndroidDeviceManagementServiceComponent"
* immediate="true" * immediate="true"
* @scr.reference name="org.wso2.carbon.ndatasource" * @scr.reference name="org.wso2.carbon.ndatasource"
* interface="org.wso2.carbon.ndatasource.core.DataSourceService" * interface="org.wso2.carbon.ndatasource.core.DataSourceService"

Loading…
Cancel
Save