ravindu
/
community-product
forked from community/community-product
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

master #1

Merged
ravindu merged 14 commits from community/community-product:master into master 2 years ago
Conversation 0 Commits 14 Files Changed 5
5 changed files with 57 additions and 12 deletions
Show Stats Download Patch File Download Diff File

6
distribution/emm-community/src/conf/deployment.toml
Unescape View File

@ -101,7 +101,7 @@ enable = false
config_endpoint = "https://localhost:8080/auth/v1" config_endpoint = "https://localhost:8080/auth/v1"
auth_token = "" auth_token = ""
#[apim.key_manager] [apim.key_manager]
#service_url = "https://localhost:${mgt.transport.https.port}/services/" #service_url = "https://localhost:${mgt.transport.https.port}/services/"
#username = "$ref{super_admin.username}" #username = "$ref{super_admin.username}"
#password = "$ref{super_admin.password}" #password = "$ref{super_admin.password}"
@ -109,7 +109,7 @@ auth_token = ""
#pool.max_idle = 100 #pool.max_idle = 100
#key_validation_handler_type = "default" #key_validation_handler_type = "default"
#key_validation_handler_type = "custom" #key_validation_handler_type = "custom"
#key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler" key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler"
#[apim.idp] #[apim.idp]
#server_url = "https://localhost:${mgt.transport.https.port}" #server_url = "https://localhost:${mgt.transport.https.port}"
@ -255,7 +255,7 @@ password = "${admin.password}"
'header.X-WSO2-KEY-MANAGER' = "default" 'header.X-WSO2-KEY-MANAGER' = "default"
[apim.sync_runtime_artifacts.gateway.skip_list] [apim.sync_runtime_artifacts.gateway.skip_list]
apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml"] apis = ["_TokenAPI_.xml", "_API_Key_Management_.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml"]
sequences = ["_api_registration_fault_.xml"] sequences = ["_api_registration_fault_.xml"]
[transport.https.properties] [transport.https.properties]

24
iot-core/pom.xml
Unescape View File

@ -182,6 +182,30 @@
</target> </target>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>create-heartbeat-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create heart beat H2 Schema ###########" />
<property name="db.dir" value="target/${wso2am}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/HEART_BEAT_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/target/${wso2am}/dbscripts/heart-beat/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>

1
iot-core/src/assembly/bin.xml
Unescape View File

@ -95,6 +95,7 @@
<outputDirectory>${entgra-iot-core}/repository/components/dropins</outputDirectory> <outputDirectory>${entgra-iot-core}/repository/components/dropins</outputDirectory>
<includes> <includes>
<include>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions</include> <include>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions</include>
<include>org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.keymgt.extension</include>
</includes> </includes>
<!--<useProjectArtifact>false</useProjectArtifact>--> <!--<useProjectArtifact>false</useProjectArtifact>-->
<!--<useTransitiveDependencies>true</useTransitiveDependencies>--> <!--<useTransitiveDependencies>true</useTransitiveDependencies>-->

6
iot-core/src/core/conf/deployment.toml
Unescape View File

