community
/
device-mgt-core
12
0
Fork 47
Code Issues Pull Requests 26 Packages Projects Releases Wiki Activity

Fixing bin xml to add bin folder

Browse Source
merge-requests/7/head
Geeth Munasinghe 10 years ago
parent 19d4d1f62d
commit 41d372536d
5 changed files with 85 additions and 84 deletions
Show Stats Download Patch File Download Diff File

43
product/modules/distribution/pom.xml
Unescape View File

@ -104,16 +104,16 @@
<!--<property name="shindig.version" value="2.5.0-beta5"/>-->
<mkdir dir="${tempdir}"/>
<mkdir dir="${tempdir}/wso2emm-${project.version}/repository/components"/>
<mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/components"/>
<unzip dest="${tempdir}">
<fileset dir="target">
<include name="wso2emm-${project.version}.zip"/>
<include name="wso2cdm-${project.version}.zip"/>
</fileset>
</unzip>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
overwrite="true">
<fileset
dir="${tempdir}/wso2emm-${project.version}/repository/components"></fileset>
dir="${tempdir}/wso2cdm-${project.version}/repository/components"></fileset>
</copy>
<!--testing -->
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar"
@ -137,7 +137,7 @@
og4j.logger.net.sf.ehcache=ERROR
</concat>
<delete file="target/wso2emm-${project.version}.zip"/>
<!--<delete file="target/wso2cdm-${project.version}.zip"/>-->
<delete dir="${tempdir}"/>
</tasks>
</configuration>
@ -178,7 +178,7 @@
<delete dir="target/dependency-maven-plugin-markers"/>
<delete dir="target/maven-archiver"/>
<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
<delete file="target/wso2emm-${project.version}.jar"/>
<!--<delete file="target/wso2cdm-${project.version}.jar"/>-->
<delete dir="target/sources"/>
<delete dir="target/site"/>
<delete dir="target/antrun"/>
@ -197,7 +197,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.2</version>
<!--<version>2.5.2</version>-->
<executions>
<execution>
<id>1-pre-dist</id>
@ -217,21 +217,22 @@
</configuration>
</execution>
<!-- <execution>
<id>2-dist</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<filters>
<filter>${basedir}/src/assembly/filter.properties</filter>
</filters>
<descriptors>
<descriptor>${basedir}/src/assembly/bin.xml</descriptor>
</descriptors>
</configuration>
</execution>-->
<execution>
<id>2-dist</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<filters>
<filter>${basedir}/src/assembly/filter.properties</filter>
</filters>
<descriptors>
<descriptor>${basedir}/src/assembly/bin.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>

118
product/modules/distribution/src/assembly/bin.xml
Unescape View File

