diff --git a/README.md b/README.md index 6f6f9af3..c8d2847e 100644 --- a/README.md +++ b/README.md @@ -43,18 +43,15 @@ dependencies { current version is 1.0.0.BUILD-SNAPSHOT # Building +Spring Shell is built with Gradle. To build Spring Shell, run -Spring Shell currently uses Maven as its build system. The build been done using version 3.0.3 (r1075438; 2011-02-28 12:31:09-0500) and the plan is to switch to gradle. - -To build Spring Shell, run - - mvn package + ./gradlew # Running Example cd samples/helloworld - mvn package - java -jar target/helloworld-1.0.0.BUILD.SNAPSHOT.jar + ../../gradlew + java -jar build/libs/helloworld-1.0.0.BUILD-SNAPSHOT.jar # Contributing diff --git a/pom.xml b/pom.xml deleted file mode 100644 index a7d7c847..00000000 --- a/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - 4.0.0 - org.springframework.shell - spring-shell - 1.0.0.BUILD-SNAPSHOT - jar - Spring Shell - http://www.springframework.org - - - - - - org.springframework.shell.Bootstrap - true - 3.1.1.RELEASE - - - - junit - junit - 4.7 - test - - - org.springframework - spring-test - ${spring.framework.version} - test - - - org.springframework - spring-context - ${spring.framework.version} - - - - - cglib - cglib - 2.2.2 - - - log4j - log4j - 1.2.14 - - - commons-io - commons-io - 2.3 - - - - - net.sourceforge.jline - jline - 1.0.S2-B - - - org.fusesource.jansi - jansi - 1.8 - - - org.mockito - mockito-all - 1.8.5 - test - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - ${project.version} - - - - - - - - - - - spring-roo-repository - Spring Roo Maven Repository - http://spring-roo-repository.springsource.org/release - - - - diff --git a/samples/helloworld/.project b/samples/helloworld/.project index 154540ae..cdac73f2 100644 --- a/samples/helloworld/.project +++ b/samples/helloworld/.project @@ -1,23 +1,16 @@ helloworld - - - + Spring Shell Example + + + org.eclipse.jdt.core.javanature + org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - + - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - + diff --git a/samples/helloworld/build.gradle b/samples/helloworld/build.gradle index b32f6a13..f96c117b 100644 --- a/samples/helloworld/build.gradle +++ b/samples/helloworld/build.gradle @@ -16,6 +16,23 @@ dependencies { compile "org.springframework.shell:spring-shell:$springShellVersion" testCompile "junit:junit:$junitVersion" } -mainClassName = "org.springframework.shell.Bootstrap" -defaultTasks 'clean', 'build' +task copyDependency(type: Copy) { + into "$buildDir/libs/dependency" + from configurations.runtime +} + +project.ext.springShellJar = configurations.runtime.find { file -> file.name.contains("spring-shell")} +//println("spring shell name is:" + project.ext.springShellJar.name) + +project.ext.manifestClasspath = "dependency/" + springShellJar.name + " " +project.ext.manifestClasspath = project.ext.manifestClasspath + configurations.runtime.collect{ File file -> "dependency/"+file.name}.join(' ') + +jar { + baseName "helloworld" + manifest { + attributes 'Main-Class' : 'org.springframework.shell.Bootstrap', "Class-Path" : project.ext.manifestClasspath + } +} + +defaultTasks 'clean', 'build', 'copyDependency' diff --git a/samples/helloworld/readme.txt b/samples/helloworld/readme.txt index f6d44705..727562c3 100644 --- a/samples/helloworld/readme.txt +++ b/samples/helloworld/readme.txt @@ -11,9 +11,9 @@ Maven: Gradle 1.Build and install the project - $>../../gradlew installApp + $>../../gradlew 2.run spring shell - $>.\build\install\helloworld\bin\helloworld.bat + $>java -jar build/libs/helloworld-1.0.0.BUILD-SNAPSHOT.jar diff --git a/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/HelloWorldCommands.java b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/HelloWorldCommands.java index 2cacab97..58afa10f 100644 --- a/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/HelloWorldCommands.java +++ b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/HelloWorldCommands.java @@ -1,9 +1,10 @@ package org.springframework.shell.samples.helloworld.commands; -import org.springframework.roo.shell.CliAvailabilityIndicator; -import org.springframework.roo.shell.CliCommand; -import org.springframework.roo.shell.CliOption; -import org.springframework.roo.shell.CommandMarker; + +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.annotation.CliAvailabilityIndicator; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; import org.springframework.stereotype.Component; @Component diff --git a/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/MyBannerProvider.java b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/MyBannerProvider.java index e553478e..744fd55c 100644 --- a/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/MyBannerProvider.java +++ b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/MyBannerProvider.java @@ -17,9 +17,9 @@ package org.springframework.shell.samples.helloworld.commands; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import org.springframework.roo.shell.CliCommand; -import org.springframework.roo.shell.CommandMarker; import org.springframework.shell.support.util.StringUtils; +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.plugin.support.DefaultBannerProvider; import org.springframework.stereotype.Component;