Skip to content

Commit

Permalink
upgrade to grails 2.1.0 and activiti 5.9 (use grails dependency manag…
Browse files Browse the repository at this point in the history
…ement)
  • Loading branch information
limcheekin committed Jul 11, 2012
1 parent 00bb931 commit cb426c6
Show file tree
Hide file tree
Showing 68 changed files with 208 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/grails-activiti-5.9.zip
/plugin.xml
/target
4 changes: 2 additions & 2 deletions ActivitiGrailsPlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import org.grails.activiti.serializable.SerializableVariableType
*/
class ActivitiGrailsPlugin {
// the plugin version
def version = "5.8.2"
def version = "5.9"
// the version or versions of Grails the plugin is designed for
def grailsVersion = "1.3.3 > *"
def grailsVersion = "2.0.0 > *"
// the other plugins this plugin depends on
def dependsOn = [:]
// resources that are excluded from plugin packaging
Expand Down
8 changes: 4 additions & 4 deletions application.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Grails Metadata file
#Wed Dec 21 11:25:00 GMT+08:00 2011
app.grails.version=2.0.0
#Wed Jul 11 17:21:09 GMT+08:00 2012
app.grails.version=2.1.0
app.name=activiti
plugins.hibernate=2.0.0
plugins.hibernate=2.1.0
plugins.release=1.0.0
plugins.tomcat=2.0.0
plugins.tomcat=2.1.0
8 changes: 8 additions & 0 deletions grails-app/conf/BuildConfig.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ grails.project.dependency.resolution = {
grailsPlugins()
grailsHome()
grailsCentral()
mavenRepo name: "Activiti", root: "http://maven.alfresco.com/nexus/content/groups/public"

// uncomment the below to enable remote dependency resolution
// from public Maven repositories
Expand All @@ -27,5 +28,12 @@ grails.project.dependency.resolution = {
// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.

// runtime 'mysql:mysql-connector-java:5.1.5'
compile ('org.activiti:activiti-engine:5.9') {
excludes 'livetribe-jsr223'
}
runtime 'org.activiti:activiti-spring:5.9'
runtime 'javax.mail:mail:1.4.1'
test 'org.subethamail:subethasmtp-smtp:1.2'
test 'org.subethamail:subethasmtp-wiser:1.2'
}
}
Binary file removed lib/activation-1.1.jar
Binary file not shown.
Binary file removed lib/activiti-engine-5.8.jar
Binary file not shown.
Binary file removed lib/activiti-spring-5.8.jar
Binary file not shown.
Binary file removed lib/antlr-2.7.7.jar
Binary file not shown.
Binary file removed lib/commons-email-1.2.jar
Binary file not shown.
Binary file removed lib/geronimo-jta_1.1_spec-1.1.1.jar
Binary file not shown.
Binary file removed lib/h2-1.2.132.jar
Binary file not shown.
Binary file removed lib/mail-1.4.1.jar
Binary file not shown.
Binary file removed lib/mockito-core-1.8.2.jar
Binary file not shown.
Binary file removed lib/mybatis-3.0.4.jar
Binary file not shown.
Binary file removed lib/objenesis-1.0.jar
Binary file not shown.
Binary file removed lib/persistence-api-1.0.jar
Binary file not shown.
Binary file removed lib/subethasmtp-smtp-1.2.jar
Binary file not shown.
Binary file removed lib/subethasmtp-wiser-1.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed web-app/WEB-INF/classes/BuildConfig.class
Binary file not shown.
Binary file removed web-app/WEB-INF/classes/Config$_run_closure1.class
Binary file not shown.
Binary file removed web-app/WEB-INF/classes/Config$_run_closure2.class
Binary file not shown.
Binary file removed web-app/WEB-INF/classes/Config$_run_closure3.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed web-app/WEB-INF/classes/Config.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed web-app/WEB-INF/classes/DataSource.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed web-app/WEB-INF/classes/UrlMappings.class
Binary file not shown.
1 change: 0 additions & 1 deletion web-app/WEB-INF/classes/hibernate/readme.txt

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion web-app/WEB-INF/classes/readme.txt

This file was deleted.

1 change: 0 additions & 1 deletion web-app/WEB-INF/classes/spring/readme.txt

This file was deleted.

109 changes: 109 additions & 0 deletions web-app/css/errors.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
h1, h2 {
margin: 10px 25px 5px;
}

h2 {
font-size: 1.1em;
}

.filename {
font-style: italic;
}

.exceptionMessage {
margin: 10px;
border: 1px solid #000;
padding: 5px;
background-color: #E9E9E9;
}

.stack,
.snippet {
margin: 0 25px 10px;
}

.stack,
.snippet {
border: 1px solid #ccc;
-mox-box-shadow: 0 0 2px rgba(0,0,0,0.2);
-webkit-box-shadow: 0 0 2px rgba(0,0,0,0.2);
box-shadow: 0 0 2px rgba(0,0,0,0.2);
}

/* error details */
.error-details {
border-top: 1px solid #FFAAAA;
-mox-box-shadow: 0 0 2px rgba(0,0,0,0.2);
-webkit-box-shadow: 0 0 2px rgba(0,0,0,0.2);
box-shadow: 0 0 2px rgba(0,0,0,0.2);
border-bottom: 1px solid #FFAAAA;
-mox-box-shadow: 0 0 2px rgba(0,0,0,0.2);
-webkit-box-shadow: 0 0 2px rgba(0,0,0,0.2);
box-shadow: 0 0 2px rgba(0,0,0,0.2);
background-color:#FFF3F3;
line-height: 1.5;
overflow: hidden;
padding: 5px;
padding-left:25px;
}

.error-details dt {
clear: left;
float: left;
font-weight: bold;
margin-right: 5px;
}

.error-details dt:after {
content: ":";
}

.error-details dd {
display: block;
}

/* stack trace */
.stack {
padding: 5px;
overflow: auto;
height: 150px;
}

/* code snippet */
.snippet {
background-color: #fff;
font-family: monospace;
}

.snippet .line {
display: block;
}

.snippet .lineNumber {
background-color: #ddd;
color: #999;
display: inline-block;
margin-right: 5px;
padding: 0 3px;
text-align: right;
width: 3em;
}

.snippet .error {
background-color: #fff3f3;
font-weight: bold;
}

.snippet .error .lineNumber {
background-color: #faa;
color: #333;
font-weight: bold;
}

.snippet .line:first-child .lineNumber {
padding-top: 5px;
}

.snippet .line:last-child .lineNumber {
padding-bottom: 5px;
}
82 changes: 82 additions & 0 deletions web-app/css/mobile.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/* Styles for mobile devices */

@media screen and (max-width: 480px) {
.nav {
padding: 0.5em;
}

.nav li {
margin: 0 0.5em 0 0;
padding: 0.25em;
}

/* Hide individual steps in pagination, just have next & previous */
.pagination .step, .pagination .currentStep {
display: none;
}

.pagination .prevLink {
float: left;
}

.pagination .nextLink {
float: right;
}

/* pagination needs to wrap around floated buttons */
.pagination {
overflow: hidden;
}

/* slightly smaller margin around content body */
fieldset,
.property-list {
padding: 0.3em 1em 1em;
}

input, textarea {
width: 100%;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
}

select, input[type=checkbox], input[type=radio], input[type=submit], input[type=button], input[type=reset] {
width: auto;
}

/* hide all but the first column of list tables */
.scaffold-list td:not(:first-child),
.scaffold-list th:not(:first-child) {
display: none;
}

.scaffold-list thead th {
text-align: center;
}

/* stack form elements */
.fieldcontain {
margin-top: 0.6em;
}

.fieldcontain label,
.fieldcontain .property-label,
.fieldcontain .property-value {
display: block;
float: none;
margin: 0 0 0.25em 0;
text-align: left;
width: auto;
}

.errors ul,
.message p {
margin: 0.5em;
}

.error ul {
margin-left: 0;
}
}
Binary file added web-app/images/apple-touch-icon-retina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-app/images/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cb426c6

Please sign in to comment.