pahansith
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #62 from charithag/master

Browse Source 
Remove IOS Mobile Plugin Management schema & Change zip archive name to wso2iots
application-manager-new
Charitha Goonetilleke 9 years ago
parent 2a30023d81 3201b2e112
commit c576d04cf3
4 changed files with 46 additions and 79 deletions
Show Stats Download Patch File Download Diff File

51
modules/distribution/pom.xml
Unescape View File

@ -1,6 +1,6 @@
<?org.wso2.uesxml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
@ -29,7 +29,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot</artifactId>
<artifactId>wso2iots</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 IoT Server - Distribution</name>
@ -129,39 +129,6 @@
</tasks>
</configuration>
</execution>
<execution>
<!-- Creating IOS Mobile Plugin Management schema -->
<id>create-ios-mobile-plugin-mgt-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create IOS Mobile plugin Management H2 Schema ###########"/>
<property name="db.dir"
value="target/wso2carbon-core-${carbon.kernel.version}/repository/database"/>
<property name="userid" value="wso2carbon"/>
<property name="password" value="wso2carbon"/>
<property name="dbURL"
value="jdbc:h2:file:${basedir}/${db.dir}/WSO2MobileIOS_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}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/ios/h2.sql"/>
</sql>
<echo message="##################### END ####################"/>
</tasks>
</configuration>
</execution>
<execution>
<!-- Creating API Management schema -->
<id>create-api-mgt-schema</id>
@ -238,18 +205,18 @@
<!--<property name="shindig.version" value="2.5.0-beta5" />-->
<mkdir dir="${tempdir}"/>
<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server"/>
<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server/webapps"/>
<mkdir dir="${tempdir}/${project.artifactId}-${project.version}/repository/components"/>
<mkdir dir="${tempdir}/${project.artifactId}-${project.version}/repository/deployment/server"/>
<mkdir dir="${tempdir}/${project.artifactId}-${project.version}/repository/deployment/server/webapps"/>
<unzip dest="${tempdir}">
<fileset dir="target">
<include name="wso2iot-${project.version}.zip"/>
<include name="${project.artifactId}-${project.version}.zip"/>
</fileset>
</unzip>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
overwrite="true">
<fileset
dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
dir="${tempdir}/${project.artifactId}-${project.version}/repository/components"/>
</copy>
<!--testing -->
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
@ -270,7 +237,7 @@ d <exclude name="**/shindig.properties" /
og4j.logger.net.sf.ehcache=ERROR
</concat>
<delete file="target/wso2iot-${project.version}.zip"/>
<delete file="target/${project.artifactId}-${project.version}.zip"/>
<delete dir="${tempdir}"/>
</tasks>
</configuration>
@ -334,7 +301,7 @@ d <exclude name="**/shindig.properties" /
<delete dir="target/maven-archiver"/>
<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
<delete file="target/wso2iot-${project.version}.jar"/>
<delete file="target/${project.artifactId}-${project.version}.jar"/>
<delete dir="target/sources"/>
<delete dir="target/site"/>
<delete dir="target/antrun"/>

34
modules/distribution/src/assembly/dist.xml
Unescape View File

@ -1,20 +1,20 @@
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<assembly>
<id>wso2-cdm-dist</id>
<formats>
@ -26,7 +26,7 @@
<!-- Copying p2 profile and osgi bundles-->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
<outputDirectory>wso2iot-${pom.version}/repository/components</outputDirectory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components</outputDirectory>
<excludes>
<exclude>**/eclipse.ini</exclude>
<exclude>**/*.lock</exclude>

36
modules/distribution/src/assembly/docs.xml
Unescape View File

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<assembly>
<id>docs</id>
<formats>
@ -25,11 +25,11 @@
<fileSets>
<fileSet>
<directory>target/site</directory>
<outputDirectory>wso2iot-${pom.version}-docs</outputDirectory>
<outputDirectory>${pom.artifactId}-${pom.version}-docs</outputDirectory>
</fileSet>
<fileSet>
<directory>../../modules/documentation/src/site/xdoc/user-core</directory>
<outputDirectory>wso2iot-${pom.version}-docs/user-core</outputDirectory>
<outputDirectory>${pom.artifactId}-${pom.version}-docs/user-core</outputDirectory>
<fileMode>755</fileMode>
<includes>
<include>user-mgt-actdir.xml</include>

4
pom.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
@ -42,7 +42,7 @@
<module>modules/features</module>
<module>modules/p2-profile-gen</module>
<module>modules/distribution</module>
<module>modules/integration</module>
<!--<module>modules/integration</module>-->
</modules>
<dependencyManagement>

Write Preview
Loading…
Cancel
Save