tcdlpds
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code formatting

Browse Source
revert-70aa11f8
Dulitha Wijewantha 10 years ago
parent 9012737b08
commit c884cfae23
2 changed files with 114 additions and 62 deletions
Show Stats Download Patch File Download Diff File

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

@ -26,7 +26,9 @@
</fileSet> </fileSet>
<!--copying runtimes--> <!--copying runtimes-->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
</directory>
<outputDirectory>wso2cdm-${pom.version}/lib/runtimes/</outputDirectory> <outputDirectory>wso2cdm-${pom.version}/lib/runtimes/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
@ -46,7 +48,8 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy
</outputDirectory>
<includes> <includes>
<include>**/stratos.xml</include> <include>**/stratos.xml</include>
<include>**/multitenancy-packages.xml</include> <include>**/multitenancy-packages.xml</include>
@ -67,14 +70,16 @@
<fileSet> <fileSet>
<directory>src/repository/resources/styles/css</directory> <directory>src/repository/resources/styles/css</directory>
<outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/admin</outputDirectory> <outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/admin
</outputDirectory>
<includes> <includes>
<include>**/**.css</include> <include>**/**.css</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/resources/styles/images</directory> <directory>src/repository/resources/styles/images</directory>
<outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/images</outputDirectory> <outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/images
</outputDirectory>
<includes> <includes>
<include>**/**.gif</include> <include>**/**.gif</include>
<include>**/**.png</include> <include>**/**.png</include>
@ -95,7 +100,8 @@
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet>--> </fileSet>-->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules</directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules
</directory>
<outputDirectory>${pom.artifactId}-${project.version}/modules/</outputDirectory> <outputDirectory>${pom.artifactId}-${project.version}/modules/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
@ -112,7 +118,8 @@
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/ <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>
<includes> <includes>
@ -122,7 +129,8 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/conf/datasources</directory> <directory>src/repository/conf/datasources</directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/datasources</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/datasources
</outputDirectory>
<includes> <includes>
<include>**/master-datasources.xml</include> <include>**/master-datasources.xml</include>
<include>**/cdm-datasources.xml</include> <include>**/cdm-datasources.xml</include>
@ -138,18 +146,22 @@
<!--data-bridge configuration--> <!--data-bridge configuration-->
<fileSet> <fileSet>
<directory>src/repository/conf/data-bridge</directory> <directory>src/repository/conf/data-bridge</directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/data-bridge</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/data-bridge
</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
</directory>
<outputDirectory>wso2cdm-${project.version}/lib/runtimes/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/lib/runtimes/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/dbscripts/service-provider</outputDirectory> <outputDirectory>wso2cdm-${project.version}/dbscripts/service-provider</outputDirectory>
<includes> <includes>
@ -159,7 +171,9 @@
<!-- Copying identity related dbscripts --> <!-- Copying identity related dbscripts -->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity</directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity
</directory>
<outputDirectory>wso2cdm-${project.version}/dbscripts/identity</outputDirectory> <outputDirectory>wso2cdm-${project.version}/dbscripts/identity</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
@ -167,7 +181,9 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules</directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules
</directory>
<outputDirectory>wso2cdm-${project.version}/modules/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/modules/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
@ -186,12 +202,12 @@
<!-- copy cdm jaggery app --> <!-- copy cdm jaggery app -->
<fileSet> <fileSet>
<directory>src/repository/jaggeryapps</directory> <directory>src/repository/jaggeryapps</directory>
<outputDirectory>wso2cdm-${project.version}/repository/deployment/server/jaggeryapps</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/deployment/server/jaggeryapps
</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
</fileSets> </fileSets>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
@ -214,7 +230,8 @@
<file> <file>
<source>../agents/android/jax-rs/target/cdm-android-api.war</source> <source>../agents/android/jax-rs/target/cdm-android-api.war</source>
<outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps</outputDirectory> <outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps
</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file> </file>
<!-- <file> <!-- <file>
@ -286,7 +303,9 @@
<!-- Copying logging-config.xml --> <!-- Copying logging-config.xml -->
<file> <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml</source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/etc</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
@ -294,7 +313,9 @@
<!-- Copying event-broker.xml --> <!-- Copying event-broker.xml -->
<file> <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml</source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
@ -302,7 +323,9 @@
<!-- Copying application-authentication.xml --> <!-- Copying application-authentication.xml -->
<file> <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml</source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml
</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/security</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/security</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
@ -310,7 +333,9 @@
<!-- Copying thrift-authentication.xml --> <!-- Copying thrift-authentication.xml -->
<file> <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml</source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
@ -327,7 +352,8 @@
<file> <file>
<source>src/repository/conf/multitenancy/cloud-services-desc.xml</source> <source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/
</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>
<!--<file> <!--<file>
@ -358,14 +384,16 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat
</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!--cdm config file--> <!--cdm config file-->
<file> <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
@ -374,9 +402,12 @@
<!--cdm plugin config file--> <!--cdm plugin config file-->
<file> <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile</outputDirectory> <outputDirectory>
${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile
</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -386,7 +417,8 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat
</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>

48
product/modules/p2-profile-gen/pom.xml
Unescape View File

@ -115,15 +115,20 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version} <featureArtifactDef>
org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>org.jaggeryjs.modules:carbon.feature:${carbon.feature.version} <featureArtifactDef>
org.jaggeryjs.modules:carbon.feature:${carbon.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>org.jaggeryjs.modules:process.feature:${process.feature.version} <featureArtifactDef>
org.jaggeryjs.modules:process.feature:${process.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>org.jaggeryjs.modules:uuid.feature:${uuid.feature.version} <featureArtifactDef>
org.jaggeryjs.modules:uuid.feature:${uuid.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version} <featureArtifactDef>
org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version}
@ -326,15 +331,19 @@
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.thrift.authentication.feature.group</id> <id>
org.wso2.carbon.identity.thrift.authentication.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.governance.metadata.server.feature.group</id> <id>org.wso2.carbon.governance.metadata.server.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.extensions.server.feature.group</id> <id>org.wso2.carbon.registry.extensions.server.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
@ -342,11 +351,15 @@
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.associations.dependencies.server.feature.group</id> <id>
org.wso2.carbon.registry.associations.dependencies.server.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.community.features.server.feature.group</id> <id>
org.wso2.carbon.registry.community.features.server.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
@ -371,7 +384,9 @@
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id> <id>
org.wso2.carbon.identity.application.authentication.framework.server.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
@ -379,11 +394,14 @@
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.user.profile.server.feature.group</id> <id>org.wso2.carbon.identity.user.profile.server.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.relying.party.server.feature.group</id> <id>
org.wso2.carbon.identity.relying.party.server.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
@ -391,7 +409,9 @@
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id> <id>
org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
</features> </features>

Write Preview
Loading…
Cancel
Save