libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions
12473 commits 4 branches 5 tags 483 MiB
Commit graph

679 commits

Author SHA1 Message Date
Stian Thorgersen
107830bd2c KEYCLOAK-3093 Remove documentation from main repository 2016-06-22 13:40:21 +02:00
Pedro Igor
d5167c1632 [KEYCLOAK-3134] - Remove 'org.keycloak.keycloak-authz-server' module 2016-06-20 11:54:32 -03:00
Pedro Igor
6a1fb8f870 [KEYCLOAK-3132] - Single module for common policy providers 2016-06-17 20:38:03 -03:00
Pedro Igor
086c29112a [KEYCLOAK-2753] - Fine-grained Authorization Services 2016-06-17 02:07:34 -03:00
Stian Thorgersen
087f84bfff Merge pull request #2901 from mposolda/master 
KEYCLOAK-3065 Remove 'provider' from realmCache in keycloak-server.js…
 2016-06-02 14:58:16 +02:00
Pedro Igor
0ad86b3a53 [KEYCLOAK-3069] - Adding javax.xml.soap.api dependency 2016-06-01 16:57:06 -03:00
mposolda
fd2fc34386 KEYCLOAK-3065 Remove 'provider' from realmCache in keycloak-server.json to have 'enabled' switch working 2016-06-01 17:25:51 +02:00
Paolo Antinori
d35f8c1905 KEYCLOAK-2805 - Update docs for JBoss Fuse 6.3 2016-05-05 15:22:14 +02:00
Paolo Antinori
f5f36545f3 KEYCLOAK-2805 - Support for JBoss Fuse 6.3 
Upgrade of CXF, Jetty and Pax-Web required to rewrite part of the integration.
 2016-05-05 15:21:51 +02:00
Bill Burke
43e88b4d73 Merge pull request #2755 from patriot1burke/master 
add bind addresses to domain template
 2016-04-27 22:09:07 -04:00
Bill Burke
c52da46e54 add bind addresses to domain template 2016-04-27 22:05:01 -04:00
Bill Burke
15f4c764bc Merge pull request #2752 from patriot1burke/master 
KEYCLOAK-2922 KEYCLOAK-2920
 2016-04-27 11:37:20 -04:00
Bill Burke
cd8ba1653d KEYCLOAK-2922 KEYCLOAK-2920 2016-04-27 10:36:36 -04:00
Stian Thorgersen
8d9047c338 KEYCLOAK-2927 Rename add-user script to add-user-keycloak 2016-04-27 16:18:42 +02:00
Stian Thorgersen
0008d50dfa KEYCLOAK-2827 ModuleLoadError: org.keycloak.keycloak-core-public:main 2016-04-14 15:23:21 +02:00
Stian Thorgersen
9ef29b6a3e KEYCLOAK-2825 KEYCLOAK-2826 Remove private for org.keycloak.keycloak-adapter-core and org.keycloak.keycloak-adapter-spi modules 2016-04-14 14:41:40 +02:00
Bill Burke
b080e1e782 merge adapter-spi adapter-spi-public 2016-04-13 22:25:30 -04:00
Stian Thorgersen
6a428c8ee7 KEYCLOAK-2810 Added robots.txt and robots meta header 2016-04-13 11:22:57 +02:00
Bill Burke
7ec82ee7e2 public/private api 2016-04-12 16:48:30 -04:00
Bill Burke
cca91dd175 public/private 2016-04-12 15:19:46 -04:00
Stian Thorgersen
4a285bae9b KEYCLOAK-2748 
Mark modules as private
 2016-04-06 08:07:33 +02:00
Stian Thorgersen
7cea4f6695 KEYCLOAK-2652 Added fasterxml modules to as7 adapter dist 2016-04-05 08:02:32 +02:00
Stian Thorgersen
dcdef4daa4 Minor update to themes README.txt 2016-04-04 15:26:04 +02:00
Stian Thorgersen
23091ec738 KEYCLOAK-2657 Remove copyright.txt and README.txt from server dist 2016-03-22 07:28:45 +00:00
Stian Thorgersen
28fe13a800 Next is 2.0.0.CR1 2016-03-10 08:13:00 +01:00
Stian Thorgersen
d722e53108 Next is 1.9.2.Final 2016-03-10 07:28:27 +01:00
mposolda
aae550a7c7 KEYCLOAK-1928 Remove sun.jdk.jgss module 2016-02-26 09:16:39 +01:00
Bill Burke
9488787986 Merge remote-tracking branch 'upstream/master' 2016-02-23 14:36:30 -05:00
mposolda
4d82cc92fe Fix fuse adapter 2016-02-23 11:19:34 +01:00
Stian Thorgersen
0fc9cb78d5 KEYCLOAK-2525 
Built-in themes not loaded from modules
 2016-02-23 09:51:22 +01:00
Stian Thorgersen
a1d9753ec2 Next is 1.9.1.Final-SNAPSHOT 2016-02-23 08:48:26 +01:00
Bill Burke
599faa454b Merge remote-tracking branch 'upstream/master' 2016-02-22 17:17:01 -05:00
Stian Thorgersen
4fd97091ff Version bump to 2.0.0.CR1-SNAPSHOT 2016-02-22 11:36:56 +01:00
Stian Thorgersen
d21a01280b KEYCLOAK-2482 
Themes doesn't support patching
 2016-02-22 10:01:42 +01:00
Stian Thorgersen
38ce5e069c Merge pull request #2237 from lkubik/restructurizeParents 
Update parent poms structure
 2016-02-22 08:01:58 +00:00
Bill Burke
c45524d8d4 caching 2016-02-19 15:44:19 -05:00
Marko Strukelj
75d74890ca KEYCLOAK-2483 Modules are in wrong location 2016-02-18 15:41:57 +01:00
Lukas Kubik
d22f4cb08c Update parent poms 2016-02-17 16:35:29 +00:00
mposolda
e237bcd383 KEYCLOAK-2412 wildfly configs and polishing 2016-02-17 13:10:51 +01:00
Stian Thorgersen
5bc3ee0e8c KEYCLOAK-2493 
Set default theme based on product name
 2016-02-16 18:05:06 +01:00
Bill Burke
f2bd50335a errors 2016-02-10 20:47:27 -05:00
Bill Burke
84949bb51f concurrency 2016-02-10 14:09:29 -05:00
Stian Thorgersen
98bd0b003e KEYCLOAK-2450 
WildFly adapter script should support offline installation of adapter
 2016-02-08 19:39:15 +01:00