@ -104,7 +104,7 @@ enable = false
config_endpoint = "https://localhost:8080/auth/v1" config_endpoint = "https://localhost:8080/auth/v1"
auth_token = "" auth_token = ""
#[apim.key_manager] [apim.key_manager]
#service_url = "https://localhost:${mgt.transport.https.port}/services/" #service_url = "https://localhost:${mgt.transport.https.port}/services/"
#username = "$ref{super_admin.username}" #username = "$ref{super_admin.username}"
#password = "$ref{super_admin.password}" #password = "$ref{super_admin.password}"
@ -112,7 +112,7 @@ auth_token = ""
#pool.max_idle = 100 #pool.max_idle = 100
#key_validation_handler_type = "default" #key_validation_handler_type = "default"
#key_validation_handler_type = "custom" #key_validation_handler_type = "custom"
#key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler" key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler"
#[apim.idp] #[apim.idp]
#server_url = "https://localhost:${mgt.transport.https.port}" #server_url = "https://localhost:${mgt.transport.https.port}"
@ -258,7 +258,7 @@ password = "${admin.password}"
'header.X-WSO2-KEY-MANAGER' = "default" 'header.X-WSO2-KEY-MANAGER' = "default"
[apim.sync_runtime_artifacts.gateway.skip_list] [apim.sync_runtime_artifacts.gateway.skip_list]
apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "health-check.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml", "admin--IOS-Enrollment.xml", "admin--IOS-Enrollment-Authenticate-Agent.xml", "admin--IOS-Enrollment-Profile.xml", "admin--IOS-Enrollment-Profile-DEP.xml", "admin--IOS-Enrollment-Scep.xml", "admin--Windows_8.1_Device_Management_Service.xml", "admin--Windows_8.1_Device_Management_Service_v1.0.0.xml", "admin--Windows_8.1_Enrollment_Service.xml", "admin--Windows_8.1_Enrollment_Service_v1.0.0.xml", "admin--Windows_10_Device_management.xml", "admin--Windows_10_Device_management_v1.0.0.xml", "admin--Windows_10_Enrollment_Service.xml", "admin--Windows_10_Enrollment_Service_v1.0.0.xml", "admin--Windows_Discovery_Service.xml", "admin--Windows_Discovery_Service_v1.0.0.xml", "admin--Windows_Enrollment_policy_Service.xml", "admin--Windows_Enrollment_policy_Service_v1.0.0.xml"] apis = ["_TokenAPI_.xml", "_API_Key_Management_.xml", "health-check.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml", "admin--IOS-Enrollment.xml", "admin--IOS-Enrollment-Authenticate-Agent.xml", "admin--IOS-Enrollment-Profile.xml", "admin--IOS-Enrollment-Profile-DEP.xml", "admin--IOS-Enrollment-Scep.xml", "admin--Windows_8.1_Device_Management_Service.xml", "admin--Windows_8.1_Device_Management_Service_v1.0.0.xml", "admin--Windows_8.1_Enrollment_Service.xml", "admin--Windows_8.1_Enrollment_Service_v1.0.0.xml", "admin--Windows_10_Device_management.xml", "admin--Windows_10_Device_management_v1.0.0.xml", "admin--Windows_10_Enrollment_Service.xml", "admin--Windows_10_Enrollment_Service_v1.0.0.xml", "admin--Windows_Discovery_Service.xml", "admin--Windows_Discovery_Service_v1.0.0.xml", "admin--Windows_Enrollment_policy_Service.xml", "admin--Windows_Enrollment_policy_Service_v1.0.0.xml"]
sequences = ["_api_registration_fault_.xml"] sequences = ["_api_registration_fault_.xml"]
[transport.https.properties] [transport.https.properties]

30
pom.xml
Unescape View File

@ -114,22 +114,22 @@
<entgra-emm-community>entgra-emm-community-${project.version}</entgra-emm-community> <entgra-emm-community>entgra-emm-community-${project.version}</entgra-emm-community>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>5.0.12-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>5.0.13</carbon.device.mgt.version>
<carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version> <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
<!--Orbit versions--> <!--Orbit versions-->
<orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version> <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
<carbon.device.mgt.plugin.version>6.0.6-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>6.0.6</carbon.device.mgt.plugin.version>
</properties> </properties>
<scm> <scm>
<url>https://gitlab.com/entgra/community-product.git</url> <url>https://repository.entgra.net/community/community-product.git</url>
<developerConnection>scm:git:https://gitlab.com/entgra/community-product.git</developerConnection> <developerConnection>scm:git:https://repository.entgra.net/community/community-product.git</developerConnection>
<connection>scm:git:https://gitlab.com/entgra/community-product.git</connection> <connection>scm:git:https://repository.entgra.net/community/community-product.git</connection>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
@ -248,6 +248,16 @@
</build> </build>
<pluginRepositories> <pluginRepositories>
<pluginRepository>
<id>internal.nexus</id>
<name>Entgra Internal Repository</name>
<url>https://nexus-local.entgra.io/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
<pluginRepository> <pluginRepository>
<id>wso2.releases</id> <id>wso2.releases</id>
<name>WSO2 internal Repository</name> <name>WSO2 internal Repository</name>
@ -289,6 +299,16 @@
by default) and nothing else. We had troubles with other repositories in by default) and nothing else. We had troubles with other repositories in
the past. Therefore configuring additional repositories here should be the past. Therefore configuring additional repositories here should be
considered very carefully. --> considered very carefully. -->
<repository>
<id>internal.nexus</id>
<name>Entgra Internal Repository</name>
<url>https://nexus-local.entgra.io/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository> <repository>
<id>wso2-nexus</id> <id>wso2-nexus</id>
<name>WSO2 internal Repository</name> <name>WSO2 internal Repository</name>

Write Preview
Loading…
Cancel
Save