Skip to content
This repository has been archived by the owner on Oct 5, 2021. It is now read-only.

Commit

Permalink
changing package folder names
Browse files Browse the repository at this point in the history
  • Loading branch information
@hpmtissera
hpmtissera committed Jul 24, 2015
1 parent 763a66d commit 5d9cc26
Show file tree
Hide file tree
Showing 64 changed files with 38 additions and 168 deletions.
0 ...dentity.authenticator.iwa.feature/pom.xml → ...dentity.authenticator.iwa.feature/pom.xml
View file
File renamed without changes.
0 ....authenticator.iwa.server.feature/pom.xml → ....authenticator.iwa.server.feature/pom.xml
View file
File renamed without changes.
0 ...tity.authenticator.iwa.ui.feature/pom.xml → ...tity.authenticator.iwa.ui.feature/pom.xml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../authenticators/iwa-authenticator/pom.xml → ...-authenticators/iwa-authenticator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>authenticator-features</artifactId>
<artifactId>carbon-authenticator-features</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion features/authenticators/pom.xml → features/carbon-authenticators/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>authenticator-features</artifactId>
<artifactId>carbon-authenticator-features</artifactId>
<packaging>pom</packaging>
<name>WSO2 Carbon - Authenticator Feature Aggregator Module</name>
<url>http://wso2.org</url>
Expand Down
0 ...y.authenticator.saml2.sso.feature/pom.xml → ...y.authenticator.saml2.sso.feature/pom.xml
View file
File renamed without changes.
0 ...nticator.saml2.sso.server.feature/pom.xml → ...nticator.saml2.sso.server.feature/pom.xml
View file
File renamed without changes.
0 ...uthenticator.saml2.sso.ui.feature/pom.xml → ...uthenticator.saml2.sso.ui.feature/pom.xml
View file
File renamed without changes.
0 features/authenticators/saml2-sso/pom.xml → ...s/carbon-authenticators/saml2-sso/pom.xml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...org.wso2.carbon.claim.mgt.feature/pom.xml → ...org.wso2.carbon.claim.mgt.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>claim-management-feature</artifactId>
<artifactId>claim-mgt-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion ...2.carbon.claim.mgt.server.feature/pom.xml → ...2.carbon.claim.mgt.server.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>claim-management-feature</artifactId>
<artifactId>claim-mgt-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
0 ...server.feature/resources/build.properties → ...server.feature/resources/build.properties
View file
File renamed without changes.
0 ...r.feature/resources/conf/claim-config.xml → ...r.feature/resources/conf/claim-config.xml
View file
File renamed without changes.
0 ...claim.mgt.server.feature/resources/p2.inf → ...claim.mgt.server.feature/resources/p2.inf
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ....wso2.carbon.claim.mgt.ui.feature/pom.xml → ....wso2.carbon.claim.mgt.ui.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>claim-management-feature</artifactId>
<artifactId>claim-mgt-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion features/claim-management/pom.xml → features/claim-mgt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>claim-management-feature</artifactId>
<artifactId>claim-mgt-feature</artifactId>
<packaging>pom</packaging>
<name>WSO2 Carbon - Claim Management Feature Aggregator Module</name>
<url>http://wso2.org</url>
Expand Down
0 ...bon.directory.service.mgr.feature/pom.xml → ...bon.directory.service.mgr.feature/pom.xml
View file
File renamed without changes.
0 ...ectory.service.mgr.server.feature/pom.xml → ...ectory.service.mgr.server.feature/pom.xml
View file
File renamed without changes.
0 ....directory.service.mgr.ui.feature/pom.xml → ....directory.service.mgr.ui.feature/pom.xml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion features/ldap-server-manager/pom.xml → features/directory-server-manager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ldap-server-manager</artifactId>
<artifactId>directory-server-manager</artifactId>
<packaging>pom</packaging>
<name>WSO2 Carbon - LDAP Server Principle Management</name>
<url>http://wso2.org</url>
Expand Down
11 changes: 0 additions & 11 deletions features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,6 @@

<!-- Security configurations -->
<Security>
<UserTrustedRPStore>
<Location>${carbon.home}/repository/resources/security/userRP.jks
</Location>
<!-- Keystore type (JKS/PKCS12 etc.) -->
<Type>JKS</Type>
<!-- Keystore password -->
<Password>wso2carbon</Password>
<!-- Private Key password -->
<KeyPassword>wso2carbon</KeyPassword>
</UserTrustedRPStore>

<!-- The directory under which all other KeyStore files will be stored -->
<KeyStoresDir>${carbon.home}/conf/keystores</KeyStoresDir>
</Security>
Expand Down
Binary file removed ...ntity-provider/org.wso2.carbon.identity.provider.server.feature/resources/conf/userRP.jks
View file
Binary file not shown.
Binary file removed ...der/org.wso2.carbon.identity.provider.server.feature/resources/conf/wso2is-user-certs.jks
View file
Binary file not shown.
3 changes: 1 addition & 2 deletions features/ldap-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
<url>http://wso2.org</url>

