Change zip archive name to wso2iots

merge-requests/1/head
charithag 9 years ago
parent d67ff8cd98
commit 3201b2e112

@ -29,7 +29,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot</artifactId> <artifactId>wso2iots</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 IoT Server - Distribution</name> <name>WSO2 IoT Server - Distribution</name>
@ -205,18 +205,18 @@
<!--<property name="shindig.version" value="2.5.0-beta5" />--> <!--<property name="shindig.version" value="2.5.0-beta5" />-->
<mkdir dir="${tempdir}"/> <mkdir dir="${tempdir}"/>
<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/components"/> <mkdir dir="${tempdir}/${project.artifactId}-${project.version}/repository/components"/>
<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server"/> <mkdir dir="${tempdir}/${project.artifactId}-${project.version}/repository/deployment/server"/>
<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server/webapps"/> <mkdir dir="${tempdir}/${project.artifactId}-${project.version}/repository/deployment/server/webapps"/>
<unzip dest="${tempdir}"> <unzip dest="${tempdir}">
<fileset dir="target"> <fileset dir="target">
<include name="wso2iot-${project.version}.zip"/> <include name="${project.artifactId}-${project.version}.zip"/>
</fileset> </fileset>
</unzip> </unzip>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
overwrite="true"> overwrite="true">
<fileset <fileset
dir="${tempdir}/wso2iot-${project.version}/repository/components"/> dir="${tempdir}/${project.artifactId}-${project.version}/repository/components"/>
</copy> </copy>
<!--testing --> <!--testing -->
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}"> <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
@ -237,7 +237,7 @@ d <exclude name="**/shindig.properties" /
og4j.logger.net.sf.ehcache=ERROR og4j.logger.net.sf.ehcache=ERROR
</concat> </concat>
<delete file="target/wso2iot-${project.version}.zip"/> <delete file="target/${project.artifactId}-${project.version}.zip"/>
<delete dir="${tempdir}"/> <delete dir="${tempdir}"/>
</tasks> </tasks>
</configuration> </configuration>
@ -301,7 +301,7 @@ d <exclude name="**/shindig.properties" /
<delete dir="target/maven-archiver"/> <delete dir="target/maven-archiver"/>
<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/> <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
<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/sources"/>
<delete dir="target/site"/> <delete dir="target/site"/>
<delete dir="target/antrun"/> <delete dir="target/antrun"/>

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

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

Loading…
Cancel
Save