Stian Thorgersen
579ab56a5a Bump version to 1.9.0.Final-SNAPSHOT 2016-02-04 15:55:11 +01:00
Stian Thorgersen
eae52a563c Merge pull request #2169 from stianst/master 
KEYCLOAK-2441
 2016-02-03 16:53:14 +01:00
mposolda
a707aa945f Fix fuse packaging and example 2016-02-03 16:09:06 +01:00
Stian Thorgersen
1bcc305392 Remove eap6 overlay from downloads bundle 2016-02-03 15:40:38 +01:00
Stian Thorgersen
60872dd8dd KEYCLOAK-2433 
ClassNotFoundException: javax.ws.rs.core.Response from Module 'org.keycloak.keycloak-server-spi:main'
 2016-02-03 12:25:31 +01:00
Stian Thorgersen
c7a8742a36 KEYCLOAK-1524 
Source code headers
 2016-02-03 11:20:22 +01:00
Stian Thorgersen
747d110da0 KEYCLOAK-2421 
Remove aesh module from server feature pack
 2016-02-02 10:54:54 +01:00
Stian Thorgersen
52048a6060 KEYCLOAK-2312 Move forms/common-themes to themes 2016-01-21 13:51:01 +01:00
Stian Thorgersen
bfdc18f482 KEYCLOAK-2369 
Account page doesn't load
 2016-01-21 12:34:41 +01:00
Bill Burke
d9487a8745 social broker reorg 2016-01-20 16:46:38 -05:00
Bill Burke
01f3c6ceb7 reorg event log/email 2016-01-20 15:38:09 -05:00
Bill Burke
ad33d3c0d8 infinispan reorg 2016-01-20 14:52:04 -05:00
Stian Thorgersen
3dc090b893 KEYCLOAK-2185 Add support to disable realm and user cache, and added support to clear caches from admin console 2016-01-20 14:09:03 +01:00
Bill Burke
7d08d4c036 fixes 2016-01-19 18:11:45 -05:00
Bill Burke
4ed1eb66ee truststore httpclient 2016-01-19 17:29:16 -05:00
Bill Burke
17d856a5d8 mongo 2016-01-19 17:12:54 -05:00
Bill Burke
9b09a91481 consolidate JPA 2016-01-19 17:00:58 -05:00
Bill Burke
46634b386e reorg freemarker 2016-01-19 11:33:59 -05:00
Bill Burke
b0054b7682 email, login, account 2016-01-16 09:38:24 -05:00
Bill Burke
b403c9b934 broker and social 2016-01-16 09:15:17 -05:00
Bill Burke
5017d71383 exportimport and timer and events 2016-01-15 19:07:17 -05:00
Bill Burke
b93d55cb63 remove model-api, add server-spi 2016-01-15 18:44:17 -05:00
Stian Thorgersen
435980d776 KEYCLOAK-1809 
Upgrade jackson to version 2.x
 2016-01-14 16:34:30 +01:00
Stian Thorgersen
e572d45bea KEYCLOAK-2142 
Drop support to deploy server to EAP 6.4
 2016-01-13 14:32:04 +01:00
Stian Thorgersen
0193c696ab Version bump 2016-01-13 09:20:38 +01:00
Stian Thorgersen
1b0bf966b6 KEYCLOAK-2298 
Demo doesn't have add-user-keycloak.bat
 2016-01-12 19:46:34 +01:00
mposolda
6f262423f1 KEYCLOAK-2229 Fix NoClassDefFoundError when IdpEmailVerificationAuthenticator is used for link accounts during first broker login 2016-01-12 10:37:44 +01:00
Stian Thorgersen
81a0135fa6 KEYCLOAK-2229 
First broker login throws NoClassDefFoundError: org/keycloak/broker/provider/BrokeredIdentityContext
 2016-01-12 09:18:03 +01:00
Marko Strukelj
80e2b8eb39 KEYCLOAK-1717 Truststore SPI and file provider 2016-01-10 12:39:30 +01:00
Stian Thorgersen
a5c159eeff KEYCLOAK-2247 
Upgrade to WildFly 10.0.0.CR5
 2016-01-06 16:15:00 +01:00
Marko Strukelj
2a8e868bc1 Fix missing offlineSession local-cache config for demo-dist 2016-01-05 22:56:44 +01:00
Stian Thorgersen
392ce0b323 KEYCLOAK-2250 
Infinispan offline sessions cache is missing from configuration files
 2016-01-04 11:53:25 +01:00
Pedro Igor
1b614a379b [KEYCLOAK-2202] - Initial support for SAML ECP Profile. 2015-12-16 18:46:52 -02:00
Dane Barentine
de5baa9df7 KEYCLOAK-2229 Added depending on keycloak-broker-core module to resolve NoClassDefFoundError for BrokeredIdentityContext class 2015-12-15 11:15:55 -08:00
Marko Strukelj
32af1bd3a5 KEYCLOAK-2223 Upgrade to WildFly 10.0.0.CR4 2015-12-13 21:26:07 +01:00
Peter Palaga
4772b8401a KEYCLOAK-2099 fixup: Rename keycloak-wf9-subsystem directory to 
keycloak-wildfly-subsystem to match the WF module it contains
 2015-12-02 14:51:48 +01:00
Stian Thorgersen
ff806eae08 Version bump 2015-12-01 19:54:28 +01:00
Stian Thorgersen
8064c88e3c Merge pull request #1913 from stianst/KEYCLOAK-2175 
KEYCLOAK-2175
 2015-12-01 14:41:55 +01:00
Stian Thorgersen
f9b89df326 KEYCLOAK-2175 
WildFly server overlay includes aesh/main as well as aesh/0.65
 2015-12-01 14:32:05 +01:00
Stian Thorgersen
f6f6b6a258 KEYCLOAK-2174 javax/mail not found for DefaultEmailSenderProviderFactory 2015-12-01 13:49:22 +01:00
Stian Thorgersen
5a686c4260 KEYCLOAK-2158 
Add add-user-keycloak.sh to server overlays
 2015-11-30 14:03:54 +01:00
Marko Strukelj
2726db0be9 KEYCLOAK-2166 Name clash of bin/adapter-install.cli in adapter-dist and saml-adapter-dist 2015-11-30 12:53:51 +01:00
Stian Thorgersen
83fa03e8cc Merge pull request #1894 from mstruk/saml-subsystem 
KEYCLOAK-1924 SAML adapter full subsystem EAP/Wildfly
 2015-11-30 09:51:33 +01:00