<modules>
<module>org.wso2.carbon.ldap.server.feature</module>
<module>org.wso2.carbon.ldap.server.server.feature</module>

</modules>

</project>
Expand Down
2 changes: 1 addition & 1 deletion ....identity.provider.server.feature/pom.xml → ....identity.provider.server.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>identity-provider-feature</artifactId>
<artifactId>openid-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
0 ...server.feature/resources/build.properties → ...server.feature/resources/build.properties
View file
File renamed without changes.
0 ...er.server.feature/resources/conf/card.jpg → ...er.server.feature/resources/conf/card.jpg
View file
File renamed without changes
0 ...resources/conf/saml1-assertion-config.xml → ...resources/conf/saml1-assertion-config.xml
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions ....provider.server.feature/resources/p2.inf → ....provider.server.feature/resources/p2.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../depl
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.identity.provider.server_${feature.version}/conf/saml1-assertion-config.xml,target:${installFolder}/../../conf/saml1-assertion-config.xml,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.identity.provider.server_${feature.version}/conf/card.jpg,target:${installFolder}/../../conf/card.jpg,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.identity.provider.server_${feature.version}/conf/userRP.jks,target:${installFolder}/../../resources/security/userRP.jks,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.identity.provider.server_${feature.version}/conf/wso2is-user-certs.jks,target:${installFolder}/../../resources/security/wso2is-user-certs.jks,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.identity.provider.server_${feature.version}/authenticationendpoint.war,target:${installFolder}/../../deployment/server/webapps/authenticationendpoint.war,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.identity.provider.server_${feature.version}/authenticationendpoint.war,target:${installFolder}/../../deployment/server/webapps/authenticationendpoint.war,overwrite:true);\
2 changes: 1 addition & 1 deletion features/identity-provider/pom.xml → features/openid/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>identity-provider-feature</artifactId>
<artifactId>openid-feature</artifactId>
<packaging>pom</packaging>
<name>WSO2 Carbon - Identity Provider Feature Aggregator Module</name>
<url>http://wso2.org</url>
Expand Down
2 changes: 1 addition & 1 deletion ...g.connector.google.server.feature/pom.xml → ...g.connector.google.server.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>identity-provisioning-feature</artifactId>
<artifactId>provisioning-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion ...nnector.salesforce.server.feature/pom.xml → ...nnector.salesforce.server.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>identity-provisioning-feature</artifactId>
<artifactId>provisioning-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion ...ing.connector.scim.server.feature/pom.xml → ...ing.connector.scim.server.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>identity-provisioning-feature</artifactId>
<artifactId>provisioning-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion ...ing.connector.spml.server.feature/pom.xml → ...ing.connector.spml.server.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>identity-provisioning-feature</artifactId>
<artifactId>provisioning-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion ...ntity.provisioning.server.feature/pom.xml → ...ntity.provisioning.server.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>identity-provisioning-feature</artifactId>
<artifactId>provisioning-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion features/identity-provisioning/pom.xml → features/provisioning/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>identity-provisioning-feature</artifactId>
<artifactId>provisioning-feature</artifactId>
<packaging>pom</packaging>
<name>WSO2 Carbon - Identity Provisioning Feature</name>
<url>http://wso2.org</url>
Expand Down
41 changes: 0 additions & 41 deletions features/remote-usermgt/pom.xml
View file

This file was deleted.

