Prosoft Git

keycloak-aplcache

Merge pull request #2954 from stianst/master KEYCLOAK-3093 …

6/22/2016 10:11:38 AM
Stian Thorgersen

Stian Thorgersen

Commit: 5890f7c

Tree: d6bd08e

Parents: 6e4abe1
107830b

Changes

distribution/api-docs-dist/assembly.xml 8(+0 -8)

distribution/api-docs-dist/pom.xml 4(+2 -2)

distribution/api-docs-dist/src/index.html 14(+1 -13)

distribution/demo-dist/assembly.xml 4(+0 -4)

distribution/demo-dist/pom.xml 22(+0 -22)

distribution/docs-dist/build.xml 139(+0 -139)

distribution/downloads/pom.xml 4(+2 -2)

distribution/pom.xml 2(+1 -1)

docbook/auth-server-docs/pom.xml 159(+0 -159)

docbook/auth-server-docs/reference/en/en-US/master.xml 182(+0 -182)

docbook/auth-server-docs/reference/en/en-US/modules/access-types.xml 71(+0 -71)

docbook/auth-server-docs/reference/en/en-US/modules/adapter_error_handling.xml 75(+0 -75)

docbook/auth-server-docs/reference/en/en-US/modules/adapter-config.xml 421(+0 -421)

docbook/auth-server-docs/reference/en/en-US/modules/adapter-context.xml 12(+0 -12)

docbook/auth-server-docs/reference/en/en-US/modules/admin-permissions.xml 102(+0 -102)

docbook/auth-server-docs/reference/en/en-US/modules/admin-rest-api.xml 35(+0 -35)

docbook/auth-server-docs/reference/en/en-US/modules/application-clustering.xml 253(+0 -253)

docbook/auth-server-docs/reference/en/en-US/modules/auth-spi.xml 1030(+0 -1030)

docbook/auth-server-docs/reference/en/en-US/modules/cache.xml 81(+0 -81)

docbook/auth-server-docs/reference/en/en-US/modules/client-registration.xml 232(+0 -232)

docbook/auth-server-docs/reference/en/en-US/modules/clients.xml 57(+0 -57)

docbook/auth-server-docs/reference/en/en-US/modules/clustering.xml 235(+0 -235)

docbook/auth-server-docs/reference/en/en-US/modules/cors.xml 72(+0 -72)

docbook/auth-server-docs/reference/en/en-US/modules/custom-attributes.xml 167(+0 -167)

docbook/auth-server-docs/reference/en/en-US/modules/direct-access.xml 185(+0 -185)

docbook/auth-server-docs/reference/en/en-US/modules/email.xml 57(+0 -57)

docbook/auth-server-docs/reference/en/en-US/modules/events.xml 120(+0 -120)

docbook/auth-server-docs/reference/en/en-US/modules/export-import.xml 160(+0 -160)

docbook/auth-server-docs/reference/en/en-US/modules/fuse-adapter.xml 69(+0 -69)

docbook/auth-server-docs/reference/en/en-US/modules/groups.xml 48(+0 -48)

docbook/auth-server-docs/reference/en/en-US/modules/identity-broker.xml 1551(+0 -1551)

docbook/auth-server-docs/reference/en/en-US/modules/installed-applications.xml 42(+0 -42)

docbook/auth-server-docs/reference/en/en-US/modules/jaas.xml 59(+0 -59)

docbook/auth-server-docs/reference/en/en-US/modules/javascript-adapter.xml 429(+0 -429)

docbook/auth-server-docs/reference/en/en-US/modules/jboss-adapter.xml 303(+0 -303)

docbook/auth-server-docs/reference/en/en-US/modules/jetty8-adapter.xml 67(+0 -67)

docbook/auth-server-docs/reference/en/en-US/modules/jetty9-adapter.xml 173(+0 -173)

docbook/auth-server-docs/reference/en/en-US/modules/kerberos.xml 297(+0 -297)

docbook/auth-server-docs/reference/en/en-US/modules/License.xml 24(+0 -24)

docbook/auth-server-docs/reference/en/en-US/modules/logout.xml 26(+0 -26)

docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml 675(+0 -675)