Marko Strukelj
38d160fab2 KEYCLOAK-1924 SAML adapter full subsystem EAP/Wildfly 2015-11-27 22:49:35 +01:00
Marko Strukelj
373fc23fc0 KEYCLOAK-2099 WildFly 10 adapter subsystem 2015-11-27 20:46:20 +01:00
Stian Thorgersen
cfc28b861b KEYCLOAK-1758 add-user script 2015-11-24 21:54:58 +01:00
Bruno Oliveira
f7b1af7e11 Removal of module keycloak-connections-file 2015-11-13 13:44:15 -02:00
Bruno Oliveira
4b0e33e388 KEYCLOAK-2056: Removal of file model provider 2015-11-13 13:44:15 -02:00
Stian Thorgersen
15f1a38b51 KEYCLOAK-2055 
Invalid links in docs index.html
 2015-11-11 14:32:43 +01:00
Stian Thorgersen
d0c50fe56d KEYCLOAK-2037 Fix domain mode for server-dist 2015-11-06 08:44:50 +01:00
Stian Thorgersen
4f2fe0197d Fix saml examples not excluded from deploy 2015-10-23 08:48:43 +02:00
Stian Thorgersen
3f8312427a Version bump 2015-10-19 16:15:29 +02:00
Stian Thorgersen
df03f51563 KEYCLOAK-1984 
Examples includes pom.xml.releaseBackup
 2015-10-19 13:25:02 +02:00
mposolda
4587fd23b6 KEYCLOAK-1929 Change package names. Fix Fuse demo 2015-10-16 16:30:42 +02:00
Marko Strukelj
0c39e30241 KEYCLOAK-1849 Overlay installation scripts not working 
- fix unsupported dependency 'org.infinispan:main' warning
 2015-10-15 13:46:38 +02:00
Marko Strukelj
11a8d3842e KEYCLOAK-1849 Overlay installation scripts not working 2015-10-15 13:46:38 +02:00
Marek Posolda
68c3f2f65b Merge pull request #1726 from mposolda/master 
KEYCLOAK-904 Offline tokens storage changes. Added UserSessionPersisterProvider . offline sessions preloaded to cache at startup
 2015-10-14 14:24:54 +02:00
Stian Thorgersen
b907f8f92c Disable cli install scripts 2015-10-14 13:52:36 +02:00
mposolda
f92fe6bea9 KEYCLOAK-904 Offline tokens storage changes. Added UserSessionPersisterProvider . offline sessions preloaded to cache at startup 2015-10-14 11:07:44 +02:00
Stian Thorgersen
325072c74d KEYCLOAK-1849 KEYCLOAK-1958 Fix install scripts for overlays 2015-10-14 09:24:06 +02:00
Stian Thorgersen
4fbf6841be KEYCLOAK-1944 
Remove winzipaes import/export provider
 2015-10-12 14:43:52 +02:00
Stian Thorgersen
67d8ca0207 KEYCLOAK-1896 Search for users returns null values 2015-10-08 20:15:53 +02:00
Bill Burke
450e031da9 saml adapter docs 2015-10-07 16:20:59 -04:00
Bill Burke
1781588597 as7/eap saml adapter 2015-10-07 10:19:15 -04:00
Bill Burke
d40237b08d saml adapters docs/dist 2015-10-06 15:56:44 -04:00
Bill Burke
75343986b0 keycloak-common 2015-10-01 14:27:51 -04:00
Bill Burke
76e3c6394c saml sp distro 2015-09-30 16:36:21 -04:00
Bill Burke
d648ba73de wildfly saml distro 2015-09-30 11:56:21 -04:00
Bill Burke
07d3b26722 Merge remote-tracking branch 'upstream/master' 2015-09-30 11:01:55 -04:00
Bill Burke
510b03476f saml distro 2015-09-30 11:01:45 -04:00
Bill Burke
5ec73a81e9 Merge pull request #1651 from patriot1burke/master 
wf saml adapter first iter
 2015-09-30 08:39:45 -04:00
Stian Thorgersen
25a6fcc382 Set product name/version in keycloak-paren pom 2015-09-30 13:41:37 +02:00
Bill Burke
e277d5b55e wf saml adapter 2015-09-29 20:24:59 -04:00
Bill Burke
0a42a28eeb Merge remote-tracking branch 'upstream/master' 2015-09-25 15:12:34 -04:00
Bill Burke
88355d7eb4 tomcat6 adapter 2015-09-25 15:12:14 -04:00
Stian Thorgersen
75c0d5089f KEYCLOAK-1878 
Add Base64 to Keycloak core
 2015-09-25 07:02:25 +02:00
Bill Burke
546cdd7d8f fix modules for refactor 2015-09-24 12:05:12 -04:00
Bill Burke
c14d3d7963 merge conflicts 2015-09-23 21:01:47 -04:00
Stian Thorgersen
364aecda2a Merge pull request #1627 from stianst/master 
KEYCLOAK-1858
 2015-09-18 13:02:38 +02:00
Stian Thorgersen
9bfbac6be5 KEYCLOAK-1858 
JavaDoc aggregate fails during release if build not already executed
 2015-09-18 10:11:51 +02:00
Bill Burke
0f24bd2ea4 merge 2015-09-17 14:06:33 -04:00
Bill Burke
9dc54815eb Merge pull request #1616 from dbarentine/master 
Bug fixes
 2015-09-17 14:01:13 -04:00
