Skip to content

Commit

Permalink
Merge pull request #78 from malinthaprasan/master
Browse files Browse the repository at this point in the history
Renaming distribution to wso2am-micro-gw-toolkit-<version>
  • Loading branch information
harsha89 authored Jun 22, 2018
2 parents 07b73d6 + 678eb63 commit 4a0de84
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors>
<finalName>wso2am-micro-gw-${pom.version}</finalName>
<finalName>wso2am-micro-gw-toolkit-${pom.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
Expand Down
30 changes: 15 additions & 15 deletions distribution/src/main/assembly/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,45 +27,45 @@
<fileSets>
<fileSet>
<directory>${basedir}/target/ballerina/ballerina-platform-${ballerina.platform.version}</directory>
<outputDirectory>wso2am-micro-gw-${pom.version}/lib/platform</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/lib/platform</outputDirectory>
</fileSet>
<fileSet>
<directory>${basedir}/target/ballerina/ballerina-runtime-${ballerina.platform.version}</directory>
<outputDirectory>wso2am-micro-gw-${pom.version}/lib/runtime</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/lib/runtime</outputDirectory>
</fileSet>
<fileSet>
<directory>${basedir}/resources/templates</directory>
<outputDirectory>wso2am-micro-gw-${pom.version}/resources/templates</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/resources/templates</outputDirectory>
</fileSet>
<fileSet>
<directory>${basedir}/resources/conf</directory>
<outputDirectory>wso2am-micro-gw-${pom.version}/resources/conf</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/resources/conf</outputDirectory>
</fileSet>
<fileSet>
<directory>${basedir}/resources/cli-conf</directory>
<outputDirectory>wso2am-micro-gw-${pom.version}/conf</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/conf</outputDirectory>
</fileSet>
<fileSet>
<directory>${basedir}/resources/filters</directory>
<outputDirectory>wso2am-micro-gw-${pom.version}/resources/filters</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/resources/filters</outputDirectory>
</fileSet>
<fileSet>
<directory>
${project.build.directory}/lib
</directory>
<outputDirectory>wso2am-micro-gw-${pom.version}/lib/runtime/lib</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/lib/runtime/lib</outputDirectory>
</fileSet>
<fileSet>
<directory>
${project.build.directory}/lib
</directory>
<outputDirectory>wso2am-micro-gw-${pom.version}/lib/platform/lib</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/lib/platform/lib</outputDirectory>
</fileSet>

<!--create an empty logs folder-->
<fileSet>
<directory>${basedir}/resources/logs</directory>
<outputDirectory>wso2am-micro-gw-${pom.version}/logs</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/logs</outputDirectory>
<excludes>
<exclude>*/**</exclude>
</excludes>
Expand All @@ -75,35 +75,35 @@
<files>
<file>
<source>${basedir}/resources/ballerinaTruststore.p12</source>
<outputDirectory>wso2am-micro-gw-${pom.version}/lib/platform/bre/security</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/lib/platform/bre/security</outputDirectory>
</file>
<file>
<source>${basedir}/resources/ballerinaTruststore.p12</source>
<outputDirectory>wso2am-micro-gw-${pom.version}/lib/runtime/bre/security</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/lib/runtime/bre/security</outputDirectory>
</file>
<file>
<source>${basedir}/resources/bin/micro-gw</source>
<outputDirectory>wso2am-micro-gw-${pom.version}/bin</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/bin</outputDirectory>
</file>
</files>

<dependencySets>
<dependencySet>
<outputDirectory>wso2am-micro-gw-${pom.version}/lib/platform/bre/lib</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/lib/platform/bre/lib</outputDirectory>
<scope>runtime</scope>
<includes>
<include>org.wso2.am.microgw:org.wso2.micro.gateway.core:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>wso2am-micro-gw-${pom.version}/lib/runtime/bre/lib</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/lib/runtime/bre/lib</outputDirectory>
<scope>runtime</scope>
<includes>
<include>org.wso2.am.microgw:org.wso2.micro.gateway.core:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>wso2am-micro-gw-${pom.version}/lib/platform/bre/lib</outputDirectory>
<outputDirectory>wso2am-micro-gw-toolkit-${pom.version}/lib/platform/bre/lib</outputDirectory>
<scope>runtime</scope>
<includes>
<include>org.wso2.am.microgw:org.wso2.micro.gateway.cli:jar</include>
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<configuration>
<systemPropertyVariables>
<server.zip>
${basedir}/../distribution/target/wso2am-micro-gw-${project.version}.zip
${basedir}/../distribution/target/wso2am-micro-gw-toolkit-${project.version}.zip
</server.zip>
<project.build.directory>${project.build.directory}</project.build.directory>
<java.util.logging.config.file>${project.build.testOutputDirectory}/logging.properties</java.util.logging.config.file>
Expand Down

0 comments on commit 4a0de84

Please sign in to comment.