mariusz.pacek/keycloak
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2942 from stianst/master

Browse Source 
Refactor authz changelog in to separate authz-master.xml
This commit is contained in:
Stian Thorgersen authored and GitHub committed 2016-06-17 15:26:43 +02:00
2 parents 8f3cfed7c5 1a9fada964
commit 111bcb7433
4 files changed
+4 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

model/jpa/src/main/resources/META-INF/jpa-authz-changelog-2.0.0.xml → model/jpa/src/main/resources/META-INF/jpa-changelog-authz-2.0.0.xml
+1 -2
View File
@@ -18,8 +18,7 @@
-->
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.2.xsd">
<!-- Authorization -->
<changeSet author="psilva@redhat.com" id="2.0.0">
<changeSet author="psilva@redhat.com" id="authz-2.0.0">
<createTable tableName="RESOURCE_SERVER">
<column name="ID" type="VARCHAR(36)">
<constraints nullable="false"/>
model/jpa/src/main/resources/META-INF/jpa-changelog-2.0.0.xml → model/jpa/src/main/resources/META-INF/jpa-changelog-authz-master.xml
+1 -1
View File
@@ -18,5 +18,5 @@
-->
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.2.xsd">
<include file="META-INF/jpa-authz-changelog-2.0.0.xml"/>
<include file="META-INF/jpa-changelog-authz-2.0.0.xml"/>
</databaseChangeLog>
model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
+2 -1
View File
@@ -32,5 +32,6 @@
<include file="META-INF/jpa-changelog-1.9.0.xml"/>
<include file="META-INF/jpa-changelog-1.9.1.xml"/>
<include file="META-INF/jpa-changelog-1.9.2.xml"/>
<include file="META-INF/jpa-changelog-2.0.0.xml"/>
<include file="META-INF/jpa-changelog-authz-master.xml"/>
</databaseChangeLog>
model/mongo/src/main/java/org/keycloak/authorization/mongo/adapter/PolicyAdapter.java
-6
View File
@@ -6,20 +6,14 @@ import org.keycloak.authorization.model.Resource;
import org.keycloak.authorization.model.ResourceServer;
import org.keycloak.authorization.model.Scope;
import org.keycloak.authorization.mongo.entities.PolicyEntity;
import org.keycloak.authorization.mongo.entities.ResourceEntity;
import org.keycloak.authorization.mongo.entities.ScopeEntity;
import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext;
import org.keycloak.models.mongo.keycloak.adapters.AbstractMongoAdapter;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import static javafx.scene.input.KeyCode.R;
/**
* @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
*/