Marko Strukelj
0c49fce78f KEYCLOAK-1241 Can't build release with Java 8 2015-09-15 21:22:43 +02:00
Dane Barentine
fe79c9b01e KEYCLOAK-1845 Fixed relative path error which was omitting the themes on the EAP overlay 2015-09-14 14:58:56 -07:00
Stian Thorgersen
3fd4d23bed Version bump 2015-09-09 11:27:21 +02:00
Bill Burke
333ad0efac refactor adapters 2015-09-04 15:56:28 -04:00
Stian Thorgersen
81928eb61a Updated release process docs 2015-08-18 13:48:21 +02:00
Stian Thorgersen
7665b9f81e KEYCLOAK-1703 Remove jpa and mongo user session providers 2015-08-13 08:57:37 +02:00
Stian Thorgersen
a8ad00156b KEYCLOAK-1702 Removed mem and none realm and user cache 2015-08-12 16:55:23 +02:00
mposolda
060a193b48 KEYCLOAK-1732 Fix standalone.xml in demo distribution 2015-08-05 13:33:11 +02:00
Stian Thorgersen
5d6cc61d4d KEYCLOAK-1702 KEYCLOAK-1703 Remove mem user session provider 2015-07-29 12:02:27 +02:00
Stian Thorgersen
f32b38cdbc KEYCLOAK-1702 KEYCLOAK-1703 Make Infinispan default user session and cache provider 2015-07-29 10:08:15 +02:00
Stian Thorgersen
f3bfb06dec Version bump 2015-07-28 10:20:40 +02:00
Stian Thorgersen
cbab3ff0d0 KEYCLOAK-1709 Add standalone-keycloak-ha.xml to server overlays 2015-07-27 14:31:40 +02:00
Stian Thorgersen
e89499f5db Fix xmlns for modules in feature packs 2015-07-24 16:45:27 +02:00
Stian Thorgersen
90d6991b9d KEYCLOAK-1691 Enable adapter subsystem to use with WildFly Swarm 2015-07-24 10:16:25 +02:00
Stian Thorgersen
efe2a8f789 Merge branch 'KEYCLOAK-1414-cli-script-adapters' of https://github.com/ssilvert/keycloak into ssilvert-KEYCLOAK-1414-cli-script-adapters 
Conflicts:
	docbook/reference/en/en-US/modules/jboss-adapter.xml
 2015-07-20 13:10:51 +02:00
Stian Thorgersen
69bbed999f Merge pull request #1466 from ssilvert/KEYCLOAK-1415-server-cli-script 
KEYCLOAK-1415 server cli script
 2015-07-20 13:08:13 +02:00
Stan Silvert
5bcf334bc5 Don't add security-domain to server. 2015-07-17 12:48:32 -04:00
Stan Silvert
ef49bd685e KEYCLOAK-1415 Add CLI scripts to WildFly and EAP overlay bundles. 2015-07-17 12:34:20 -04:00
Stan Silvert
092562fb94 KEYCLOAK-1414 Add CLI script for installing JBoss/WildFly/EAP adapters. 2015-07-17 12:23:10 -04:00
Stian Thorgersen
1642ac2394 KEYCLOAK-1385 Introduce end-of-line normalization 2015-07-17 13:46:51 +02:00
Marko Strukelj
fc7ba85639 KEYCLOAK-1345 Remove distribution/subsystem-war 2015-07-17 12:41:00 +02:00
Marko Strukelj
dcf8751ff7 KEYCLOAK-1331 Add product.conf and product module 2015-07-16 14:16:10 +02:00
Stian Thorgersen
e3da38df7c KEYCLOAK-1538 Deploy server feature pack to maven repo 2015-07-13 16:47:58 +02:00
Stian Thorgersen
a16079e38d Remove unused feature-packs-builds 2015-07-13 14:08:25 +02:00
Marko Strukelj
26190350c4 KEYCLOAK-1370 Empty module de.idyl.winzipaes in keycloak-server-dist 2015-07-13 12:42:06 +02:00
mposolda
69cc28dd4b KEYCLOAK-1531 LDAP example and update Kerberos example to use example embedded LDAP 2015-07-09 19:55:37 +02:00
Marko Strukelj
7ae62c1060 KEYCLOAK-1529 Drop InfinispanCacheActivator and make subsystem do it 2015-07-07 16:40:03 +02:00
Bill Burke
212f5b4082 Merge pull request #1410 from dbarentine/master 
Spec compliance, bug fixes
 2015-07-01 15:27:47 -04:00
mposolda
acc77e4e6c Remove ClientConnectionFilter filter mappings from web.xml in distribution 2015-06-24 11:10:22 +02:00
Dane Barentine
b9f5946cf0 [KEYCLOAK-1493] Added explicit dependency on keycloak-saml-core 2015-06-22 14:50:04 -07:00
Dane Barentine
c403968fa8 [KEYCLOAK-1493] Added explicit dependency on keycloak-saml-core 2015-06-22 11:07:29 -07:00
Stian Thorgersen
f19b6afd85 Fix demo-dist build prob 2015-06-17 13:53:11 +02:00
Stian Thorgersen
de6341bd87 Fix demo-dist build prob 2015-06-17 13:53:11 +02:00
Stian Thorgersen
5dc2b7b1d5 KEYCLOAK-1446 
Field ... of subresource ... will not be injected according to spec
 2015-06-16 14:02:21 +02:00
Stian Thorgersen
1b0c4e5d1f KEYCLOAK-1468 
Infinispan cache not available in JNDI
 2015-06-16 13:31:51 +02:00
Stian Thorgersen
b7e3fc5f73 Recover server-overlay name 2015-06-16 08:11:15 +02:00
Stian Thorgersen
cd762e5e8c Added wildfly extension to dist 2015-06-15 20:13:20 +02:00
Stian Thorgersen
f990d68cee Merge pull request #1380 from stianst/master 
Fixes
 2015-06-15 15:04:31 +01:00
Stian Thorgersen
eda64584d7 Update keycloak-server.json 2015-06-15 15:49:55 +02:00
Bill Burke
2f2a2dced6 Merge remote-tracking branch 'upstream/master' 2015-06-15 09:28:25 -04:00
Bill Burke
43bad9a608 merge 2015-06-15 09:02:15 -04:00
Stian Thorgersen
be5f3086ce KEYCLOAK-1449 Demo bundle doesn't include subsystem configuration 2015-06-15 15:01:22 +02:00
Stian Thorgersen
4c98b04ab7 KEYCLOAK-1447 LinkageError deploying oauth-client-cdi to WildFly 8.2.0.Final 2015-06-15 13:22:36 +02:00
Stian Thorgersen
6bc79b590c Renamed eap6 server overlay poms 2015-06-15 09:03:50 +02:00
Stian Thorgersen
38c1945ce4 Bump version 2015-06-12 14:35:34 +02:00
Stian Thorgersen
4ccc37abbb Add EAP6 standalone.xml to source instead of dl eap6 from techpreview repo 2015-06-12 14:20:08 +02:00
Marko Strukelj
9a37696d29 Fixed pom issues that were generating tons of Maven warnings 2015-06-11 16:57:33 +02:00
Marko Strukelj
92e17f4b40 KEYCLOAK-1412 Server-overlay for EAP 6.4 
- Added as7-server-subsystem
 - Added eap6-server-overlay
 - Moved modules to eap6-server-modules
 - Renamed wildfly-server-subsystem to wf9-server-subsystem for consistency
 2015-06-11 09:40:47 +02:00