@ -1,5 +1,5 @@
<assembly>
<!--<id>bin</id>-->
<id>bin</id>
<formats>
<format>zip</format>
</formats>
@ -8,8 +8,8 @@
<fileSets>
<fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
<outputDirectory>wso2emm-${project.version}</outputDirectory>
<excludes>
<outputDirectory>wso2cdm-${pom.version}</outputDirectory>
<!-- <excludes>
<exclude>**/*.sh</exclude>
<exclude>**/README*</exclude>
<exclude>**/LICENSE*</exclude>
@ -22,40 +22,40 @@
<exclude>**/version.txt</exclude>
<exclude>**/axis2/axis2.xml</exclude>
<exclude>**/master-datasources.xml</exclude>
</excludes>
</excludes>-->
</fileSet>
<!--copying runtimes-->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory>
<outputDirectory>wso2emm-${project.version}/lib/runtimes/</outputDirectory>
<outputDirectory>wso2cdm-${pom.version}/lib/runtimes/</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
<outputDirectory>wso2emm-${project.version}</outputDirectory>
<outputDirectory>wso2cdm-${pom.version}</outputDirectory>
<includes>
<include>**/*.sh</include>
</includes>
<fileMode>755</fileMode>
</fileSet>
<fileSet>
<!-- <fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/
</directory>
<outputDirectory>wso2emm-${project.version}/dbscripts/identity</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/dbscripts/identity</outputDirectory>
<includes>
<include>**/**.sql</include>
</includes>
</fileSet>
</fileSet>-->
<!--Multitenancy related file -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory>
<outputDirectory>wso2emm-${project.version}/repository/conf/multitenancy</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy</outputDirectory>
<includes>
<include>**/stratos.xml</include>
<include>**/multitenancy-packages.xml</include>
@ -68,7 +68,7 @@
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory>
<outputDirectory>wso2emm-${project.version}/repository/conf</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
<includes>
<include>**/tenant-mgt.xml</include>
</includes>
@ -76,14 +76,14 @@
<fileSet>
<directory>src/repository/resources/styles/css</directory>
<outputDirectory>wso2emm-${project.version}/resources/allthemes/Default/admin</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/admin</outputDirectory>
<includes>
<include>**/**.css</include>
</includes>
</fileSet>
<fileSet>
<directory>src/repository/resources/styles/images</directory>
<outputDirectory>wso2emm-${project.version}/resources/allthemes/Default/images</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/images</outputDirectory>
<includes>
<include>**/**.gif</include>
<include>**/**.png</include>
@ -94,13 +94,13 @@
<!-- copy documentation -->
<fileSet>
<directory>target/site</directory>
<outputDirectory>wso2emm-${project.version}/docs</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/docs</outputDirectory>
<fileMode>755</fileMode>
</fileSet>
<!-- copy the landing page webapp -->
<fileSet>
<directory>src/repository/resources/stratos_root</directory>
<outputDirectory>wso2emm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
<fileMode>755</fileMode>
</fileSet>
<fileSet>
@ -110,7 +110,7 @@
<include>*/**</include>
</includes>
</fileSet>
<fileSet>
<!-- <fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps
</directory>
@ -124,10 +124,10 @@
<exclude>**/fakepublisher/</exclude>
<exclude>**/fakestore/</exclude>
</excludes>
</fileSet>
</fileSet>-->
<!--copy jaxrs web app for OAuth feature-->
<fileSet>
<!-- <fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
</directory>
@ -137,7 +137,7 @@
</includes>
</fileSet>
<!--copy web app for application authentication feature -->
&lt;!&ndash;copy web app for application authentication feature &ndash;&gt;
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
@ -146,10 +146,10 @@
<includes>
<include>authenticationendpoint.war</include>
</includes>
</fileSet>
</fileSet>-->
<fileSet>
<directory>src/repository/conf</directory>
<outputDirectory>wso2emm-${project.version}/repository/conf</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
<includes>
<include>**/api-manager.xml</include>
<include>**/sso-idp-config.xml</include>
@ -159,7 +159,7 @@
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/
</directory>
<outputDirectory>wso2emm-${project.version}/repository/conf/security/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>
<includes>
<include>**/entitlement.properties</include>
<include>**/trusted-idp-config.xml</include>
@ -167,14 +167,14 @@
</fileSet>
<fileSet>
<directory>src/repository/conf/datasources</directory>
<outputDirectory>wso2emm-${project.version}/repository/conf/datasources</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/datasources</outputDirectory>
<includes>
<include>**/master-datasources.xml</include>
</includes>
</fileSet>
<fileSet>
<directory>src/repository/resources</directory>
<outputDirectory>wso2emm-${project.version}/repository/resources</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/resources</outputDirectory>
<includes>
<include>*/**</include>
</includes>
@ -182,12 +182,12 @@
<!--data-bridge configuration-->
<fileSet>
<directory>src/repository/conf/data-bridge</directory>
<outputDirectory>wso2emm-${project.version}/repository/conf/data-bridge</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/data-bridge</outputDirectory>
<fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.version}/lib/runtimes</directory>
<outputDirectory>wso2emm-${project.version}/lib/runtimes/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/lib/runtimes/</outputDirectory>
<includes>
<include>*/**</include>
</includes>
@ -195,14 +195,14 @@
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
</directory>
<outputDirectory>wso2emm-${project.version}/dbscripts/service-provider</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/dbscripts/service-provider</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules</directory>
<outputDirectory>wso2emm-${project.version}/modules/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/modules/</outputDirectory>
<includes>
<include>*/**</include>
</includes>
@ -212,7 +212,7 @@
<!-- Script -->
<fileSet>
<directory>src/repository/dbscripts/</directory>
<outputDirectory>wso2emm-${project.version}/dbscripts</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/dbscripts</outputDirectory>
<includes>
<include>*/**</include>
</includes>
@ -222,13 +222,13 @@
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>wso2emm-${project.version}/lib/endorsed</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/lib/endorsed</outputDirectory>
<includes>
<include>javax.el:el-api:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>wso2emm-${project.version}/repository/deployment/client/modules
<outputDirectory>wso2cdm-${project.version}/repository/deployment/client/modules
</outputDirectory>
<includes>
<include>org.hibernate.wso2:hibernate:jar</include>
@ -238,11 +238,11 @@
</dependencySets>
<files>
<file>
<!-- <file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/tomcat</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
@ -250,115 +250,115 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/tomcat</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
</file>-->
<file>
<source>src/repository/conf/tomcat/context.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/tomcat</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<!-- <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
</file>-->
<file>
<source>INSTALL.txt</source>
<outputDirectory>wso2emm-${project.version}</outputDirectory>
<outputDirectory>wso2cdm-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>README.txt</source>
<outputDirectory>wso2emm-${project.version}</outputDirectory>
<outputDirectory>wso2cdm-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>LICENSE.txt</source>
<outputDirectory>wso2emm-${project.version}</outputDirectory>
<outputDirectory>wso2cdm-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>release-notes.html</source>
<outputDirectory>wso2emm-${project.version}</outputDirectory>
<outputDirectory>wso2cdm-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
<outputDirectory>wso2emm-${project.version}/bin/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
<outputDirectory>wso2emm-${project.version}/bin/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!--copy default xacml policy to repository/resources/security -->
<file>
<!-- <file>
<source>src/repository/resources/policies/xacml/default/admin.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/resources/security/policies/xacml/default
<outputDirectory>wso2cdm-${project.version}/repository/resources/security/policies/xacml/default
</outputDirectory>
<filtered>true</filtered>
</file>
</file>-->
<file>
<source>src/repository/conf/log4j.properties</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/</outputDirectory>
<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/multitenancy/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>src/repository/conf/axis2/axis2.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/axis2/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/axis2/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/repository/conf/application-authenticators.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/security/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/repository/conf/identity.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>src/repository/database/WSO2EMM_DB.h2.db</source>
<outputDirectory>wso2emm-${project.version}/repository/database</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/database</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- nTask Component -->
<file>
<!-- <file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml
</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/etc</outputDirectory>
</file>
<outputDirectory>wso2cdm-${project.version}/repository/conf/etc</outputDirectory>
</file>-->
<!-- End - nTask Component -->
</files>