Empty file removed ...es/self-registration/org.wso2.carbon.identity.self.registration.ui (copy).feature/pom.xml
View file
Empty file.
41 changes: 0 additions & 41 deletions features/self-registration/pom.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...tity.tools.saml.validator.feature/pom.xml → ...tity.tools.saml.validator.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>tools-saml-feature</artifactId>
<artifactId>tools-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion ...ols.saml.validator.server.feature/pom.xml → ...ols.saml.validator.server.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>tools-saml-feature</artifactId>
<artifactId>tools-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion ...y.tools.saml.validator.ui.feature/pom.xml → ...y.tools.saml.validator.ui.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>tools-saml-feature</artifactId>
<artifactId>tools-feature</artifactId>
<version>4.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion features/tools-saml/pom.xml → features/tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>tools-saml-feature</artifactId>
<artifactId>tools-feature</artifactId>
<packaging>pom</packaging>
<name>WSO2 Carbon - SAML Validator Feature Aggregator Module</name>
<url>http://wso2.org</url>
Expand Down
0 ...dentity.self.registration.feature/pom.xml → ...dentity.self.registration.feature/pom.xml
View file
File renamed without changes.
0 ....self.registration.server.feature/pom.xml → ....self.registration.server.feature/pom.xml
View file
File renamed without changes.
0 ...tity.self.registration.ui.feature/pom.xml → ...tity.self.registration.ui.feature/pom.xml
View file
File renamed without changes.
0 ...bon.identity.user.profile.feature/pom.xml → ...bon.identity.user.profile.feature/pom.xml
View file
File renamed without changes.
0 ...ntity.user.profile.server.feature/pom.xml → ...ntity.user.profile.server.feature/pom.xml
View file
File renamed without changes.
0 ....identity.user.profile.ui.feature/pom.xml → ....identity.user.profile.ui.feature/pom.xml
View file
File renamed without changes.
0 ...g.wso2.carbon.ldap.server.feature/pom.xml → ...g.wso2.carbon.ldap.server.feature/pom.xml
View file
File renamed without changes.
0 ...carbon.ldap.server.server.feature/pom.xml → ...carbon.ldap.server.server.feature/pom.xml
View file
File renamed without changes.
0 ...server.feature/resources/build.properties → ...server.feature/resources/build.properties
View file
File renamed without changes.
0 ....feature/resources/conf/embedded-ldap.xml → ....feature/resources/conf/embedded-ldap.xml
View file
File renamed without changes.
0 ...eature/resources/conf/identityPerson.ldif → ...eature/resources/conf/identityPerson.ldif
View file
File renamed without changes.
0 ...ture/resources/conf/is-default-schema.zip → ...ture/resources/conf/is-default-schema.zip
View file
File renamed without changes.
0 ...er.feature/resources/conf/scimPerson.ldif → ...er.feature/resources/conf/scimPerson.ldif
View file
File renamed without changes.
0 ...er.feature/resources/conf/wso2Person.ldif → ...er.feature/resources/conf/wso2Person.ldif
View file
File renamed without changes.
0 ...ap.server.server.feature/resources/p2.inf → ...ap.server.server.feature/resources/p2.inf
View file
File renamed without changes.
0 ...rbon.um.ws.service.client.feature/pom.xml → ...rbon.um.ws.service.client.feature/pom.xml
View file
File renamed without changes.
0 ...wso2.carbon.um.ws.service.feature/pom.xml → ...wso2.carbon.um.ws.service.feature/pom.xml
View file
File renamed without changes.
0 ...rbon.um.ws.service.server.feature/pom.xml → ...rbon.um.ws.service.server.feature/pom.xml
View file
File renamed without changes.
11 changes: 11 additions & 0 deletions features/user-mgt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,16 @@
<module>org.wso2.carbon.user.mgt.ui.feature</module>
<module>org.wso2.carbon.user.mgt.server.feature</module>
<module>org.wso2.carbon.user.mgt.feature</module>
<module>org.wso2.carbon.identity.self.registration.server.feature</module>
<module>org.wso2.carbon.identity.self.registration.ui.feature</module>
<module>org.wso2.carbon.identity.self.registration.feature</module>
<module>org.wso2.carbon.um.ws.service.server.feature</module>
<module>org.wso2.carbon.um.ws.service.client.feature</module>
<module>org.wso2.carbon.um.ws.service.feature</module>
<module>org.wso2.carbon.ldap.server.feature</module>
<module>org.wso2.carbon.ldap.server.server.feature</module>
<module>org.wso2.carbon.identity.user.profile.ui.feature</module>
<module>org.wso2.carbon.identity.user.profile.server.feature</module>
<module>org.wso2.carbon.identity.user.profile.feature</module>
</modules>
</project>
41 changes: 0 additions & 41 deletions features/user-profiles/pom.xml
View file

This file was deleted.

16 changes: 6 additions & 10 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,11 @@
<module>components/security-mgt</module>
<module>components/sts</module>
<module>features/security-mgt</module>
<module>features/authenticators</module>
<module>features/claim-management</module>
<module>features/carbon-authenticators</module>
<module>features/claim-mgt</module>
<module>features/identity-core</module>
<module>features/identity-provider</module>
<module>features/openid</module>
<module>features/identity-mgt</module>
<module>features/self-registration</module>
<module>features/user-profiles</module>
<module>features/xacml</module>
<module>features/oauth</module>
<module>features/sso-saml</module>
Expand All @@ -78,15 +76,13 @@
<module>features/application-authenticators</module>
<module>features/scim</module>
<module>features/application-mgt</module>
<module>features/identity-provisioning</module>
<module>features/tools-saml</module>
<module>features/provisioning</module>
<module>features/tools</module>
<module>features/thrift</module>
<module>features/notification-mgt</module>
<module>features/user-account-association</module>
<module>features/idp-mgt</module>
<module>features/ldap-server</module>
<module>features/remote-usermgt</module>
<module>features/ldap-server-manager</module>
<module>features/directory-server-manager</module>
<module>features/sts</module>
<module>features/user-mgt</module>
</modules>
Expand Down

0 comments on commit 5d9cc26

Please sign in to comment.