Marko Strukelj
e6928c6456 KEYCLOAK-1417 Re-enable demo-dist 2015-06-09 16:35:46 +02:00
Marko Strukelj
245edcb5b9 KEYCLOAK-1418 Re-enable server-overlay 
- it's based on server-dist for Wildfly 9 in order to reuse server-feature-pack - no dependency on distribution/modules
 2015-06-09 16:35:46 +02:00
Stian Thorgersen
966d939c12 Merge pull request #1340 from mstruk/srv-subsystem 
Cleanup, and simplify keycloak-server-subsystem
 2015-06-09 07:05:07 +01:00
Marko Strukelj
7be957f4f9 KEYCLOAK-1370 Empty module de.idyl.winzipaes in keycloak-server-dist 2015-06-08 15:59:51 +02:00
Marko Strukelj
3643e76a06 Cleanup, and simplify keycloak-server-subsystem 
- KEYCLOAK-1346 Remove support for overlays in server subsystem
 - KEYCLOAK-1347 Remove support for multiple auth-servers
 - KEYCLOAK-1348 Simplify server subsystem definition
 2015-06-08 15:33:34 +02:00
Bill Burke
dc0d9a8dce merge 2015-06-05 14:44:37 -04:00
Bill Burke
9ab023cc6c more 2015-06-04 10:18:24 -04:00
Marko Strukelj
580e4fb0b2 Clean up distribution/modules and adapter-feature-packs 2015-06-04 11:39:08 +02:00
Marko Strukelj
91ec4cb5c7 KEYCLOAK-1332 Remove adapter modules from server 2015-06-02 10:22:26 +02:00
Stian Thorgersen
d042f6e2c9 Merge pull request #1311 from tkyjovsk/master 
Removed keycloak-wildfly-adapter-subsystem dependency from keycloak-jboss-modules.
 2015-06-02 08:42:36 +01:00
Tomas Kyjovsky
3fe93eebb6 Removed keycloak-wildfly-adapter-subsystem dependency from keycloak-jboss-modules. 2015-06-01 19:18:56 +02:00
Marko Strukelj
3df504b6b4 KEYCLOAK-1304 WF9 server subsystem 
- remove unnecessary dependencies
 2015-06-01 16:07:59 +02:00
Marko Strukelj
2077a2a3af KEYCLOAK-1303 WF9 adapter subsystem 
- not dependent on distribution/modules any more
 - keycloak-adapter-subsystem moved to keycloak-wf9-subsystem
 - still installed as <extension module="org.keycloak.keycloak-adapter-subsystem"/>
 2015-05-29 15:17:41 +02:00
Marko Strukelj
4f270bffd0 Refactor EAP 6 adapter distribution 
- not dependent on distribution/modules any more
 - uses the same modules as AS7
 - again use <extension module="org.keycloak.keycloak-adapter-subsystem"/>
 2015-05-28 23:56:11 +02:00
Marko Strukelj
fa90602aa0 Refactor AS 7 adapter distribution 
- not dependent on distribution/modules any more
 - again use <extension module="org.keycloak.keycloak-adapter-subsystem"/>
 2015-05-28 23:56:11 +02:00
Marko Strukelj
30955c4e2c Reintroduce org.keycloak.keycloak-adapter-subsystem module to WF8 
- again use <extension module="org.keycloak.keycloak-adapter-subsystem"/>
 2015-05-28 09:49:34 +02:00
Marko Strukelj
d70fd86a82 Wildfly 8.2.0.Final compatibility 
- added integration/keycloak/wf8-subsystem
 - added distribution/adapters/wf8-adapter containing wf8-modules, and wf8-adapter-zip
 - there's no dependency on distribution/modules
 - subsystem is installed by unzipping keycloak-wf8-adapter-dist.zip to Wildfly 8.2.0.Final, and adding <extension-module>org.keycloak.keycloak-wf8-subsystem</extension-module> to standalone.xml
 2015-05-22 17:38:02 +02:00
Stian Thorgersen
4e0a32a37a Version bump 2015-05-22 09:04:30 +02:00
Marko Strukelj
91bf50eb6c AS 7.1.1.Final / EAP 6.4 compatibility 2015-05-21 11:30:26 +02:00
Stian Thorgersen
a507771f7c Fix demo dist 2015-05-19 08:15:39 +02:00
Stian Thorgersen
2f8d577e95 Fix server-overlay 2015-05-19 08:15:39 +02:00
Stian Thorgersen
362babe5e2 Fixed server-dist 2015-05-19 08:15:39 +02:00
Stian Thorgersen
269dc26029 Merge pull request #1250 from ssilvert/patch-1 
Fix parent pom.
 2015-05-12 14:55:20 +02:00
Stan Silvert
797bf49ea6 Update pom.xml 2015-05-12 08:39:57 -04:00
Stan Silvert
fd96bacf70 Update pom.xml 2015-05-12 08:38:08 -04:00
Stian Thorgersen
29c72c0744 Moved adapter feature pack 2015-05-11 16:27:16 +02:00
Stian Thorgersen
252dfe006b Removed unused xslt from server-dist 2015-05-11 16:13:44 +02:00
Stian Thorgersen
9168cf811c Build server dist with feature pack 2015-05-11 16:09:16 +02:00
Bill Burke
833c276424 Merge pull request #1234 from mstruk/wfly-subs-split-master 
Wildfly 9 - subsystem split + feature packs
 2015-05-08 20:53:17 -04:00
Marko Strukelj
30682968ff Fix invalid module references that should point to keycloak-wildfly-adapter 2015-05-07 17:21:23 +02:00
Stian Thorgersen
707e29adef KEYCLOAK-1282 2015-05-07 09:39:28 +02:00
Stian Thorgersen
86e19c274f KEYCLOAK-1279 2015-05-07 06:46:12 +02:00
Marko Strukelj
c28f5cef7a Fix WildFly org.apache.httpcomponents issue 2015-05-06 18:57:40 +02:00
Marko Strukelj
01e9b3bcff Upgrade version on overlooked poms to 1.3.0.Beta1-SNAPSHOT 2015-05-05 21:30:42 +02:00
Marko Strukelj
7d2942e1be KEYCLOAK-1183 Split subsystem into separate server and adapter subsystems 
- Rename keycloak-server-subsystem dir to wildfly-server-subsystem
 - Rename keycloak-agent-subsystem dir to keycloak-wildfly-agent-subsystem
 - Rename artifacts accordingly (keycloak- prefix)
 Only maven artifacts are renamed, jboss-modules modules are still called keycloak-server-subsystem, and keycloak-agent-subsystem
 2015-05-05 20:43:23 +02:00
