Author: gnodet Date: Thu Sep 23 09:24:39 2010 New Revision: 1000378 URL: http://svn.apache.org/viewvc?rev=1000378&view=rev Log: Fix a few things in pom and dependencies
Modified: karaf/trunk/itests/dependencies/pom.xml karaf/trunk/itests/tests/pom.xml karaf/trunk/pom.xml karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java Modified: karaf/trunk/itests/dependencies/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/itests/dependencies/pom.xml?rev=1000378&r1=1000377&r2=1000378&view=diff ============================================================================== --- karaf/trunk/itests/dependencies/pom.xml (original) +++ karaf/trunk/itests/dependencies/pom.xml Thu Sep 23 09:24:39 2010 @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.karaf</groupId> - <artifactId>karaf</artifactId> + <groupId>org.apache.karaf.itests</groupId> + <artifactId>itests</artifactId> <version>2.1.99-SNAPSHOT</version> </parent> Modified: karaf/trunk/itests/tests/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/itests/tests/pom.xml?rev=1000378&r1=1000377&r2=1000378&view=diff ============================================================================== --- karaf/trunk/itests/tests/pom.xml (original) +++ karaf/trunk/itests/tests/pom.xml Thu Sep 23 09:24:39 2010 @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.karaf</groupId> - <artifactId>karaf</artifactId> + <groupId>org.apache.karaf.itests</groupId> + <artifactId>itests</artifactId> <version>2.1.99-SNAPSHOT</version> </parent> Modified: karaf/trunk/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1000378&r1=1000377&r2=1000378&view=diff ============================================================================== --- karaf/trunk/pom.xml (original) +++ karaf/trunk/pom.xml Thu Sep 23 09:24:39 2010 @@ -105,7 +105,7 @@ <cglib.bundle.version>2.1_3_6</cglib.bundle.version> <commons-codec.bundle.version>1.3_3</commons-codec.bundle.version> <commons-lang.bundle.version>2.4_4</commons-lang.bundle.version> - <jasypt.bundle.version>1.6_1-SNAPSHOT</jasypt.bundle.version> + <jasypt.bundle.version>1.6_1</jasypt.bundle.version> <jetty.bundle.version>6.1.22_2</jetty.bundle.version> <junit.bundle.version>4.7_1</junit.bundle.version> @@ -129,7 +129,7 @@ <aries.blueprint.version>0.2-incubating</aries.blueprint.version> <aries.jmx.version>0.2-incubating</aries.jmx.version> <geronimo.servlet.version>1.1.2</geronimo.servlet.version> - <jansi.version>1.2</jansi.version> + <jansi.version>1.4</jansi.version> <jline.version>2.4-SNAPSHOT</jline.version> <jsw.version>3.2.3</jsw.version> <log4j.version>1.2.16</log4j.version> @@ -179,15 +179,26 @@ </snapshots> </repository> <repository> - <id>jansi.release.m2</id> - <name>jansi Release Repository</name> - <url>http://jansi.fusesource.org/repo/release</url> - <snapshots> + <id>sonatype</id> + <name>sonatype</name> + <url>http://repository.sonatype.org/content/groups/sonatype-public-grid</url> + <releases> <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> </snapshots> + </repository> + <repository> + <id>fusesource.snapshots</id> + <name>FuseSource snapshot repository</name> + <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url> <releases> - <enabled>true</enabled> + <enabled>false</enabled> </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> </repository> </repositories> Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java?rev=1000378&r1=1000377&r2=1000378&view=diff ============================================================================== --- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java (original) +++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java Thu Sep 23 09:24:39 2010 @@ -51,13 +51,13 @@ public class MoreAction extends Abstract } return null; } else { - boolean echo = term.getEcho(); - term.disableEcho(); + boolean echo = term.isEchoEnabled(); + term.setEchoEnabled(false); try { if (lines == 0) { - lines = term.getTerminalHeight(); + lines = term.getHeight(); } - LineSplitter reader = new LineSplitter(new BufferedReader(new InputStreamReader(System.in)), term.getTerminalWidth()); + LineSplitter reader = new LineSplitter(new BufferedReader(new InputStreamReader(System.in)), term.getWidth()); int count = 0; int c; do { @@ -103,11 +103,7 @@ public class MoreAction extends Abstract } while (c != 'q'); return null; } finally { - if (echo) { - term.enableEcho(); - } else { - term.disableEcho(); - } + term.setEchoEnabled(echo); } } }