geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r940564 - in /geronimo/server/trunk/framework: configs/karaf-framework/ configs/karaf-framework/src/main/distribution/text/etc/ configs/karaf-framework/src/main/filtered-resources/etc/ configs/karaf-framework/src/main/history/ modules/ modu...
Date Mon, 03 May 2010 18:40:54 GMT
Author: gawor
Date: Mon May  3 18:40:53 2010
New Revision: 940564

URL: http://svn.apache.org/viewvc?rev=940564&view=rev
Log:
Geronimo branding for Karaf shell

Added:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script
    geronimo/server/trunk/framework/modules/geronimo-shell/
    geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml   (with props)
    geronimo/server/trunk/framework/modules/geronimo-shell/src/
    geronimo/server/trunk/framework/modules/geronimo-shell/src/main/
    geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/
    geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/
    geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/
    geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/
    geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/
    geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/branding/
    geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/branding/branding.properties
  (with props)
Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
    geronimo/server/trunk/framework/modules/pom.xml

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=940564&r1=940563&r2=940564&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Mon May  3 18:40:53 2010
@@ -451,6 +451,11 @@
             <artifactId>geronimo-shell-base</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-shell</artifactId>
+            <version>${version}</version>
+        </dependency>
         <!--agent -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Added: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script?rev=940564&view=auto
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script
(added)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script
Mon May  3 18:40:53 2010
@@ -0,0 +1,25 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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.
+//
+// This script is run each time a shell is created.
+// You can define here closures or variables that will be available
+// in each session.
+//
+
+ld = { log:display $args } ;
+lde = { log:display-exception $args } ;

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties?rev=940564&r1=940563&r2=940564&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
Mon May  3 18:40:53 2010
@@ -17,11 +17,44 @@
 #
 ################################################################################
 
+
+# Log level when the pax-logging service is not available
+# This level will only be used while the pax-logging service bundle
+# is not fully available.
+# To change log levels, please refer to the org.ops4j.pax.logging.cfg file
+# instead.
 org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+
+#
+# Name of this karaf instance.
+#
 karaf.name=root
+
+#
+# Default repository where bundles will be loaded from before using
+# other maven repositories.  For the full maven configuration, see
+# the org.ops4j.pax.url.mvn.cfg file.
+#
 karaf.default.repository=repository
+
+#
+# Location of a shell script that will be run when starting a shell
+# session.  This script can be used to create aliases and define
+# additional commands.
+#
+karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+
+#
+# Set this empty property to avoid errors when validating xml documents.
+#
 xml.catalog.files=
 
+#
+# Suppress the bell in the console when hitting backspace to many times
+# for example
+#
+jline.nobell=true
+
 ### Debug level for Felix
 #felix.log.level=4
 

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=940564&r1=940563&r2=940564&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Mon May  3 18:40:53 2010
@@ -38,6 +38,7 @@ org/apache/felix/org.apache.felix.filein
 org/apache/aries/org.apache.aries.util/${aries.blueprint.version}/org.apache.aries.util-${aries.blueprint.version}.jar=20
 org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
 
+org/apache/geronimo/framework/geronimo-shell/${pom.version}/geronimo-shell-${pom.version}.jar=30
 org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${felix.karaf.version}/org.apache.felix.karaf.shell.console-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${felix.karaf.version}/org.apache.felix.karaf.deployer.blueprint-${felix.karaf.version}.jar=30

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=940564&r1=940563&r2=940564&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Mon May  3 18:40:53 2010
@@ -243,6 +243,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-shell</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-shell-base</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml?rev=940564&r1=940563&r2=940564&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Mon May  3 18:40:53
2010
@@ -30,7 +30,7 @@
     <artifactId>geronimo-shell-base</artifactId>
     <packaging>bundle</packaging>
     <version>3.0-SNAPSHOT</version>
-    <name>Apache Geronimo :: Shell</name>
+    <name>Geronimo Framework, Modules :: Shell Commands</name>
 
     <dependencies>
         <dependency>

Added: geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml?rev=940564&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml (added)
+++ geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml Mon May  3 18:40:53 2010
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>modules</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.framework</groupId>
+    <artifactId>geronimo-shell</artifactId>
+    <packaging>bundle</packaging>
+    <version>3.0-SNAPSHOT</version>
+    <name>Geronimo Framework, Modules :: Shell</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.felix.karaf.branding;version="${pom.version}"
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/branding/branding.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/branding/branding.properties?rev=940564&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/branding/branding.properties
(added)
+++ geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/branding/branding.properties
Mon May  3 18:40:53 2010
@@ -0,0 +1,35 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you 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.
+##
+
+welcome = \
+\u001B[36m                                                       \u001B[0m\r\n\
+\u001B[36m       ______                       _                  \u001B[0m\r\n\
+\u001B[36m      / ____/___  _________  ____  (_)____ ___  ____   \u001B[0m\r\n\
+\u001B[36m     / / __ / _ \\/ ___/ __ \\/ __ \\/ // __ `__ \\/ __ \\  \u001B[0m\r\n\
+\u001B[36m    / /_/ //  __/ /  / /_/ / / / / // / / / / / /_/ /  \u001B[0m\r\n\
+\u001B[36m    \\____/ \\___/_/   \\____/_/ /_/_//_/ /_/ /_/\\____/   \u001B[0m\r\n\
+\r\n\
+\u001B[1m  Apache Geronimo\u001B[0m (${pom.version})\r\n\
+\r\n\
+Hit '\u001B[1m<tab>\u001B[0m' for a list of available commands\r\n\
+   and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\r\n\
+Hit '\u001B[1m<ctrl-d>\u001B[0m' or '\u001B[1mosgi:shutdown\u001B[0m' to shutdown Geronimo.\r\n
+
+session.PROMPT = \u001B[1m${APPLICATION}\u001B[0m>\u0020
+session.APPLICATION = geronimo

Propchange: geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/branding/branding.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/branding/branding.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/branding/branding.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=940564&r1=940563&r2=940564&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Mon May  3 18:40:53 2010
@@ -58,10 +58,11 @@
         <module>geronimo-kernel</module>
         <module>geronimo-plugin</module>
         <module>geronimo-deploy-tool</module>
+        <module>geronimo-shell</module>
         <module>geronimo-shell-base</module>
         <module>geronimo-blueprint</module>
         <module>geronimo-obr</module>
-  </modules>
+    </modules>
 
     <profiles>
         <profile>



Mime
View raw message