Marko Strukelj
943404689e KEYCLOAK-1183 Split subsystem into separate server and adapter subsystems 
- Use WildFly 9.0.0.CR1
 2015-05-05 20:40:05 +02:00
Marko Strukelj
625fb02dfe Fix typo preventing adapter-only-dist feature pack to build 2015-05-05 20:40:04 +02:00
Stan Silvert
18966334ab Update README.md 2015-05-05 20:40:04 +02:00
Stan Silvert
a8f3756bbc Rename feature pack artifacts. Fix empty content directory. 2015-05-05 20:40:04 +02:00
Stan Silvert
f0dab97b80 Add README file. 2015-05-05 20:40:04 +02:00
Stan Silvert
3a7bba041f Create builds based on WildFly 9 feature packs. 2015-05-05 20:40:04 +02:00
Marko Strukelj
c571ad9902 KEYCLOAK-1183 Split subsystem into separate server and adapter subsystems 
- Renamed keycloak-subsystem into keycloak-server-subsystem
 - Added keycloak-adapter-subsystem without auth-server support
 - Removed adapter config from keycloak-server subsystem
 - Added proper .xsd for server subsystem
 2015-05-05 20:40:03 +02:00
Stian Thorgersen
035529d7a2 Version bump 2015-05-05 11:45:21 +02:00
Stian Thorgersen
adbde56c1a Removed tar.gz dist of docs 2015-05-05 10:28:04 +02:00
Stian Thorgersen
bd52908df4 Fix version setting 2015-05-05 07:22:50 +02:00
mposolda
3d26ab8817 KEYCLOAK-1265 Fix import realm in admin console on EAP 6.4, Update docker-cluster 2015-05-04 23:20:13 +02:00
Stian Thorgersen
523f746745 Added providers classpath for standalone/configuration/providers 2015-05-04 20:13:08 +02:00
Stian Thorgersen
d355d53262 Don't deploy demo bundle and subsystem war to Maven repo 2015-05-04 11:40:06 +02:00
Stian Thorgersen
59d7ff3f0a Fixes to AS7 adapter 2015-05-04 11:35:37 +02:00
Stian Thorgersen
ad42b4dde3 Updated demo-dist 2015-04-30 09:40:24 +02:00
Bill Burke
e54bf4a16f hc config and docs 2015-04-29 21:42:32 -04:00
Bill Burke
35c33f132e demo fix and error message fix 2015-04-29 21:16:59 -04:00
Bill Burke
666827b7cb remove resteasy ClientRequest 2015-04-29 20:46:14 -04:00
Stian Thorgersen
215a3497ae KEYCLOAK-1189 Add apache httpclient module with slot 4.3 2015-04-27 16:33:48 +02:00
Stian Thorgersen
1f49ae8a2f Updated xslts 2015-04-24 09:19:40 +02:00
Stian Thorgersen
ac49ba2f44 More tweaks to dist 2015-04-24 07:30:59 +02:00
Stian Thorgersen
f0d3fa783a Moved docs into separate dist to reduce size of server-overlay 2015-04-24 07:15:11 +02:00
Stian Thorgersen
35b6c88500 Don't replace welcome-content in server-overlay 2015-04-23 15:53:04 +02:00
Stian Thorgersen
37243d058c Fixes 2015-04-23 15:53:03 +02:00
Stian Thorgersen
e64a2d8de5 Fixes 2015-04-23 15:53:03 +02:00
Stian Thorgersen
e17105cc8e Updated distribution and cleaning of maven modules 2015-04-23 11:15:05 +02:00
Stian Thorgersen
f3e5541b7d KEYCLOAK-1109 Added KeycloakContext 
KEYCLOAK-1042 Access to Cookies within Events
KEYCLOAK-1209 Enable jboss-logging event listener by default and allow configuring log level
 2015-04-15 13:34:54 +02:00
mposolda
eb5ae4aae9 KEYCLOAK-1007 Fork Picketlink LDAP code. Remove picketlink dependencies from LDAP Federation provider 2015-04-08 22:04:02 +02:00
mposolda
2ba2e7768d KEYCLOAK-1181 Running Liquibase updates via maven plugin doesn't work 2015-04-07 10:27:44 +02:00
Bill Burke
37306e689d initial Picketlink SAML fork 2015-04-03 14:04:19 -04:00
Bill Burke
326818ea45 bump pom versio 2015-04-02 09:36:43 -04:00
Bill Burke
952b2fc83d disable token exchange ui/example 2015-04-01 15:56:52 -04:00
girirajsharma
0077741a74 Removed unused bcmail bouncycastle dependency. 2015-03-31 17:07:28 +05:30
mposolda
96b48877b8 Added bouncycastle module to EAP6 and AS7 packaging as it's not here by default 2015-03-30 17:59:49 +02:00
Bill Burke
878ce0761d broker fixes 2015-03-27 12:13:48 -04:00
Stian Thorgersen
58db94209a KEYCLOAK-1021 Add tar.gz version to dists 2015-03-27 11:03:46 +01:00
mposolda
477d8b35e3 KEYCLOAK-1116 KEYCLOAK-1117 JSON migration and removal of ClientModel.claimsMask 2015-03-26 11:49:22 +01:00
Stian Thorgersen
14683882e8 KEYCLOAK-1138 Appliance distribution from master failes with ClassNotFoundException 2015-03-25 10:11:56 +01:00
mposolda
cc784ecb46 KEYCLOAK-1004 Jpa migration for 1.2.0.Beta1 2015-03-24 18:44:20 +01:00
Vlastimil Elias
ee742be811 KEYCLOAK-1046 - added modules definition, tests and documentation 2015-03-24 08:49:31 +01:00
Vlastimil Elias
c21d110b4c KEYCLOAK-28 - Login with LinkedIn 2015-03-23 10:24:01 +01:00
Stian Thorgersen
4494c2a731 Fix module theme loader 2015-03-20 14:49:46 +01:00
mposolda
a65bac7751 Mongo migration: admin roles, timeout, protocol mappers 2015-03-19 19:58:19 +01:00
mposolda
cc5efc629d Fix google and twitter examples 2015-03-18 11:59:40 +01:00
Bill Burke
48adefdbea Merge pull request #1055 from ssilvert/KEYCLOAK-1105-refactor-InMemoryModel 
KEYCLOAK-1105 Refactor InMemoryModel
 2015-03-17 19:27:29 -04:00
