Skip to content

Commit

Permalink
Merge pull request #90 from eprogramming/master
Browse files Browse the repository at this point in the history 
updates
  • Loading branch information
@helio-frota
helio-frota committed Dec 29, 2014
2 parents 3ba600d + ee736eb commit c66f7ee
Show file tree
Hide file tree
Showing 5 changed files with 198 additions and 135 deletions.
28 changes: 26 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,30 @@ $ java -jar mterm-0.56.1.jar
Your own build:
---------------

```shell
$ git clone https://github.com/aeshell/aesh.git
```

```shell
$ cd aesh
```

```shell
$ ./gradlew install
```

```shell
$ git clone https://github.com/aeshell/aesh-extensions.git
```

```shell
$ cd aesh-extensions
```

```shell
$ ./gradlew install
```

```shell
$ git clone https://github.com/aeshell/mterm.git
```
Expand All @@ -33,9 +57,9 @@ $ cd mterm
```

```shell
$ mvn clean package
$ ./gradlew build
```

```shell
$ mvn exec:java
$ ./gradlew run
```
61 changes: 44 additions & 17 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,60 @@
apply plugin: "java"
apply plugin: "idea"
apply plugin: "eclipse"
apply plugin: "maven"
apply plugin: "application"

group = "org.jboss.aesh"
version = "0.56.1"
/*
* JBoss, Home of Professional Open Source
* Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors
* as indicated by the @authors tag. All rights reserved.
* See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'eclipse'
apply plugin: 'maven'
apply plugin: 'application'

group = 'org.jboss.aesh'
version = '0.57-SNAPSHOT'

mainClassName = 'org.jboss.aesh.mterm.Mterm'

sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7

jar {
manifest {
attributes "Implementation-Title": "Mterm", "Implementation-Version": version, "Main-Class": "Mterm"
attributes 'Implementation-Title': 'Mterm', 'Implementation-Version': version, 'Main-Class': 'org.jboss.aesh.mterm.Mterm'
}
}

mainClassName = "org.jboss.aesh.mterm.Mterm"
repositories {
mavenCentral()
mavenLocal()
}

test {
exclude '**/gui/**'
}

repositories {
mavenCentral()
dependencies {
compile group: 'org.jboss.aesh', name: 'aesh', version: version
compile group: 'org.jboss.aesh', name: 'aesh-extensions', version: version
compile group: 'org.codehaus.groovy', name: 'groovy', version: '2.1.6'
testCompile group: 'junit', name: 'junit', version: '4.+'
testCompile group: 'org.easytesting', name: 'fest-swing', version: '1.2.1'
}

dependencies {
compile "org.jboss.aesh:aesh:0.56"
compile "org.jboss.aesh:aesh-extensions:0.56"
testCompile group: "junit", name: "junit", version: "4.+"
testCompile "org.easytesting:fest-swing:1.2.1"
task wrapper(type: Wrapper) {
gradleVersion = '2.2'
}
230 changes: 115 additions & 115 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,125 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- JBoss, Home of Professional Open Source Copyright 2014 Red Hat Inc.
and/or its affiliates and other contributors as indicated by the @authors
tag. All rights reserved. See the copyright.txt in the distribution for a
full listing of individual contributors. Licensed under the Apache License,
Version 2.0 (the "License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
the specific language governing permissions and limitations under the License. -->
and/or its affiliates and other contributors as indicated by the @authors
tag. All rights reserved. See the copyright.txt in the distribution for a
full listing of individual contributors. Licensed under the Apache License,
Version 2.0 (the "License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
the specific language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.jboss.aesh</groupId>
<artifactId>mterm</artifactId>
<version>0.56.1</version>
<groupId>org.jboss.aesh</groupId>
<artifactId>mterm</artifactId>
<version>0.57-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>org.jboss.aesh.mterm.Mterm</mainClass>
</manifest>
<manifestEntries>
<Class-Path>.</Class-Path>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.1.1</version>
<executions>
<execution>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>java</executable>
<mainClass>org.jboss.aesh.mterm.Mterm</mainClass>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>org.jboss.aesh.mterm.Mterm</mainClass>
</manifest>
<manifestEntries>
<Class-Path>.</Class-Path>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.1.1</version>
<executions>
<execution>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>java</executable>
<mainClass>org.jboss.aesh.mterm.Mterm</mainClass>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.jboss.aesh</groupId>
<artifactId>aesh</artifactId>
<version>0.56</version>
</dependency>
<dependency>
<groupId>org.jboss.aesh</groupId>
<artifactId>aesh-extensions</artifactId>
<version>0.56</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-swing</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.jboss.aesh</groupId>
<artifactId>aesh</artifactId>
<version>0.57-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.aesh</groupId>
<artifactId>aesh-extensions</artifactId>
<version>0.57-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-swing</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
3 changes: 3 additions & 0 deletions src/main/java/org/jboss/aesh/mterm/action/RunAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ public void actionPerformed(ActionEvent ae) {
if (!command.contains("clear")) {
if (!command.isEmpty()) {
aesh.run(command);
if (!aesh.isRunning()) {
System.exit(0);
}
}
}
else {
Expand Down
Loading

0 comments on commit c66f7ee

Please sign in to comment.