4
product/modules/distribution/src/assembly/dist.xml
Unescape View File

@ -16,7 +16,7 @@
~ under the License.
-->
<assembly>
<id>1-pre-dist</id>
<id>wso2-cdm-dist</id>
<formats>
<format>zip</format>
</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>wso2emm-${project.version}/repository/components</outputDirectory>
<outputDirectory>wso2cdm-${project.version}/repository/components</outputDirectory>
<excludes>
<exclude>**/eclipse.ini</exclude>
<exclude>**/*.lock</exclude>

2
product/modules/distribution/src/assembly/docs.xml
Unescape View File

@ -25,7 +25,7 @@
<fileSets>
<fileSet>
<directory>target/site</directory>
<outputDirectory>wso2emm-${project.version}-docs</outputDirectory>
<outputDirectory>wso2cdm-${project.version}-docs</outputDirectory>
</fileSet>
<fileSet>
<directory>../../modules/documentation/src/site/xdoc/user-core</directory>

2
product/modules/distribution/src/assembly/filter.properties
Unescape View File

@ -1,6 +1,6 @@
product.name=WSO2 Connected Device Manager
product.version=2.0.0-SNAPSHOT
product.key=EMM
product.key=CDM
hotdeployment=true
hotupdate=true
carbon.version=4.3.0

Write Preview
Loading…
Cancel
Save