Bill Burke
ce2c4188fb saml broker import/export, and module fixes 2015-03-17 19:20:46 -04:00
Stan Silvert
68b88b4baf KEYCLOAK-1105 Refactor InMemoryModel to use a factory instead of a 
singleton.
 2015-03-17 16:16:39 -04:00
Stian Thorgersen
13b22d6644 KEYCLOAK-1107 saml and oidc broker options don't sho 2015-03-17 12:10:53 +01:00
mposolda
d3e75084de Fix broker packaging and facebook example 2015-03-17 10:55:06 +01:00
mposolda
444cdac9f5 KEYCLOAK-1043 Fix fuse packaging due to bouncycastle update. Improve camel example 2015-03-13 10:57:44 +01:00
Stan Silvert
b1d341155d Fix AdminApiTest. Fix distribution. Try to prevent InMemoryModel leaks. 2015-03-10 04:42:19 +01:00
Stian Thorgersen
2f64b6aaad Removed dep on wildfly-extensions in server-all 2015-03-09 11:45:50 +01:00
mposolda
db07d79009 KEYCLOAK-1066 Kerberos credential delegation support 2015-03-06 12:59:29 +01:00
Stian Thorgersen
1f5fedb0b0 Module provider loader 2015-03-06 05:30:17 +01:00
mposolda
0c893b6175 Kerberos fixes for jboss-modules refactoring. Fix environment specific test failures 2015-02-25 22:36:27 +01:00
Stian Thorgersen
b6a512b494 KEYCLOAK-934 Extract dependencies into modules 2015-02-25 12:05:48 +01:00
pedroigor
2d56c271af [KEYCLOAK-994] - Identity broker documentation. 2015-02-20 23:08:57 -02:00
girirajsharma
c3d7ef8066 Updated BC provider versions and deprecated CertificateUtil methods. 2015-02-10 18:44:54 +05:30
mposolda
1d8ebd441d KEYCLOAK-1023 Improve osgi packaging for hawtio. Fix typos in fuse example docs. 2015-02-02 23:25:56 +01:00
Stian Thorgersen
c5bfaa6051 Added provider section to docs 2015-01-28 11:25:27 +01:00
mposolda
ee4fbca868 Improve OOTB experience for ssh and jmx authentication in fuse 2015-01-23 20:57:40 +01:00
mposolda
f592e8b499 KEYCLOAK-981 Module org.picketlink.federation.bindings doesn't work with EAP6 2015-01-20 11:58:56 +01:00
mposolda
ad31b3dd2e Typo in packaging 2015-01-15 19:50:38 +01:00
mposolda
d928c26e27 KEYCLOAK-539 Fuse adapter. OSGI bundling. OSGI headers in keycloak adapter maven artifacts. Rename package in jetty-core 2015-01-15 19:02:45 +01:00
Stian Thorgersen
959933a227 Version bump 2015-01-12 10:35:50 +01:00
gerbermichi
2a33b177d5 fix nio bug 2014-12-18 16:58:36 +01:00
Bill Burke
000a85fe99 Merge pull request #892 from patriot1burke/master 
common eap code
 2014-12-16 12:27:32 -05:00
Bill Burke
17a8a92bb3 common eap code 2014-12-16 12:26:56 -05:00
Stian Thorgersen
cf11911f6b KEYCLOAK-874 
keycloak-example-themes-dist:zip:1.1.0.Beta2 does not exist
 2014-12-16 15:31:02 +01:00
Bill Burke
6c04e26376 bump 2014-12-05 21:09:38 -05:00
Bill Burke
c0059a875b bump version 2014-12-05 19:03:13 -05:00
Bill Burke
b768d593a2 rm adapters from appliance/war-dist 2014-12-05 18:30:41 -05:00
Stan Silvert
952436f129 Restore old AS7 subystem. 2014-12-04 14:53:50 -05:00
Stan Silvert
a3002cfee6 Remove keycloak subsystem from AS7 dist. 2014-12-04 14:53:49 -05:00
mposolda
cd8bee8e29 Fix osgi packaging 2014-12-02 21:33:22 +01:00
mposolda
2802ad4ad5 Fix eap63 distribution and docker-cluster tool 2014-12-02 20:28:27 +01:00
mposolda
bfab7361f4 KEYCLOAK-863 Osgi packaging for karaf/fuse 2014-12-01 15:10:19 +01:00
objectiser
8e01f8ecf1 KEYCLOAK-861 Support basic authentication against user credentials managed by KeyCloak. 2014-12-01 11:43:19 +00:00
Stian Thorgersen
6b3e7c76bd Merge pull request #870 from ssilvert/eap-subsys 
KEYCLOAK-856 Merge WildFly and EAP subsystems
 2014-11-27 10:02:01 +01:00
Bill Burke
d0856e024f proxy distro 2014-11-24 18:12:17 -05:00
Stan Silvert
d53b01eb2b KEYCLOAK-856 Rename wildfly-subsystem to keycloak-subsystem 2014-11-24 16:52:16 -05:00
Stan Silvert
f537661341 KEYCLOAK-856 Merge WildFly and EAP subsystems 2014-11-21 13:33:14 -05:00
Bill Burke
5be045c42b tomcat6 2014-11-15 11:59:33 -05:00
Bill Burke
a65560c5e6 tomcat8 2014-11-12 19:03:22 -05:00
Bill Burke
e2045907d4 tomcat8 2014-11-12 18:56:18 -05:00
Stan Silvert
67c0182a49 KEYCLOAK-839 Auth Server overlay enhancements 2014-11-12 13:39:39 -05:00
Stan Silvert
c85a31be7f KEYCLOAK-839 Auth Server overlay enhancements 2014-11-12 13:39:38 -05:00
Bill Burke
dd8c40b0d8 last jetty8 stuff 2014-11-12 10:32:37 -05:00
Bill Burke
25740508b5 fix artifact 2014-11-12 10:08:42 -05:00
Bill Burke
3b6f10913c merge 2014-11-10 17:09:00 -05:00
Bill Burke
3fbffc9d7d jetty 8 2014-11-10 16:59:31 -05:00
mposolda
63198288df Add jetty modules to distribution 2014-11-10 22:16:20 +01:00
Bill Burke
b0a5161e6b final jetty stuff 2014-11-07 21:10:15 -05:00
Bill Burke
3805510e20 more jetty adapter 2014-11-07 18:34:53 -05:00
Stan Silvert
63712039e7 KEYCLOAK-795: Update CLI 2014-11-05 08:31:09 -05:00
Stan Silvert
aa55a86ff6 KEYCLOAK-795 Update documentation. Add latest version of CLI to appliance 
dist.
 2014-11-05 08:31:08 -05:00
