Merge pull request #44 from Kamidu/master

change the formatter
revert-70aa11f8
Geeth 9 years ago
commit 5fd9e87dc8

@ -26,7 +26,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - OAuth Back End Authenticator </name> <name>WSO2 Carbon - OAuth Back End Authenticator</name>
<artifactId>org.wso2.carbon.identity.authenticator.backend.oauth</artifactId> <artifactId>org.wso2.carbon.identity.authenticator.backend.oauth</artifactId>
<dependencies> <dependencies>
@ -89,14 +89,15 @@
<Bundle-Name>${pom.artifactId}</Bundle-Name> <Bundle-Name>${pom.artifactId}</Bundle-Name>
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>Identity backend Bundle</Bundle-Description> <Bundle-Description>Identity backend Bundle</Bundle-Description>
<Bundle-Activator>org.wso2.carbon.identity.authenticator.backend.oauth.internal.OauthAuthenticatorServiceComponent</Bundle-Activator> <Bundle-Activator>
org.wso2.carbon.identity.authenticator.backend.oauth.internal.OauthAuthenticatorServiceComponent
</Bundle-Activator>
<Private-Package> <Private-Package>
org.wso2.org.wso2.carbon.identity.authenticator.backend.oauth.internal org.wso2.org.wso2.carbon.identity.authenticator.backend.oauth.internal
</Private-Package> </Private-Package>
<Export-Package> <Export-Package>
org.wso2.carbon.identity.authenticator.backend.oauth.* org.wso2.carbon.identity.authenticator.backend.oauth.*
</Export-Package> </Export-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>

@ -742,7 +742,7 @@ public class PolicyDAOImpl implements PolicyDAO {
try { try {
conn = this.getConnection(); conn = this.getConnection();
String query = "UPDATE DM_POLICY SET NAME = ?, PROFILE_ID = ?, PRIORITY = ?, COMPLIANCE = ?," + String query = "UPDATE DM_POLICY SET NAME = ?, PROFILE_ID = ?, PRIORITY = ?, COMPLIANCE = ?," +
" UPDATED = ?, DESCRIPTION = ? WHERE ID = ? AND TENANT_ID = ?"; " UPDATED = ?, DESCRIPTION = ?, OWNERSHIP_TYPE = ? WHERE ID = ? AND TENANT_ID = ?";
stmt = conn.prepareStatement(query); stmt = conn.prepareStatement(query);
stmt.setString(1, policy.getPolicyName()); stmt.setString(1, policy.getPolicyName());
stmt.setInt(2, policy.getProfile().getProfileId()); stmt.setInt(2, policy.getProfile().getProfileId());
@ -750,8 +750,9 @@ public class PolicyDAOImpl implements PolicyDAO {
stmt.setString(4, policy.getCompliance()); stmt.setString(4, policy.getCompliance());
stmt.setInt(5, 1); stmt.setInt(5, 1);
stmt.setString(6, policy.getDescription()); stmt.setString(6, policy.getDescription());
stmt.setInt(7, policy.getId()); stmt.setString(7, policy.getOwnershipType());
stmt.setInt(8, tenantId); stmt.setInt(8, policy.getId());
stmt.setInt(9, tenantId);
stmt.executeUpdate(); stmt.executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {

Loading…
Cancel
Save