Skip to content

Commit

Permalink
little changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mkristian committed Oct 30, 2011
1 parent 1e1e80f commit 5fd757c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
5 changes: 2 additions & 3 deletions Mavenfile
@@ -1,6 +1,5 @@
#-*- mode: ruby -*-
GWT_VERSION = '2.4.0'
jar('org.jruby:jruby-complete', '1.6.4')
jar('de.mkristian.gwt:rails-gwt', '0.6.1-SNAPSHOT').scope :provided
jar('org.fusesource.restygwt:restygwt', '1.2').scope :provided
jar('javax.ws.rs:jsr311-api', '1.1').scope :provided
Expand Down Expand Up @@ -32,7 +31,7 @@ profile("mac") do |mac|
mac.plugin('org.codehaus.mojo:gwt-maven-plugin').with(:extraJvmArgs => "-d32 -XstartOnFirstThread -Xmx512m")
end

repository(:snapshots).url "http://mojo.saumya.de"
#repository(:snapshots).url "http://mojo.saumya.de"
#properties['jruby.plugins.version'] ='0.28.5-SNAPSHOT'

properties['jruby.version'] = '1.6.4'
# vim: syntax=Ruby
20 changes: 11 additions & 9 deletions pom.xml
Expand Up @@ -6,10 +6,6 @@
<name><![CDATA[users - rails application]]></name>
<packaging>war</packaging>
<repositories>
<repository>
<id>snapshots</id>
<url>http://mojo.saumya.de</url>
</repository>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
Expand Down Expand Up @@ -174,14 +170,13 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>bcrypt-ruby</artifactId>
<artifactId>slf4r</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>1.6.4</version>
<type>jar</type>
<groupId>rubygems</groupId>
<artifactId>bcrypt-ruby</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>de.mkristian.gwt</groupId>
Expand Down Expand Up @@ -233,6 +228,12 @@
<scope>provided</scope>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>1.6.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jruby.rack</groupId>
<artifactId>jruby-rack</artifactId>
Expand Down Expand Up @@ -472,6 +473,7 @@
<gem.path>${project.build.directory}/rubygems</gem.path>
<jetty.version>7.5.1.v20110908</jetty.version>
<jruby.plugins.version>0.28.5</jruby.plugins.version>
<jruby.version>1.6.4</jruby.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<rails.env>development</rails.env>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion public/stylesheets/users.css
Expand Up @@ -57,7 +57,7 @@
{
margin-left: 1em;
}
.gwt-rails-menu *, .rails-menu *
.gwt-rails-menu *
{
float: left;
display: inline;
Expand Down

0 comments on commit 5fd757c

Please sign in to comment.