You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2011/02/22 04:17:45 UTC
svn commit: r1073213 - in /activemq/activemq-apollo/trunk: ./
apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/
apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/
Author: chirino
Date: Tue Feb 22 03:17:45 2011
New Revision: 1073213
URL: http://svn.apache.org/viewvc?rev=1073213&view=rev
Log:
Switch the the karaf snapshot version to get the KARAF-477 fix.
Modified:
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Decrypt.scala
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Encrypt.scala
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Exit.scala
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Stop.scala
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreExport.scala
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreImport.scala
activemq/activemq-apollo/trunk/pom.xml
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala Tue Feb 22 03:17:45 2011
@@ -16,15 +16,15 @@
*/
package org.apache.activemq.apollo.cli
-import org.osgi.service.command.CommandSession
import org.apache.felix.gogo.commands.{Action, Option => option, Argument => argument, Command => command}
-import org.apache.felix.gogo.runtime.shell.CommandShellImpl
import org.apache.karaf.shell.console.Main
import org.apache.karaf.shell.console.jline.Console
import jline.Terminal
import org.fusesource.jansi.Ansi
-import java.io.{OutputStream, PrintStream, InputStream}
import org.apache.activemq.apollo.util.FileSupport._
+import org.apache.felix.service.command.CommandSession
+import org.apache.felix.gogo.runtime.CommandProcessorImpl
+import java.io.{File, PrintStream, InputStream}
/**
* <p>
@@ -65,9 +65,8 @@ class Apollo extends Main with Action {
override def isMultiScopeMode() = false
-
- protected override def createConsole(commandProcessor: CommandShellImpl, in: InputStream, out: PrintStream, err: PrintStream, terminal: Terminal) = {
- new Console(commandProcessor, in, out, err, terminal, null) {
+ protected override def createConsole(impl: CommandProcessorImpl, in: InputStream, out: PrintStream, err: PrintStream, terminal: Terminal) = {
+ new Console(impl, in, out, err, terminal, null) {
protected override def getPrompt = BOLD+"apollo> "+RESET
protected override def isPrintStackTraces = debug
protected override def welcome = {
@@ -76,10 +75,13 @@ class Apollo extends Main with Action {
}
protected override def setSessionProperties = {}
+
+ protected override def getHistoryFile: File = {
+ val default = (new File(System.getProperty("user.home"))/".apollo"/"apollo.history").getCanonicalPath
+ new File(System.getProperty("apollo.history",default))
+ }
}
}
-
-
@argument(name = "args", description = "apollo sub command arguments", multiValued=true)
var args = Array[String]()
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala Tue Feb 22 03:17:45 2011
@@ -17,15 +17,13 @@
package org.apache.activemq.apollo.cli.commands
import org.apache.felix.gogo.commands.{Action, Option => option, Argument => argument, Command => command}
-import org.osgi.service.command.CommandSession
-import org.fusesource.jansi.Ansi
import org.fusesource.jansi.Ansi.Color._
import org.fusesource.jansi.Ansi.Attribute._
import Helper._
import java.io._
import org.apache.activemq.apollo.util.FileSupport._
-import java.nio.charset.Charset
import java.util.regex.{Pattern, Matcher}
+import org.apache.felix.service.command.CommandSession
object Create {
val IS_WINDOWS = System.getProperty("os.name").toLowerCase().trim().startsWith("win");
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Decrypt.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Decrypt.scala?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Decrypt.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Decrypt.scala Tue Feb 22 03:17:45 2011
@@ -17,11 +17,9 @@ package org.apache.activemq.apollo.cli.c
* limitations under the License.
*/
import org.apache.felix.gogo.commands.{Action, Option => option, Argument => argument, Command => command}
-import org.osgi.service.command.CommandSession
-import java.io.File
import org.apache.activemq.apollo.util.Logging
import org.apache.activemq.apollo.broker.security.EncryptionSupport
-import org.jasypt.properties.PropertyValueEncryptionUtils
+import org.apache.felix.service.command.CommandSession
/**
* The apollo encrypt command
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Encrypt.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Encrypt.scala?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Encrypt.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Encrypt.scala Tue Feb 22 03:17:45 2011
@@ -17,10 +17,9 @@ package org.apache.activemq.apollo.cli.c
* limitations under the License.
*/
import org.apache.felix.gogo.commands.{Action, Option => option, Argument => argument, Command => command}
-import org.osgi.service.command.CommandSession
-import java.io.File
import org.apache.activemq.apollo.util.Logging
import org.apache.activemq.apollo.broker.security.EncryptionSupport
+import org.apache.felix.service.command.CommandSession
/**
* The apollo encrypt command
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Exit.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Exit.scala?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Exit.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Exit.scala Tue Feb 22 03:17:45 2011
@@ -17,10 +17,9 @@
package org.apache.activemq.apollo.cli.commands
-import java.{util => ju, lang => jl}
import org.apache.felix.gogo.commands.{Action, Command => command}
-import org.osgi.service.command.CommandSession
import org.apache.karaf.shell.console.CloseShellException
+import org.apache.felix.service.command.CommandSession
/**
* The 'exit' sub command.
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala Tue Feb 22 03:17:45 2011
@@ -17,13 +17,14 @@
package org.apache.activemq.apollo.cli.commands
import org.apache.felix.gogo.commands.{Action, Option => option, Argument => argument, Command => command}
-import org.osgi.service.command.CommandSession
import java.io.File
import org.apache.activemq.apollo.broker.{Broker, ConfigStore, FileConfigStore}
import org.fusesource.hawtdispatch._
import org.apache.activemq.apollo.util.FileSupport._
import org.apache.activemq.apollo.cli.Apollo
import org.apache.activemq.apollo.util.{Logging, LoggingReporter}
+import org.apache.felix.service.command.CommandSession
+
/**
* The apollo run command
*/
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Stop.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Stop.scala?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Stop.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Stop.scala Tue Feb 22 03:17:45 2011
@@ -17,15 +17,14 @@ package org.apache.activemq.apollo.cli.c
* limitations under the License.
*/
import org.apache.felix.gogo.commands.{Action, Option => option, Argument => argument, Command => command}
-import org.osgi.service.command.CommandSession
import java.io.File
import org.apache.activemq.apollo.broker.FileConfigStore
import org.apache.activemq.apollo.util.FileSupport._
import org.apache.activemq.apollo.util.OptionSupport._
import org.apache.activemq.apollo.util.Logging
-import org.apache.activemq.apollo.dto.WebAdminDTO
import org.apache.commons.codec.binary.Base64
import java.net.{HttpURLConnection, URL}
+import org.apache.felix.service.command.CommandSession
/**
* The apollo stop command
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreExport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreExport.scala?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreExport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreExport.scala Tue Feb 22 03:17:45 2011
@@ -17,7 +17,6 @@ package org.apache.activemq.apollo.cli.c
* limitations under the License.
*/
import org.apache.felix.gogo.commands.{Action, Option => option, Argument => argument, Command => command}
-import org.osgi.service.command.CommandSession
import org.apache.activemq.apollo.util.FileSupport._
import org.apache.activemq.apollo.broker.FileConfigStore
import org.apache.activemq.apollo.dto.VirtualHostDTO
@@ -26,6 +25,7 @@ import java.util.zip.{ZipEntry, ZipOutpu
import org.apache.activemq.apollo.broker.store.{StreamManager, StoreFactory}
import java.io.{OutputStream, FileOutputStream, File}
import scala.util.continuations._
+import org.apache.felix.service.command.CommandSession
/**
* The apollo stop command
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreImport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreImport.scala?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreImport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/StoreImport.scala Tue Feb 22 03:17:45 2011
@@ -17,7 +17,6 @@ package org.apache.activemq.apollo.cli.c
* limitations under the License.
*/
import org.apache.felix.gogo.commands.{Action, Option => option, Argument => argument, Command => command}
-import org.osgi.service.command.CommandSession
import org.apache.activemq.apollo.util.FileSupport._
import org.apache.activemq.apollo.broker.FileConfigStore
import org.apache.activemq.apollo.dto.VirtualHostDTO
@@ -26,6 +25,7 @@ import org.apache.activemq.apollo.broker
import scala.util.continuations._
import java.util.zip.{ZipFile, ZipEntry, ZipOutputStream}
import java.io.{InputStream, OutputStream, FileOutputStream, File}
+import org.apache.felix.service.command.CommandSession
/**
Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1073213&r1=1073212&r2=1073213&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Tue Feb 22 03:17:45 2011
@@ -125,7 +125,7 @@
<!-- osgi stuff -->
<osgi-version>4.2.0</osgi-version>
- <karaf-version>2.1.2</karaf-version>
+ <karaf-version>2.99.99-SNAPSHOT</karaf-version>
<features-maven-plugin-version>2.1.0</features-maven-plugin-version>
<osgi.fragment.host>${project.groupId}.apollo-broker</osgi.fragment.host>