Merge pull request #10 from dulichan/master

Added i18n module. Copied some modules from distribution.
merge-requests/1/head
Prabath Abeysekara 10 years ago
commit 3b4742046b

@ -487,6 +487,7 @@
<process.feature.version>1.0.0</process.feature.version> <process.feature.version>1.0.0</process.feature.version>
<uuid.feature.version>1.0.0</uuid.feature.version> <uuid.feature.version>1.0.0</uuid.feature.version>
<sso.feature.version>1.1.0-SNAPSHOT</sso.feature.version> <sso.feature.version>1.1.0-SNAPSHOT</sso.feature.version>
<i18n.feature.version>1.1.0-SNAPSHOT</i18n.feature.version>
<jaggery-test.feature.version>1.1.0</jaggery-test.feature.version> <jaggery-test.feature.version>1.1.0</jaggery-test.feature.version>
<!--Testing --> <!--Testing -->
<test.framework.version>4.3.1</test.framework.version> <test.framework.version>4.3.1</test.framework.version>

@ -98,12 +98,17 @@
<outputDirectory>wso2cdm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet>--> </fileSet>-->
<!--Removed -->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules
</directory> </directory>
<outputDirectory>${pom.artifactId}-${project.version}/modules/</outputDirectory> <outputDirectory>${pom.artifactId}-${project.version}/modules/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>**/carbon/</include>
<include>**/jaggery-test/</include>
<include>**/process/</include>
<include>**/uuid/</include>
<include>**/i18n/</include>
</includes> </includes>
</fileSet> </fileSet>
@ -198,7 +203,7 @@
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<!--Copying modules-->
<fileSet> <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules
@ -208,6 +213,20 @@
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<directory>src/repository/modules/encode</directory>
<outputDirectory>wso2mdm-${project.version}/modules/encode</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<fileSet>
<directory>src/repository/modules/sso</directory>
<outputDirectory>wso2mdm-${project.version}/modules/sso</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<!-- Copying Device Management related dbscripts --> <!-- Copying Device Management related dbscripts -->
<fileSet> <fileSet>

@ -0,0 +1,7 @@
<module name="encode" namespace="ns" expose="true" xmlns="http://wso2.org/projects/jaggery/module.xml">
<hostObject>
<className>org.wso2.carbon.apimgt.hostobjects.EncodeHostObject</className>
<name>Encode</name>
</hostObject>
</module>

@ -0,0 +1,7 @@
<module name="sso" expose="true" xmlns="http://wso2.org/projects/jaggery/module.xml">
<hostObject>
<className>org.wso2.carbon.hostobjects.sso.SAMLSSORelyingPartyObject</className>
<name>SSORelyingParty</name>
</hostObject>
</module>

@ -130,6 +130,9 @@
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:sso.feature:${sso.feature.version} org.jaggeryjs.modules:sso.feature:${sso.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.jaggeryjs.modules:i18n.feature:${sso.feature.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version} org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version}
</featureArtifactDef> </featureArtifactDef>
@ -368,6 +371,10 @@
<id>org.jaggeryjs.modules.sso.feature.group</id> <id>org.jaggeryjs.modules.sso.feature.group</id>
<version>${sso.feature.version}</version> <version>${sso.feature.version}</version>
</feature> </feature>
<feature>
<id>org.jaggeryjs.modules.i18n.feature.group</id>
<version>${i18n.feature.version}</version>
</feature>
<feature> <feature>
<id>org.jaggeryjs.modules.jaggery-test.feature.group</id> <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
<version>${jaggery-test.feature.version}</version> <version>${jaggery-test.feature.version}</version>

Loading…
Cancel
Save