Skip to content

Commit

Permalink
new versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkristian
mkristian committed Sep 6, 2011
1 parent 9b57ded commit 055fd03
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 62 deletions.
9 changes: 4 additions & 5 deletions Gemfile
View file
Expand Up @@ -64,18 +64,17 @@ group :production do
gem 'pg', :platforms => :ruby
end

gem 'resty-generators', :path => '../../rails-resty-gwt/resty-generators'
gem 'resty-generators'#, :path => '../../rails-resty-gwt/resty-generators'

gem 'enforce-ssl'
gem "ixtlan-session-timeout"
gem "ixtlan-guard", :path => '../../ixtlan/ixtlan-guard'
gem "ixtlan-guard"#, :path => '../../ixtlan/ixtlan-guard'
gem "jruby-openssl", "~> 0.7.4", :platforms => :jruby

gem 'bcrypt-ruby'
gem 'open_id_authentication'
#gem 'rack-openid'#, :lib => 'rack/openid'

gem 'slf4r'
gem 'ixtlan-generators'
gem 'ixtlan-core'
gem "ixtlan-core"
gem 'ixtlan-generators'#, :path => '../../ixtlan/ixtlan-generators'
gem 'ixtlan-core'#, :path => '../../ixtlan/ixtlan-core'
22 changes: 7 additions & 15 deletions Gemfile.lock
View file
@@ -1,15 +1,3 @@
PATH
remote: ../../ixtlan/ixtlan-guard
specs:
ixtlan-guard (0.6.0)
ixtlan-core (~> 0.6.0)

PATH
remote: ../../rails-resty-gwt/resty-generators
specs:
resty-generators (0.4.0)
ixtlan-generators (~> 0.1.0)

GEM
remote: http://rubygems.org/
specs:
Expand Down Expand Up @@ -51,7 +39,9 @@ GEM
i18n (0.5.0)
ixtlan-core (0.6.0)
slf4r (>= 0.4.2, < 0.4.99999)
ixtlan-generators (0.1.0)
ixtlan-generators (0.1.1)
ixtlan-guard (0.6.0)
ixtlan-core (>= 0.6.0, < 0.6.99999)
ixtlan-session-timeout (0.4.0)
jdbc-sqlite3 (3.7.2)
jruby-openssl (0.7.4)
Expand Down Expand Up @@ -89,6 +79,8 @@ GEM
thor (~> 0.14.4)
rake (0.9.2)
rdoc (3.9.4)
resty-generators (0.5.0)
ixtlan-generators (>= 0.1.1, < 0.1.99999)
ruby-openid (2.1.8)
slf4r (0.4.2)
thor (0.14.6)
Expand All @@ -106,13 +98,13 @@ DEPENDENCIES
enforce-ssl
ixtlan-core
ixtlan-generators
ixtlan-guard!
ixtlan-guard
ixtlan-session-timeout
jdbc-sqlite3
jruby-openssl (~> 0.7.4)
open_id_authentication
pg
rails (= 3.0.9)
resty-generators!
resty-generators
slf4r
sqlite3
2 changes: 1 addition & 1 deletion Mavenfile
View file
@@ -1,5 +1,5 @@
#-*- mode: ruby -*-
GWT_VERSION = '2.2.0'
GWT_VERSION = '2.3.0'
jar('org.fusesource.restygwt:restygwt', '1.2-SNAPSHOT').scope :provided
jar('javax.ws.rs:jsr311-api', '1.1').scope :provided
jar('com.google.gwt:gwt-user', GWT_VERSION).scope :provided
Expand Down
92 changes: 51 additions & 41 deletions pom.xml
View file
Expand Up @@ -157,6 +157,16 @@
<artifactId>jdbc-sqlite3</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>resty-generators</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-generators</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>enforce-ssl</artifactId>
Expand All @@ -169,47 +179,47 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<artifactId>ixtlan-guard</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>bouncy-castle-java</artifactId>
<artifactId>ixtlan-core</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>bcrypt-ruby</artifactId>
<artifactId>slf4r</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>open_id_authentication</artifactId>
<artifactId>jruby-openssl</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rack-openid</artifactId>
<artifactId>bouncy-castle-java</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ruby-openid</artifactId>
<artifactId>bcrypt-ruby</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>slf4r</artifactId>
<artifactId>open_id_authentication</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-generators</artifactId>
<artifactId>rack-openid</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-core</artifactId>
<artifactId>ruby-openid</artifactId>
<type>gem</type>
</dependency>
<dependency>
Expand All @@ -229,7 +239,7 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
Expand Down Expand Up @@ -262,36 +272,6 @@
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-guard</artifactId>
<version>0.6.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-core</artifactId>
<version>0.6.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>slf4r</artifactId>
<version>0.4.2</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>resty-generators</artifactId>
<version>0.4.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-generators</artifactId>
<version>0.1.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>abstract</artifactId>
Expand Down Expand Up @@ -430,6 +410,30 @@
<version>0.2.2</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-core</artifactId>
<version>0.6.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>slf4r</artifactId>
<version>0.4.2</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-generators</artifactId>
<version>0.1.1</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-guard</artifactId>
<version>0.6.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ixtlan-session-timeout</artifactId>
Expand Down Expand Up @@ -502,6 +506,12 @@
<version>0.14.6</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>resty-generators</artifactId>
<version>0.5.0</version>
<type>gem</type>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
Expand All @@ -518,7 +528,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
<configuration>
<extraJvmArgs>-Xmx512m</extraJvmArgs>
<hostedWebapp>${basedir}/public</hostedWebapp>
Expand Down

0 comments on commit 055fd03

Please sign in to comment.