docbook/auth-server-docs/reference/en/en-US/modules/multi-tenancy.xml 73(+0 -73)

docbook/auth-server-docs/reference/en/en-US/modules/openshift.xml 87(+0 -87)

docbook/auth-server-docs/reference/en/en-US/modules/Overview.xml 188(+0 -188)

docbook/auth-server-docs/reference/en/en-US/modules/per-realm-admin-permissions.xml 82(+0 -82)

docbook/auth-server-docs/reference/en/en-US/modules/protocol-mappers.xml 34(+0 -34)

docbook/auth-server-docs/reference/en/en-US/modules/providers.xml 410(+0 -410)

docbook/auth-server-docs/reference/en/en-US/modules/proxy.xml 419(+0 -419)

docbook/auth-server-docs/reference/en/en-US/modules/recaptcha.xml 43(+0 -43)

docbook/auth-server-docs/reference/en/en-US/modules/roles.xml 48(+0 -48)

docbook/auth-server-docs/reference/en/en-US/modules/saml.xml 355(+0 -355)

docbook/auth-server-docs/reference/en/en-US/modules/security-vulnerabilities.xml 194(+0 -194)

docbook/auth-server-docs/reference/en/en-US/modules/server-installation.xml 1001(+0 -1001)

docbook/auth-server-docs/reference/en/en-US/modules/service-accounts.xml 75(+0 -75)

docbook/auth-server-docs/reference/en/en-US/modules/servlet-filter-adapter.xml 77(+0 -77)

docbook/auth-server-docs/reference/en/en-US/modules/social-config.xml 60(+0 -60)

docbook/auth-server-docs/reference/en/en-US/modules/social-facebook.xml 62(+0 -62)

docbook/auth-server-docs/reference/en/en-US/modules/social-github.xml 44(+0 -44)

docbook/auth-server-docs/reference/en/en-US/modules/social-google.xml 67(+0 -67)

docbook/auth-server-docs/reference/en/en-US/modules/social-spi.xml 29(+0 -29)

docbook/auth-server-docs/reference/en/en-US/modules/social-twitter.xml 55(+0 -55)

docbook/auth-server-docs/reference/en/en-US/modules/spring-boot-adapter.xml 89(+0 -89)

docbook/auth-server-docs/reference/en/en-US/modules/spring-security-adapter.xml 312(+0 -312)

docbook/auth-server-docs/reference/en/en-US/modules/themes.xml 318(+0 -318)

docbook/auth-server-docs/reference/en/en-US/modules/timeouts.xml 117(+0 -117)

docbook/auth-server-docs/reference/en/en-US/modules/tomcat-adapter.xml 109(+0 -109)

docbook/auth-server-docs/reference/en/en-US/modules/user-federation.xml 342(+0 -342)

docbook/auth-server-docs/reference/en/images/add-provider-dialog.png 0(+0 -0)

docbook/auth-server-docs/reference/en/images/add-provider-select.png 0(+0 -0)

docbook/auth-server-docs/reference/en/images/domain-mode.png 0(+0 -0)

docbook/auth-server-docs/reference/en/images/email-simple-example.png 0(+0 -0)

docbook/auth-server-docs/reference/en/images/identity_broker_flow.png 0(+0 -0)

docbook/auth-server-docs/reference/en/images/update-server-config-dialog.png 0(+0 -0)

docbook/auth-server-docs/reference/en/images/update-server-config-select.png 0(+0 -0)

docbook/pom.xml 37(+0 -37)

docbook/saml-adapter-docs/pom.xml 151(+0 -151)

docbook/saml-adapter-docs/reference/en/en-US/master.xml 84(+0 -84)

docbook/saml-adapter-docs/reference/en/en-US/modules/adapter_error_handling.xml 59(+0 -59)

docbook/saml-adapter-docs/reference/en/en-US/modules/adapter-config.xml 515(+0 -515)

docbook/saml-adapter-docs/reference/en/en-US/modules/assertion-api.xml 126(+0 -126)

docbook/saml-adapter-docs/reference/en/en-US/modules/debugging.xml 25(+0 -25)

docbook/saml-adapter-docs/reference/en/en-US/modules/idp-registration.xml 24(+0 -24)