Stan Silvert
e8e50d2d1c KEYCLOAK-795 Cleanup appliance dist. 2014-11-05 08:31:07 -05:00
Stan Silvert
3f75ebf029 KEYCLOAK-795 Move Auth Server into Keycloak Subsystem 2014-11-05 08:31:07 -05:00
Stan Silvert
f9215e961d Incremental commit because I haven't done one in awhile. 2014-11-05 08:31:06 -05:00
Stan Silvert
4776582a6a Old experiment with keycloak-server.json embedded into standalone.xml 2014-11-05 08:31:05 -05:00
Juraci Paixão Kröhling
8c8f82d0fd KEYCLOAK-816 - Removed undertow-adapter as dependency from wildfly-adapter-zip 2014-11-05 12:15:37 +01:00
Stian Thorgersen
1797f7e704 KEYCLOAK-814 Admin Client Example 2014-11-04 10:33:42 +01:00
Stian Thorgersen
0f8c073354 Version bump 2014-11-04 09:01:06 +01:00
Juraci Paixão Kröhling
8e764e642f KEYCLOAK-779 
Adapter multi-tenancy support
 2014-10-30 16:54:26 +01:00
Bill Burke
935045926e tomcat7 distro 2014-10-29 12:30:12 -04:00
Bill Burke
4d3299ae08 saml distro and examples 2014-10-21 21:39:10 -04:00
Stian Thorgersen
423dc1b8a7 Change version schema to match JBoss 2014-09-12 09:35:08 +02:00
Stian Thorgersen
5dea07793b Version bump 2014-09-11 09:27:58 +02:00
Bill Burke
3f539c6d5c version bump 2014-09-09 13:34:56 -04:00
Stian Thorgersen
b97106b750 Adding changes to examples overview readme 2014-09-03 13:18:14 +02:00
Stian Thorgersen
59d66dd20e KEYCLOAK-656 Remove login-status-iframe from dist 2014-09-02 10:54:26 +02:00
Stian Thorgersen
05a1fc1ded Version bump 2014-09-01 10:17:00 +02:00
Bill Burke
7c8edb5d11 bump pom 2014-08-21 10:46:49 -04:00
Bill Burke
e5d5276135 race 2014-08-20 14:50:28 -04:00
Stan Silvert
bc301baa1f By default, the datasource should be KeycloakDS instead of ExampleDS. 2014-08-15 08:55:04 -04:00
Bill Burke
b1c331c5f3 add js adapter to dist 2014-08-12 18:24:40 -04:00
Bill Burke
9aa6b4cbfa optimize imports 2014-08-10 12:17:45 -04:00
Bill Burke
e04af84ac0 bump version 2014-08-06 09:00:23 -04:00
Bill Burke
905061e2b7 bump version 2014-08-05 20:52:50 -04:00
Bill Burke
38bd79ab88 filter out unconfigured example files 2014-08-05 16:53:10 -04:00
Stian Thorgersen
85621bdd9f KEYCLOAK-566 Configure db in keycloak-server.json instead of persistence.xml 2014-07-18 11:21:52 +01:00
Stian Thorgersen
df2305eb02 Bumped version to 1.0-beta-4-SNAPSHOT 2014-06-19 10:19:10 +01:00
Bill Burke
d5b34a0b41 bump version again 2014-06-02 13:12:04 -04:00
Bill Burke
0fcf80dd6e bump version 2014-06-02 12:21:58 -04:00
Stian Thorgersen
2025d314ec Bump version to 1.0.beta2-SNAPSHOT 2014-05-30 08:52:03 +01:00
Bill Burke
2ae3775841 bump version 2014-05-29 12:12:33 -04:00
Stian Thorgersen
5b7c8b6920 Added sunrise theme to examples, including instructions on how to deploy 2014-05-29 13:14:39 +01:00
Bill Burke
0ff992e04e Merge pull request #428 from patriot1burke/master 
docs
 2014-05-28 12:34:11 -04:00
Bill Burke
34a579821a docs 2014-05-28 12:33:49 -04:00
Stian Thorgersen
df19700f69 Deploy server war and dist bundles to Maven repo. Also added '-parent' to some parent poms where this was missing 2014-05-28 15:32:20 +01:00
Stian Thorgersen
8ae57fd117 Include all themes in configuration/themes to make it easy to modify/create themes 2014-05-27 12:05:09 +01:00
Bill Burke
199c786e22 jaxrs-doclet support 2014-05-26 20:41:33 -04:00
Stian Thorgersen
59440840fe Read keycloak-sever.json from <JBOSS_HOME>/standalone/configuration if it exists 2014-05-21 09:35:01 +01:00
Bill Burke
e8f8829a76 cors example 2014-05-13 17:17:27 -04:00
Stian Thorgersen
d6e5e376bf Theme support for admin 2014-04-25 13:58:58 +01:00
Andrea Vibelli
d831e25366 Remove unnecessary groupId declarations 2014-03-31 10:44:34 +02:00
Andrea Vibelli
37fdc50fb4 Remove warnings about no schema definition in pom.xml files 2014-03-31 10:44:22 +02:00
Bill Burke
7763da1273 bump version to beta-1 snapshot 2014-03-13 11:24:38 -04:00
Bill Burke
1c6b867079 bump version 2014-03-13 10:58:22 -04:00
Stian Thorgersen
ee5cab04e0 Set next version 2014-03-13 09:10:42 +00:00
Bill Burke
9f429e4150 Merge pull request #291 from patriot1burke/master 
bump
 2014-03-12 17:07:24 -04:00
Bill Burke
3ff8d0fd1f bump version 2014-03-12 16:48:12 -04:00