docbook/saml-adapter-docs/reference/en/en-US/modules/jboss-adapter.xml 293(+0 -293)

docbook/saml-adapter-docs/reference/en/en-US/modules/jetty8-adapter.xml 66(+0 -66)

docbook/saml-adapter-docs/reference/en/en-US/modules/jetty9-adapter.xml 123(+0 -123)

docbook/saml-adapter-docs/reference/en/en-US/modules/logout.xml 27(+0 -27)

docbook/saml-adapter-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml 38(+0 -38)

docbook/saml-adapter-docs/reference/en/en-US/modules/multi-tenancy.xml 73(+0 -73)

docbook/saml-adapter-docs/reference/en/en-US/modules/overview.xml 26(+0 -26)

docbook/saml-adapter-docs/reference/en/en-US/modules/servlet-filter-adapter.xml 84(+0 -84)

docbook/saml-adapter-docs/reference/en/en-US/modules/tomcat-adapter.xml 109(+0 -109)

pom.xml 3(+1 -2)

Details

distribution/demo-dist/assembly.xml 4(+0 -4) 

diff --git a/distribution/demo-dist/assembly.xml b/distribution/demo-dist/assembly.xml
index 56e5818..4c58b7d 100755
--- a/distribution/demo-dist/assembly.xml
+++ b/distribution/demo-dist/assembly.xml
@@ -61,10 +61,6 @@
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-docs-${project.version}</directory>
-            <outputDirectory>docs</outputDirectory>
-        </fileSet>
-        <fileSet>
             <directory>${project.build.directory}/unpacked/keycloak-examples-${project.version}</directory>
             <outputDirectory>examples</outputDirectory>
         </fileSet>

distribution/demo-dist/pom.xml 22(+0 -22) 

diff --git a/distribution/demo-dist/pom.xml b/distribution/demo-dist/pom.xml
index 76ec682..72e7fa4 100755
--- a/distribution/demo-dist/pom.xml
+++ b/distribution/demo-dist/pom.xml
@@ -50,11 +50,6 @@
             <artifactId>keycloak-examples-dist</artifactId>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-docs-dist</artifactId>
-            <type>zip</type>
-        </dependency>
     </dependencies>
 
     <build>
@@ -140,23 +135,6 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>unpack-docs</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.keycloak</groupId>
-                                    <artifactId>keycloak-docs-dist</artifactId>
-                                    <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
                         <id>unpack-examples</id>
                         <phase>prepare-package</phase>
                         <goals>

distribution/downloads/pom.xml 4(+2 -2) 

diff --git a/distribution/downloads/pom.xml b/distribution/downloads/pom.xml
index 3e1e7f1..d45ad89 100755
--- a/distribution/downloads/pom.xml
+++ b/distribution/downloads/pom.xml
@@ -102,9 +102,9 @@
 
                                 <artifactItem>
                                     <groupId>org.keycloak</groupId>
-                                    <artifactId>keycloak-docs-dist</artifactId>
+                                    <artifactId>keycloak-api-docs-dist</artifactId>
                                     <type>zip</type>
-                                    <destFileName>keycloak-docs-${project.version}.zip</destFileName>
+                                    <destFileName>keycloak-api-docs-${project.version}.zip</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.keycloak</groupId>

distribution/pom.xml 2(+1 -1) 

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 707733c..1a071bc 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -35,7 +35,7 @@
         <module>adapters</module>
         <module>saml-adapters</module>
         <module>demo-dist</module>
-        <module>docs-dist</module>
+        <module>api-docs-dist</module>
         <module>examples-dist</module>
         <module>proxy-dist</module>
         <module>server-dist</module>

pom.xml 3(+1 -2) 

diff --git a/pom.xml b/pom.xml
index 1b2dd37..42df2d8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1081,7 +1081,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-docs-dist</artifactId>
+                <artifactId>keycloak-api-docs-dist</artifactId>
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>
@@ -1395,7 +1395,6 @@
         <profile>
             <id>jboss-release</id>
             <modules>
-                <module>docbook</module>
                 <module>distribution</module>
             </modules>
         </profile>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github